diff --git a/nova/compute/rpcapi.py b/nova/compute/rpcapi.py index c2be3eb9e595..acc2a1ffc8a7 100644 --- a/nova/compute/rpcapi.py +++ b/nova/compute/rpcapi.py @@ -293,13 +293,17 @@ class ComputeAPI(object): existing methods in 3.x after that point should be done so that they can handle the version_cap being set to 3.40 + ... Version 4.0 is equivalent to 3.40. Kilo sends version 4.0 by + default, can accept 3.x calls from Juno nodes, and can be pinned to + 3.x for Juno compatibility. All new changes should go against 4.x. + * 4.0 - Remove 3.x compatibility ''' VERSION_ALIASES = { 'icehouse': '3.23', 'juno': '3.35', - 'kilo': '3.40', + 'kilo': '4.0', } def __init__(self): diff --git a/nova/tests/unit/compute/test_rpcapi.py b/nova/tests/unit/compute/test_rpcapi.py index 89c5b297e72b..6f17a450e9d9 100644 --- a/nova/tests/unit/compute/test_rpcapi.py +++ b/nova/tests/unit/compute/test_rpcapi.py @@ -64,7 +64,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): orig_prepare = rpcapi.client.prepare # TODO(danms): Remove this special case when we drop 3.x - if CONF.upgrade_levels.compute == 'kilo': + if CONF.upgrade_levels.compute == '3.40': base_version = '3.0' else: base_version = rpcapi.client.target.version @@ -151,7 +151,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): aggregate={'id': 'fake_id'}, host_param='host', host='host', slave_info={}) - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('add_aggregate_host', 'cast', aggregate={'id': 'fake_id'}, host_param='host', host='host', slave_info={}, version='3.0') @@ -161,7 +161,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): instance=self.fake_instance_obj, network_id='id', version='4.0') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('add_fixed_ip_to_instance', 'cast', instance=self.fake_instance_obj, network_id='id', version='3.12') @@ -171,7 +171,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): instance=self.fake_instance_obj, network_id='id', port_id='id2', version='4.0', requested_ip='192.168.1.50') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('attach_interface', 'call', instance=self.fake_instance_obj, network_id='id', port_id='id2', version='3.17', requested_ip='192.168.1.50') @@ -181,7 +181,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): instance=self.fake_instance_obj, volume_id='id', mountpoint='mp', bdm=self.fake_volume_bdm, version='4.0') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('attach_volume', 'cast', instance=self.fake_instance_obj, volume_id='id', mountpoint='mp', bdm=self.fake_volume_bdm, version='3.16') @@ -190,7 +190,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): self._test_compute_api('change_instance_metadata', 'cast', instance=self.fake_instance_obj, diff={}, version='4.0') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('change_instance_metadata', 'cast', instance=self.fake_instance_obj, diff={}, version='3.7') @@ -201,7 +201,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): destination='dest', block_migration=True, disk_over_commit=True, version='4.0') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('check_can_live_migrate_destination', 'call', instance=self.fake_instance_obj, destination='dest', block_migration=True, @@ -223,7 +223,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): instance=self.fake_instance_obj, dest_check_data={"test": "data"}, version='4.0') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('check_can_live_migrate_source', 'call', instance=self.fake_instance_obj, dest_check_data={"test": "data"}, version='3.32') @@ -242,7 +242,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): instance=self.fake_instance_obj, data='foo', version='4.0') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('check_instance_shared_storage', 'call', instance=self.fake_instance_obj, data='foo', version='3.29') @@ -252,7 +252,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): instance=self.fake_instance_obj, migration={'id': 'foo'}, host='host', reservations=list('fake_res')) - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('confirm_resize', 'cast', instance=self.fake_instance_obj, migration={'id': 'foo'}, host='host', reservations=list('fake_res')) @@ -262,7 +262,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): instance=self.fake_instance_obj, migration={'id': 'foo'}, host='host', reservations=list('fake_res')) - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('confirm_resize', 'call', instance=self.fake_instance_obj, migration={'id': 'foo'}, host='host', reservations=list('fake_res')) @@ -272,7 +272,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): version='4.0', instance=self.fake_instance_obj, port_id='fake_id') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('detach_interface', 'cast', version='3.17', instance=self.fake_instance_obj, port_id='fake_id') @@ -282,7 +282,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): instance=self.fake_instance_obj, volume_id='id', version='4.0') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('detach_volume', 'cast', instance=self.fake_instance_obj, volume_id='id', version='3.25') @@ -293,7 +293,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): image='image', disk_info='disk_info', host='host', reservations=list('fake_res')) - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('finish_resize', 'cast', instance=self.fake_instance_obj, migration={'id': 'foo'}, image='image', disk_info='disk_info', host='host', @@ -304,7 +304,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): instance=self.fake_instance_obj, migration={'id': 'fake_id'}, host='host', reservations=list('fake_res')) - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('finish_revert_resize', 'cast', instance=self.fake_instance_obj, migration={'id': 'fake_id'}, host='host', reservations=list('fake_res')) @@ -314,7 +314,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): instance=self.fake_instance_obj, tail_length='tl', version='4.0') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('get_console_output', 'call', instance=self.fake_instance_obj, tail_length='tl', version='3.28') @@ -323,21 +323,21 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): self._test_compute_api('get_console_pool_info', 'call', console_type='type', host='host') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('get_console_pool_info', 'call', console_type='type', host='host') def test_get_console_topic(self): self._test_compute_api('get_console_topic', 'call', host='host') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('get_console_topic', 'call', host='host') def test_get_diagnostics(self): self._test_compute_api('get_diagnostics', 'call', instance=self.fake_instance_obj, version='4.0') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('get_diagnostics', 'call', instance=self.fake_instance_obj, version='3.18') @@ -346,7 +346,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): assert_dict=True, instance=self.fake_instance_obj, version='4.0') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('get_instance_diagnostics', 'call', assert_dict=True, instance=self.fake_instance_obj, version='3.31') @@ -356,7 +356,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): instance=self.fake_instance_obj, console_type='type', version='4.0') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('get_vnc_console', 'call', instance=self.fake_instance_obj, console_type='type', version='3.2') @@ -366,7 +366,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): instance=self.fake_instance_obj, console_type='type', version='4.0') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('get_spice_console', 'call', instance=self.fake_instance_obj, console_type='type', version='3.1') @@ -376,7 +376,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): instance=self.fake_instance_obj, console_type='type', version='4.0') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('get_rdp_console', 'call', instance=self.fake_instance_obj, console_type='type', version='3.10') @@ -386,7 +386,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): instance=self.fake_instance_obj, console_type='serial', version='4.0') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('get_serial_console', 'call', instance=self.fake_instance_obj, console_type='serial', version='3.34') @@ -396,7 +396,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): instance=self.fake_instance_obj, port="5900", console_type="novnc", version='4.0') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('validate_console_port', 'call', instance=self.fake_instance_obj, port="5900", console_type="novnc", version='3.3') @@ -405,7 +405,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): self._test_compute_api('host_maintenance_mode', 'call', host_param='param', mode='mode', host='host') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('host_maintenance_mode', 'call', host_param='param', mode='mode', host='host') @@ -413,7 +413,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): self._test_compute_api('host_power_action', 'call', action='action', host='host') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('host_power_action', 'call', action='action', host='host') @@ -421,7 +421,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): self._test_compute_api('inject_network_info', 'cast', instance=self.fake_instance_obj) - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('inject_network_info', 'cast', instance=self.fake_instance_obj) @@ -431,7 +431,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): block_migration='blockity_block', host='tsoh', migrate_data={}, version='4.0') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('live_migration', 'cast', instance=self.fake_instance_obj, dest='dest', block_migration='blockity_block', host='tsoh', @@ -442,7 +442,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): instance=self.fake_instance_obj, block_migration='block_migration', host='host', version='4.0') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('post_live_migration_at_destination', 'cast', instance=self.fake_instance_obj, block_migration='block_migration', host='host', version='3.14') @@ -451,7 +451,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): self._test_compute_api('pause_instance', 'cast', instance=self.fake_instance_obj) - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('pause_instance', 'cast', instance=self.fake_instance_obj) @@ -460,7 +460,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): instance=self.fake_instance_obj, reservations=['uuid1', 'uuid2']) - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('soft_delete_instance', 'cast', instance=self.fake_instance_obj, reservations=['uuid1', 'uuid2']) @@ -470,7 +470,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): instance=self.fake_instance_obj, old_volume_id='oldid', new_volume_id='newid') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('swap_volume', 'cast', instance=self.fake_instance_obj, old_volume_id='oldid', new_volume_id='newid') @@ -479,7 +479,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): self._test_compute_api('restore_instance', 'cast', instance=self.fake_instance_obj, version='4.0') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('restore_instance', 'cast', instance=self.fake_instance_obj, version='3.20') @@ -489,7 +489,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): block_migration='block_migration', disk='disk', host='host', migrate_data=None, version='4.0') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('pre_live_migration', 'call', instance=self.fake_instance_obj, block_migration='block_migration', disk='disk', host='host', @@ -520,7 +520,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): request_spec='fake_spec', filter_properties={'fakeprop': 'fakeval'}, node='node', clean_shutdown=True, version='3.38') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('prep_resize', 'cast', instance=self.fake_instance_obj, instance_type='fake_type', image='fake_image', host='host', @@ -536,7 +536,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): block_device_info={}, reboot_type='type') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('reboot_instance', 'cast', instance=self.fake_instance_obj, block_device_info={}, @@ -549,7 +549,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): orig_sys_metadata=None, recreate=True, on_shared_storage=True, preserve_ephemeral=True, version='4.0') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('rebuild_instance', 'cast', new_pass='None', injected_files='None', image_ref='None', orig_image_ref='None', bdms=[], instance=self.fake_instance_obj, host='new_host', @@ -563,7 +563,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): version='4.0', _return_value=objects_block_dev.BlockDeviceMapping()) - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('reserve_block_device_name', 'call', instance=self.fake_instance_obj, device='device', volume_id='id', disk_bus='ide', device_type='cdrom', @@ -573,7 +573,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): self._test_compute_api('refresh_provider_fw_rules', 'cast', host='host') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('refresh_provider_fw_rules', 'cast', host='host') @@ -581,7 +581,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): self._test_compute_api('refresh_security_group_rules', 'cast', security_group_id='id', host='host', version='4.0') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('refresh_security_group_rules', 'cast', security_group_id='id', host='host', version='3.0') @@ -589,7 +589,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): self._test_compute_api('refresh_security_group_members', 'cast', security_group_id='id', host='host', version='4.0') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('refresh_security_group_members', 'cast', security_group_id='id', host='host', version='3.0') @@ -598,7 +598,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): host='fake_host', instance=self.fake_instance_obj, version='4.0', assert_dict=True) - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('refresh_instance_security_rules', 'cast', host='fake_host', instance=self.fake_instance_obj, version='3.0', assert_dict=True) @@ -608,7 +608,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): aggregate={'id': 'fake_id'}, host_param='host', host='host', slave_info={}) - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('remove_aggregate_host', 'cast', aggregate={'id': 'fake_id'}, host_param='host', host='host', slave_info={}) @@ -618,7 +618,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): instance=self.fake_instance_obj, address='addr', version='4.0') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('remove_fixed_ip_from_instance', 'cast', instance=self.fake_instance_obj, address='addr', version='3.13') @@ -628,7 +628,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): instance=self.fake_instance, volume_id='id', host='host', version='4.0') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('remove_volume_connection', 'call', instance=self.fake_instance, volume_id='id', host='host', version='3.30') @@ -651,7 +651,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): instance=self.fake_instance_obj, rescue_password='pw', rescue_image_ref='fake_image_ref', clean_shutdown=True, version='3.37') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('rescue_instance', 'cast', instance=self.fake_instance_obj, rescue_password='pw', rescue_image_ref='fake_image_ref', @@ -661,7 +661,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): self._test_compute_api('reset_network', 'cast', instance=self.fake_instance_obj) - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('reset_network', 'cast', instance=self.fake_instance_obj) @@ -682,7 +682,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): image='image', instance_type={'id': 1}, reservations=list('fake_res'), clean_shutdown=True, version='3.37') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('resize_instance', 'cast', instance=self.fake_instance_obj, migration={'id': 'fake_id'}, image='image', instance_type={'id': 1}, @@ -693,7 +693,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): self._test_compute_api('resume_instance', 'cast', instance=self.fake_instance_obj) - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('resume_instance', 'cast', instance=self.fake_instance_obj) @@ -702,7 +702,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): instance=self.fake_instance_obj, migration={'id': 'fake_id'}, host='host', reservations=list('fake_res')) - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('revert_resize', 'cast', instance=self.fake_instance_obj, migration={'id': 'fake_id'}, host='host', reservations=list('fake_res')) @@ -713,7 +713,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): 'cast', instance=self.fake_instance_obj, host='host', destroy_disks=True, migrate_data=None, version='4.0') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('rollback_live_migration_at_destination', 'cast', instance=self.fake_instance_obj, host='host', destroy_disks=True, migrate_data=None, version='3.32') @@ -733,7 +733,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): instance=self.fake_instance_obj, new_pass='pw', version='4.0') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('set_admin_password', 'call', instance=self.fake_instance_obj, new_pass='pw', version='3.8') @@ -742,14 +742,14 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): self._test_compute_api('set_host_enabled', 'call', enabled='enabled', host='host') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('set_host_enabled', 'call', enabled='enabled', host='host') def test_get_host_uptime(self): self._test_compute_api('get_host_uptime', 'call', host='host') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('get_host_uptime', 'call', host='host') def test_backup_instance(self): @@ -757,7 +757,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): instance=self.fake_instance_obj, image_id='id', backup_type='type', rotation='rotation') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('backup_instance', 'cast', instance=self.fake_instance_obj, image_id='id', backup_type='type', rotation='rotation') @@ -766,7 +766,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): self._test_compute_api('snapshot_instance', 'cast', instance=self.fake_instance_obj, image_id='id') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('snapshot_instance', 'cast', instance=self.fake_instance_obj, image_id='id') @@ -774,7 +774,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): self._test_compute_api('start_instance', 'cast', instance=self.fake_instance_obj) - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('start_instance', 'cast', instance=self.fake_instance_obj) @@ -789,7 +789,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): self._test_compute_api('stop_instance', 'cast', instance=self.fake_instance_obj, clean_shutdown=True, version='3.37') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('stop_instance', 'cast', instance=self.fake_instance_obj, clean_shutdown=True, version='3.37') @@ -805,7 +805,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): self._test_compute_api('stop_instance', 'call', instance=self.fake_instance_obj, clean_shutdown=True, version='3.37') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('stop_instance', 'call', instance=self.fake_instance_obj, clean_shutdown=True, version='3.37') @@ -814,7 +814,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): self._test_compute_api('suspend_instance', 'cast', instance=self.fake_instance_obj) - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('suspend_instance', 'cast', instance=self.fake_instance_obj) @@ -823,7 +823,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): instance=self.fake_instance_obj, bdms=[], reservations=['uuid1', 'uuid2'], version='4.0') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('terminate_instance', 'cast', instance=self.fake_instance_obj, bdms=[], reservations=['uuid1', 'uuid2'], version='3.22') @@ -832,7 +832,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): self._test_compute_api('unpause_instance', 'cast', instance=self.fake_instance_obj) - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('unpause_instance', 'cast', instance=self.fake_instance_obj) @@ -840,7 +840,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): self._test_compute_api('unrescue_instance', 'cast', instance=self.fake_instance_obj, version='4.0') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('unrescue_instance', 'cast', instance=self.fake_instance_obj, version='3.11') @@ -856,7 +856,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): self._test_compute_api('shelve_instance', 'cast', instance=self.fake_instance_obj, image_id='image_id', clean_shutdown=True, version='3.37') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('shelve_instance', 'cast', instance=self.fake_instance_obj, image_id='image_id', clean_shutdown=True, version='3.37') @@ -873,7 +873,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): self._test_compute_api('shelve_offload_instance', 'cast', instance=self.fake_instance_obj, clean_shutdown=True, version='3.37') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('shelve_offload_instance', 'cast', instance=self.fake_instance_obj, clean_shutdown=True, version='3.37') @@ -884,7 +884,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): filter_properties={'fakeprop': 'fakeval'}, node='node', version='4.0') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('unshelve_instance', 'cast', instance=self.fake_instance_obj, host='host', image='image', filter_properties={'fakeprop': 'fakeval'}, node='node', @@ -895,7 +895,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): instance=self.fake_instance_obj, volume_id='fake_id', create_info={}, version='4.0') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('volume_snapshot_create', 'cast', instance=self.fake_instance_obj, volume_id='fake_id', create_info={}, version='3.6') @@ -905,7 +905,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): instance=self.fake_instance_obj, volume_id='fake_id', snapshot_id='fake_id2', delete_info={}, version='4.0') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('volume_snapshot_delete', 'cast', instance=self.fake_instance_obj, volume_id='fake_id', snapshot_id='fake_id2', delete_info={}, version='3.6') @@ -916,7 +916,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): events=['event'], version='4.0') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('external_instance_event', 'cast', instances=[self.fake_instance_obj], events=['event'], @@ -931,7 +931,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): block_device_mapping=None, node='node', limits=[], version='4.0') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('build_and_run_instance', 'cast', instance=self.fake_instance_obj, host='host', image='image', request_spec={'request': 'spec'}, filter_properties=[], @@ -973,7 +973,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): self._test_compute_api('quiesce_instance', 'call', instance=self.fake_instance_obj, version='4.0') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('quiesce_instance', 'call', instance=self.fake_instance_obj, version='3.39') @@ -981,7 +981,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase): self._test_compute_api('unquiesce_instance', 'cast', instance=self.fake_instance_obj, mapping=None, version='4.0') - self.flags(compute='kilo', group='upgrade_levels') + self.flags(compute='3.40', group='upgrade_levels') self._test_compute_api('unquiesce_instance', 'cast', instance=self.fake_instance_obj, mapping=None, version='3.39')