openstack/nova
Code Issues Proposed changes

Merge "compute rpcapi 2.29 is not backwards compatible"

Browse Source
This commit is contained in:
Jenkins
2013-09-03 19:27:43 +00:00
committed by Gerrit Code Review
parent b8562d3c57 1c307e592c
commit dd5a734c5a
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
nova/compute/rpcapi.py
View File

@@ -740,17 +740,29 @@ class ComputeAPI(nova.openstack.common.rpc.proxy.RpcProxy):
version=version) version=version)
def start_instance(self, ctxt, instance): def start_instance(self, ctxt, instance):
if self.can_send_version('2.29'):
version = '2.29'
else:
version = '2.0'
instance = jsonutils.to_primitive(
objects_base.obj_to_primitive(instance))
self.cast(ctxt, self.make_msg('start_instance', self.cast(ctxt, self.make_msg('start_instance',
instance=instance), instance=instance),
topic=_compute_topic(self.topic, ctxt, None, instance), topic=_compute_topic(self.topic, ctxt, None, instance),
version='2.29') version=version)
def stop_instance(self, ctxt, instance, do_cast=True): def stop_instance(self, ctxt, instance, do_cast=True):
if self.can_send_version('2.29'):
version = '2.29'
else:
version = '2.0'
instance = jsonutils.to_primitive(
objects_base.obj_to_primitive(instance))
rpc_method = self.cast if do_cast else self.call rpc_method = self.cast if do_cast else self.call
return rpc_method(ctxt, self.make_msg('stop_instance', return rpc_method(ctxt, self.make_msg('stop_instance',
instance=instance), instance=instance),
topic=_compute_topic(self.topic, ctxt, None, instance), topic=_compute_topic(self.topic, ctxt, None, instance),
version='2.29') version=version)
def suspend_instance(self, ctxt, instance): def suspend_instance(self, ctxt, instance):
if self.can_send_version('2.33'): if self.can_send_version('2.33'):