diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-31 04:01:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-31 04:01:56 +0000 |
| commit | dc65ed42db79d242cbcdf4beb7a287be0fc707b6 (patch) | |
| tree | c51d27952b97aea1fc986722451682aa73cc4961 /nova/tests | |
| parent | 1f451731d58e01718f3b99d83f08acd251347202 (diff) | |
| parent | 73af6fa9722b720923002f62e115d84b74c9fe33 (diff) | |
Merge "Send a full instance in remove_volume_connection."
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/compute/test_compute.py | 6 | ||||
| -rw-r--r-- | nova/tests/compute/test_rpcapi.py | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index fc2b183d9..27f0eb565 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -1612,11 +1612,13 @@ class ComputeTestCase(BaseTestCase): 'args': {'instance_id': inst_id, 'host': self.compute.host, 'teardown': False}}) + rpcinst = jsonutils.to_primitive( + db.instance_get_by_uuid(self.context, instance['uuid'])) rpc.call(c, topic, {"method": "remove_volume_connection", - "args": {'instance_id': inst_id, + "args": {'instance': rpcinst, 'volume_id': volume_id}, - "version": "1.0"}, None) + "version": "1.26"}, None) rpc.cast(c, topic, {"method": "rollback_live_migration_at_destination", "args": {'instance_id': inst_id}, diff --git a/nova/tests/compute/test_rpcapi.py b/nova/tests/compute/test_rpcapi.py index e081c1455..edfbc309b 100644 --- a/nova/tests/compute/test_rpcapi.py +++ b/nova/tests/compute/test_rpcapi.py @@ -58,7 +58,7 @@ class ComputeRpcAPITestCase(test.TestCase): 'post_live_migration_at_destination', 'power_off_instance', 'power_on_instance', 'pre_live_migration', 'reboot_instance', 'rebuild_instance', 'remove_fixed_ip_from_instance', - 'start_instance', 'stop_instance', + 'remove_volume_connection', 'start_instance', 'stop_instance', 'suspend_instance', 'unpause_instance' ] @@ -84,8 +84,7 @@ class ComputeRpcAPITestCase(test.TestCase): methods_with_instance): instance = expected_msg['args']['instance'] del expected_msg['args']['instance'] - if method in ['rollback_live_migration_at_destination', - 'remove_volume_connection']: + if method in ['rollback_live_migration_at_destination']: expected_msg['args']['instance_id'] = instance['id'] else: expected_msg['args']['instance_uuid'] = instance['uuid'] @@ -262,7 +261,8 @@ class ComputeRpcAPITestCase(test.TestCase): def test_remove_volume_connection(self): self._test_compute_api('remove_volume_connection', 'call', - instance=self.fake_instance, volume_id='id', host='host') + instance=self.fake_instance, volume_id='id', host='host', + version='1.26') def test_rescue_instance(self): self._test_compute_api('rescue_instance', 'cast', |