diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-04-11 05:29:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-04-11 05:29:35 +0000 |
| commit | 6b2af9c084754a1e678f741bfc6b97e13f1cf8a5 (patch) | |
| tree | 0e4d876457ab92a0a9afd4a01420ece7ee62bc2e | |
| parent | 7e0ac843e550b6ff645fc1b5aec652d1b45b0b41 (diff) | |
| parent | 7f9874b8c4bceb6cf7dff1ecfd4729f9927195b2 (diff) | |
Merge "Fix issues with check_instance_shared_storage."
| -rwxr-xr-x | nova/compute/manager.py | 2 | ||||
| -rw-r--r-- | nova/compute/rpcapi.py | 4 | ||||
| -rw-r--r-- | nova/tests/compute/test_rpcapi.py | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index ed9a50ec8..bd326ad2b 100755 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -3073,7 +3073,7 @@ class ComputeManager(manager.SchedulerDependentManager): raise exception.NotFound(_("Host %(host)s not found") % locals()) @exception.wrap_exception(notifier=notifier, publisher_id=publisher_id()) - def check_instance_shared_storage(self, ctxt, data): + def check_instance_shared_storage(self, ctxt, instance, data): """Check if the instance files are shared :param context: security context diff --git a/nova/compute/rpcapi.py b/nova/compute/rpcapi.py index 1ddadde75..dfa19517e 100644 --- a/nova/compute/rpcapi.py +++ b/nova/compute/rpcapi.py @@ -251,9 +251,11 @@ class ComputeAPI(nova.openstack.common.rpc.proxy.RpcProxy): def check_instance_shared_storage(self, ctxt, instance, data): instance_p = jsonutils.to_primitive(instance) return self.call(ctxt, self.make_msg('check_instance_shared_storage', + instance=instance_p, data=data), topic=_compute_topic(self.topic, ctxt, None, - instance)) + instance), + version='2.28') def confirm_resize(self, ctxt, instance, migration, host, reservations=None, cast=True): diff --git a/nova/tests/compute/test_rpcapi.py b/nova/tests/compute/test_rpcapi.py index a089e9dc6..2edf2e20f 100644 --- a/nova/tests/compute/test_rpcapi.py +++ b/nova/tests/compute/test_rpcapi.py @@ -122,6 +122,10 @@ class ComputeRpcAPITestCase(test.TestCase): instance=self.fake_instance, dest_check_data={"test": "data"}) + def test_check_instance_shared_storage(self): + self._test_compute_api('check_instance_shared_storage', 'call', + instance=self.fake_instance, data='foo', version='2.28') + def test_confirm_resize_cast(self): self._test_compute_api('confirm_resize', 'cast', instance=self.fake_instance, migration={'id': 'foo'}, |