openstack/nova
Code Issues Proposed changes

conductor: update comments for rpc and use object

Browse Source 
The flavor are objects in conductor now, so
this patch use comma directly.

Also, because conductor still has 1.x RPC support,
change the comments of flavor shim from
'Remove this in version 2.0 of the RPC API'
to
'Remove this when we drop support for v1 of the RPC API'

Related to blueprint liberty-objects

Change-Id: I129e8641a4952d7dde2ed93a7170c1cb6f4da44a
This commit is contained in:
jichenjc
2015-05-22 11:54:09 +08:00
parent ac2eb54cba
commit c32ad364e5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nova/conductor/manager.py
View File

@@ -523,7 +523,7 @@ class ComputeTaskManager(base.Base):
instance = objects.Instance._from_db_object(
context, objects.Instance(), instance,
expected_attrs=attrs)
# NOTE(melwitt): Remove this in version 2.0 of the RPC API
# NOTE: Remove this when we drop support for v1 of the RPC API
if flavor and not isinstance(flavor, objects.Flavor):
# Code downstream may expect extra_specs to be populated since it
# is receiving an object, so lookup the flavor to ensure this.
@@ -563,7 +563,7 @@ class ComputeTaskManager(base.Base):
updates, ex, request_spec)
# if the flavor IDs match, it's migrate; otherwise resize
if flavor['id'] == instance.instance_type_id:
if flavor.id == instance.instance_type_id:
msg = _("No valid host found for cold migrate")
else:
msg = _("No valid host found for resize")