openstack/nova
Code Issues Proposed changes

Merge "Fix compatibility with older confirm_resize() calls"

Browse Source
This commit is contained in:
Jenkins
2013-07-15 23:01:10 +00:00
committed by Gerrit Code Review
parent ea40f4bc57 3fa142627b
commit e115b2b00e
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nova/conductor/rpcapi.py
View File

@@ -484,9 +484,15 @@ class ConductorAPI(nova.openstack.common.rpc.proxy.RpcProxy):
def compute_confirm_resize(self, context, instance, migration_ref):
migration_p = jsonutils.to_primitive(migration_ref)
if not self.can_send_version('1.52'):
instance = jsonutils.to_primitive(
objects_base.obj_to_primitive(instance))
version = '1.46'
else:
version = '1.52'
msg = self.make_msg('compute_confirm_resize', instance=instance,
migration_ref=migration_p)
return self.call(context, msg, version='1.52')
return self.call(context, msg, version=version)
def compute_unrescue(self, context, instance):
instance_p = jsonutils.to_primitive(instance)