Commit bcab7a50 authored by Michele Tartara's avatar Michele Tartara
Browse files

Cluster upgrade for 2.10 must be run against 2.9



Add a 2.9 configuration file and modify the test to use it.
Signed-off-by: default avatarMichele Tartara <mtartara@google.com>
Reviewed-by: default avatarHelga Velroyen <helgav@google.com>
parent ce7b7617
......@@ -1145,6 +1145,7 @@ TEST_FILES = \
test/data/cert2.pem \
test/data/cluster_config_2.7.json \
test/data/cluster_config_2.8.json \
test/data/cluster_config_2.9.json \
test/data/instance-minor-pairing.txt \
test/data/instance-prim-sec.txt \
test/data/ip-addr-show-dummy0.txt \
......
{"ctime": 1374159140.5617161, "nodegroups": {"2b3cbabe-ebdf-45f8-9989-75fe34fcc223": {"name": "default", "tags": [], "ipolicy": {}, "serial_no": 1, "ndparams": {}, "diskparams": {}, "mtime": 1374159140.5688591, "alloc_policy": "preferred", "networks": {}, "uuid": "2b3cbabe-ebdf-45f8-9989-75fe34fcc223"}}, "instances": {"82fd1fd0-941d-4a29-8803-a4a67fd847a3": {"osparams": {}, "serial_no": 2, "name": "instance3.example.com", "tags": [], "hypervisor": "xen-pvm", "disks": [{"logical_id": ["xenvg", "05ef02e5-9c83-4f6f-9589-7e3e47c056b7.disk0"], "uuid": "6ac452c2-6337-473c-98d8-5f3b9a4c8ae3", "dev_type": "lvm", "params": {}, "mode": "rw", "physical_id": ["xenvg", "05ef02e5-9c83-4f6f-9589-7e3e47c056b7.disk0"], "iv_name": "disk/0", "size": 1024}], "uuid": "82fd1fd0-941d-4a29-8803-a4a67fd847a3", "mtime": 1374160005.1477571, "primary_node": "ba6420dd-06cc-47f2-a434-42552bed3458", "hvparams": {}, "disks_active": true, "admin_state": "up", "disk_template": "plain", "nics": [{"mac": "aa:00:00:43:02:42", "nicparams": {}, "uuid": "31e69c62-68d8-4475-8c5f-e7e38186fa2c"}], "os": "busybox", "beparams": {}, "ctime": 1374160004.4087901}, "842d79e1-370c-4fe5-a287-3b1e79404c9d": {"osparams": {}, "serial_no": 2, "name": "instance0.example.com", "tags": [], "hypervisor": "xen-pvm", "disks": [{"logical_id": ["9cff5291-5542-4765-b6f1-67857bd8799f", "b8721de9-f760-4a4b-acad-210d10dc283f", 11000, 0, 0, "773a49f9cbd2de72c40d65cd6e5c61930785f712"], "uuid": "0d70a12b-322b-4fd5-834f-9ef48d9d2963", "dev_type": "drbd8", "params": {}, "mode": "rw", "physical_id": ["1.2.3.4", 11000, "1.2.3.5", 11000, 0, "773a49f9cbd2de72c40d65cd6e5c61930785f712"], "children": [{"logical_id": ["xenvg", "561cd0c2-194f-459b-a995-7a215c326d59.disk0_data"], "uuid": "d48a7bdb-2338-4b94-996c-bacfb7255924", "dev_type": "lvm", "params": {}, "physical_id": ["xenvg", "561cd0c2-194f-459b-a995-7a215c326d59.disk0_data"], "size": 1024}, {"logical_id": ["xenvg", "561cd0c2-194f-459b-a995-7a215c326d59.disk0_meta"], "uuid": "f3dbf32a-e8ef-48c5-b5c6-e940b0ce0f16", "dev_type": "lvm", "params": {}, "physical_id": ["xenvg", "561cd0c2-194f-459b-a995-7a215c326d59.disk0_meta"], "size": 128}], "iv_name": "disk/0", "size": 1024}], "uuid": "842d79e1-370c-4fe5-a287-3b1e79404c9d", "mtime": 1374159334.9391799, "primary_node": "9cff5291-5542-4765-b6f1-67857bd8799f", "hvparams": {}, "disks_active": true, "admin_state": "up", "disk_template": "drbd", "nics": [{"mac": "aa:00:00:ff:55:d4", "nicparams": {}, "uuid": "b476f6e1-46aa-4941-bcd2-a2bc35d80ae9"}], "os": "busybox", "beparams": {}, "ctime": 1374159272.8369229}, "c42e8400-5c60-4007-889c-97fa75b0e640": {"osparams": {}, "serial_no": 2, "name": "instance1.example.com", "tags": [], "hypervisor": "xen-pvm", "disks": [{"logical_id": ["b8721de9-f760-4a4b-acad-210d10dc283f", "ba6420dd-06cc-47f2-a434-42552bed3458", 11001, 1, 0, "d8dfa6963b400f2b7e322bc6a65da0583ef31089"], "uuid": "54b99f2c-c828-456a-8c61-d520ae134528", "dev_type": "drbd8", "params": {}, "mode": "rw", "physical_id": ["1.2.3.5", 11001, "1.2.3.6", 11001, 1, "d8dfa6963b400f2b7e322bc6a65da0583ef31089"], "children": [{"logical_id": ["xenvg", "1fbeb2af-1d41-4871-b948-c91a9698d7b8.disk0_data"], "uuid": "eaaf8732-7031-4c32-86a4-63e032321c52", "dev_type": "lvm", "params": {}, "physical_id": ["xenvg", "1fbeb2af-1d41-4871-b948-c91a9698d7b8.disk0_data"], "size": 1024}, {"logical_id": ["xenvg", "1fbeb2af-1d41-4871-b948-c91a9698d7b8.disk0_meta"], "uuid": "de42a871-4528-4822-8656-1296df1f2496", "dev_type": "lvm", "params": {}, "physical_id": ["xenvg", "1fbeb2af-1d41-4871-b948-c91a9698d7b8.disk0_meta"], "size": 128}], "iv_name": "disk/0", "size": 1024}], "uuid": "c42e8400-5c60-4007-889c-97fa75b0e640", "mtime": 1374159428.1719079, "primary_node": "b8721de9-f760-4a4b-acad-210d10dc283f", "hvparams": {}, "disks_active": true, "admin_state": "up", "disk_template": "drbd", "nics": [{"mac": "aa:00:00:ff:c6:6d", "nicparams": {}, "uuid": "77ff5715-9823-4db6-b7ea-79a8ad6767ee"}], "os": "busybox", "beparams": {}, "ctime": 1374159365.963726}, "f7ea9407-5c47-4e80-bc2e-94ead27c2ad7": {"osparams": {}, "serial_no": 2, "name": "instance2.example.com", "hypervisor": "xen-pvm", "disks": [{"logical_id": ["xenvg", "fdcd57a9-e8fd-401b-946c-b77f8dc26496.disk0"], "uuid": "f66be3e6-86eb-4b73-b428-8fa2ceb5f175", "dev_type": "lvm", "params": {}, "mode": "rw", "physical_id": ["xenvg", "fdcd57a9-e8fd-401b-946c-b77f8dc26496.disk0"], "iv_name": "disk/0", "size": 1024}], "uuid": "f7ea9407-5c47-4e80-bc2e-94ead27c2ad7", "mtime": 1374160032.8897901, "primary_node": "9cff5291-5542-4765-b6f1-67857bd8799f", "hvparams": {}, "disks_active": true, "admin_state": "up", "disk_template": "plain", "nics": [{"mac": "aa:00:00:85:f3:11", "nicparams": {}, "uuid": "62f4b596-38ab-4244-857f-ca0316c260ef"}], "os": "busybox", "beparams": {}, "ctime": 1374160032.096328}}, "serial_no": 17, "cluster": {"mac_prefix": "aa:00:00", "serial_no": 10, "hvparams": {"chroot": {"init_script": "/ganeti-chroot"}, "xen-pvm": {"xen_cmd": "xm", "migration_mode": "live", "vif_script": "", "kernel_args": "ro", "migration_port": 8002, "blockdev_prefix": "sd", "reboot_behavior": "reboot", "bootloader_args": "", "bootloader_path": "", "root_path": "/dev/xvda1", "cpu_mask": "all", "cpu_weight": 256, "cpu_cap": 0, "use_bootloader": false, "kernel_path": "/boot/vmlinuz-ganetixenu", "initrd_path": ""}, "kvm": {"spice_password_file": "", "spice_use_tls": false, "spice_use_vdagent": true, "nic_type": "paravirtual", "migration_port": 8102, "vnc_bind_address": "", "cpu_threads": 0, "cdrom2_image_path": "", "usb_mouse": "", "spice_streaming_video": "", "use_chroot": false, "spice_tls_ciphers": "HIGH:-DES:-3DES:-EXPORT:-ADH", "machine_version": "", "migration_downtime": 30, "cpu_sockets": 0, "vnc_x509_verify": false, "usb_devices": "", "security_model": "none", "cdrom_image_path": "", "kvm_extra": "", "spice_ip_version": 0, "vhost_net": false, "cpu_cores": 0, "cpu_mask": "all", "initrd_path": "", "disk_cache": "default", "kvm_path": "/usr/bin/kvm", "kernel_path": "/boot/vmlinuz-3-kvmU", "vnc_x509_path": "", "spice_jpeg_wan_compression": "", "vnc_tls": false, "cdrom_disk_type": "", "use_localtime": false, "security_domain": "", "serial_console": true, "spice_bind": "", "spice_zlib_glz_wan_compression": "", "kvm_flag": "", "vnc_password_file": "", "migration_bandwidth": 32, "disk_type": "paravirtual", "soundhw": "", "spice_image_compression": "", "spice_playback_compression": true, "migration_mode": "live", "kernel_args": "ro", "serial_speed": 38400, "vga": "", "root_path": "/dev/vda1", "floppy_image_path": "", "acpi": true, "keymap": "", "cpu_type": "", "boot_order": "disk", "mem_path": "", "reboot_behavior": "reboot"}, "xen-hvm": {"nic_type": "rtl8139", "vif_type": "ioemu", "vif_script": "", "migration_port": 8002, "vnc_bind_address": "0.0.0.0", "cdrom_image_path": "", "use_localtime": false, "cpu_mask": "all", "cpu_weight": 256, "pae": true, "cpu_cap": 0, "kernel_path": "/usr/lib/xen/boot/hvmloader", "acpi": true, "xen_cmd": "xm", "boot_order": "cd", "pci_pass": "", "vnc_password_file": "/etc/ganeti/vnc-cluster-password", "disk_type": "paravirtual", "migration_mode": "non-live", "device_model": "/usr/lib/xen/bin/qemu-dm", "reboot_behavior": "reboot", "blockdev_prefix": "hd"}, "lxc": {"cpu_mask": ""}, "fake": {"migration_mode": "live"}}, "diskparams": {"sharedfile": {}, "diskless": {}, "plain": {"stripes": 1}, "blockdev": {}, "drbd": {"protocol": "C", "c-fill-target": 0, "c-max-rate": 61440, "c-min-rate": 4096, "data-stripes": 1, "dynamic-resync": false, "meta-barriers": false, "resync-rate": 61440, "disk-barriers": "n", "c-delay-target": 1, "disk-custom": "", "metavg": "xenvg", "net-custom": "", "c-plan-ahead": 20, "meta-stripes": 1}, "ext": {}, "file": {}, "rbd": {"pool": "rbd"}}, "uid_pool": [], "prealloc_wipe_disks": false, "os_hvp": {}, "osparams": {}, "shared_file_storage_dir": "/srv/ganeti/shared-file-storage", "master_netmask": 32, "uuid": "039dd200-5977-48c3-a6d0-3144a2136a93", "use_external_mip_script": false, "default_iallocator": "hail", "hv_state_static": {"xen-pvm": {"mem_node": 0, "cpu_total": 1, "mem_total": 0, "mem_hv": 0, "cpu_node": 1}}, "master_ip": "1.3.3.1", "cluster_name": "mtartara-cluster.example.com", "mtime": 1374159150.8654349, "nicparams": {"default": {"link": "xen-br0", "mode": "bridged"}}, "highest_used_port": 11001, "enabled_disk_templates": ["drbd", "plain"], "maintain_node_health": false, "modify_ssh_setup": true, "tags": [], "ipolicy": {"minmax": [{"max": {"disk-size": 1048576, "cpu-count": 8, "spindle-use": 12, "memory-size": 32768, "nic-count": 8, "disk-count": 16}, "min": {"disk-size": 1024, "cpu-count": 1, "spindle-use": 1, "memory-size": 128, "nic-count": 1, "disk-count": 1}}], "std": {"disk-size": 1024, "cpu-count": 1, "spindle-use": 1, "memory-size": 128, "nic-count": 1, "disk-count": 1}, "spindle-ratio": 32.0, "vcpu-ratio": 4.0, "disk-templates": ["sharedfile", "diskless", "plain", "blockdev", "drbd", "ext", "file", "rbd"]}, "tcpudp_port_pool": [], "candidate_pool_size": 10, "file_storage_dir": "", "blacklisted_os": [], "enabled_hypervisors": ["xen-pvm"], "disk_state_static": {}, "drbd_usermode_helper": "/bin/true", "reserved_lvs": [], "ctime": 1374159140.5609231, "modify_etc_hosts": true, "hidden_os": [], "master_netdev": "xen-br0", "rsahostkeypub": "AAAAB3NzaC1yc2EAAAADAQABAAABAQCdzEcGFJUtn52fgzEmnYzH4Gu72oIyQBozSYe1XwjRXoKw+jenxGvWgYBsktQtLx1GhtZaanYh9ZI4du/0nyHuCk1Qp0XQx88v7Jsnd4M17PogxP364GTcFyt4gtqq3WsutTH76KT9N0U5AbqF5ifycjoZbeB879BsaYPnN6WZWQkZ0050pRIecl1gg5dZ8X+oTvlm5XoFO+iVJJDeuqNCJ+DBfzf6zDabv1jpXKBry/qX2f37DWF09PzsQD0i1D2vJmCVrm2olLT/hL86nMfTQxUrPrR/4OB6zR+6fFGklKOV6SLtb+cauArH1iolaRJEHoF1yxjhZU8ILny1xZyt", "ndparams": {"spindle_count": 1, "exclusive_storage": false, "oob_program": ""}, "master_node": "ba6420dd-06cc-47f2-a434-42552bed3458", "primary_ip_family": 2, "volume_group_name": "xenvg", "beparams": {"default": {"auto_balance": true, "vcpus": 1, "spindle_use": 1, "minmem": 128, "always_failover": false, "maxmem": 128}}}, "version": 2090000, "mtime": 1374160032.8909521, "nodes": {"9cff5291-5542-4765-b6f1-67857bd8799f": {"powered": true, "master_candidate": true, "name": "node3.example.com", "secondary_ip": "1.2.3.4", "drained": false, "serial_no": 1, "uuid": "9cff5291-5542-4765-b6f1-67857bd8799f", "group": "2b3cbabe-ebdf-45f8-9989-75fe34fcc223", "ndparams": {}, "master_capable": true, "mtime": 1374159242.602984, "primary_ip": "1.3.3.2", "offline": false, "vm_capable": true, "tags": [], "ctime": 1374159242.602984}, "b8721de9-f760-4a4b-acad-210d10dc283f": {"powered": true, "master_candidate": true, "name": "node2.example.com", "secondary_ip": "1.2.3.5", "drained": false, "serial_no": 1, "uuid": "b8721de9-f760-4a4b-acad-210d10dc283f", "group": "2b3cbabe-ebdf-45f8-9989-75fe34fcc223", "ndparams": {}, "master_capable": true, "mtime": 1374159231.324965, "primary_ip": "1.3.3.3", "offline": false, "vm_capable": true, "tags": [], "ctime": 1374159231.324965}, "ba6420dd-06cc-47f2-a434-42552bed3458": {"powered": true, "master_candidate": true, "name": "node1.example.com", "secondary_ip": "1.2.3.6", "drained": false, "serial_no": 1, "uuid": "ba6420dd-06cc-47f2-a434-42552bed3458", "group": "2b3cbabe-ebdf-45f8-9989-75fe34fcc223", "ndparams": {}, "master_capable": true, "mtime": 1374159140.5609231, "primary_ip": "1.3.3.4", "offline": false, "vm_capable": true, "tags": [], "ctime": 1374159140.5609231}}, "networks": {}}
......@@ -387,7 +387,7 @@ class TestCfgupgrade(unittest.TestCase):
def testDowngradeFullConfig(self):
"""Test for upgrade + downgrade combination."""
# This test can work only with the previous version of a configuration!
oldconfname = "cluster_config_2.8.json"
oldconfname = "cluster_config_2.9.json"
self._TestUpgradeFromFile(oldconfname, False)
_RunUpgrade(self.tmpdir, False, True, downgrade=True)
oldconf = self._LoadTestDataConfig(oldconfname)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment