openstack/nova
Code Issues Proposed changes

Merge "conductor: update comments for rpc and use object"

Browse Source
This commit is contained in:
Jenkins
2015-08-23 21:52:52 +00:00
committed by Gerrit Code Review
parent afd264ac36 c32ad364e5
commit 38f9906d4b
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

@@ -524,7 +524,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.
@@ -564,7 +564,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")