diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-27 23:22:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-27 23:22:03 +0000 |
| commit | ebd97be9d6448298811ffccaf30b886ac08bf49f (patch) | |
| tree | 4656a09bf01aba06299c82b949d1f2d0d9956f39 | |
| parent | 3d50060ee0e29d90c4d98030ca1f4f27d89b5c9a (diff) | |
| parent | fa9ad5e3585734f42ae235c0eb4c4518ba1c201c (diff) | |
| download | nova-ebd97be9d6448298811ffccaf30b886ac08bf49f.tar.gz nova-ebd97be9d6448298811ffccaf30b886ac08bf49f.tar.xz nova-ebd97be9d6448298811ffccaf30b886ac08bf49f.zip | |
Merge "Explicitly send primitive instances via rpc."
| -rw-r--r-- | nova/compute/rpcapi.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nova/compute/rpcapi.py b/nova/compute/rpcapi.py index 5def90cd2..1b9f86ca0 100644 --- a/nova/compute/rpcapi.py +++ b/nova/compute/rpcapi.py @@ -203,7 +203,7 @@ class ComputeAPI(nova.openstack.common.rpc.proxy.RpcProxy): def get_vnc_console(self, ctxt, instance, console_type): instance_p = jsonutils.to_primitive(instance) return self.call(ctxt, self.make_msg('get_vnc_console', - instance=instance, console_type=console_type), + instance=instance_p, console_type=console_type), topic=_compute_topic(self.topic, ctxt, None, instance), version='1.17') @@ -228,7 +228,7 @@ class ComputeAPI(nova.openstack.common.rpc.proxy.RpcProxy): def inject_file(self, ctxt, instance, path, file_contents): instance_p = jsonutils.to_primitive(instance) self.cast(ctxt, self.make_msg('inject_file', - instance=instance, path=path, + instance=instance_p, path=path, file_contents=file_contents), topic=_compute_topic(self.topic, ctxt, None, instance), version='1.18') @@ -236,7 +236,7 @@ class ComputeAPI(nova.openstack.common.rpc.proxy.RpcProxy): def inject_network_info(self, ctxt, instance): instance_p = jsonutils.to_primitive(instance) self.cast(ctxt, self.make_msg('inject_network_info', - instance=instance), + instance=instance_p), topic=_compute_topic(self.topic, ctxt, None, instance), version='1.19') @@ -397,7 +397,7 @@ class ComputeAPI(nova.openstack.common.rpc.proxy.RpcProxy): rpc_method = self.cast if cast else self.call instance_p = jsonutils.to_primitive(instance) return rpc_method(ctxt, self.make_msg('stop_instance', - instance=instance), + instance=instance_p), topic=_compute_topic(self.topic, ctxt, None, instance), version='1.21') |