diff options
| author | Dan Smith <danms@us.ibm.com> | 2013-06-19 09:43:54 -0700 |
|---|---|---|
| committer | Dan Smith <danms@us.ibm.com> | 2013-06-20 15:30:48 -0700 |
| commit | ff4194bec79067bf77ab25caec1e40ad3709ea07 (patch) | |
| tree | 12e636d1d482936890c8b28db7c9f3898fdd6972 /nova/compute | |
| parent | d26581d93945c8a44212e98508c26ff71b10f05e (diff) | |
| download | nova-ff4194bec79067bf77ab25caec1e40ad3709ea07.tar.gz nova-ff4194bec79067bf77ab25caec1e40ad3709ea07.tar.xz nova-ff4194bec79067bf77ab25caec1e40ad3709ea07.zip | |
Make _poll_unconfirmed_resizes() use objects
This makes the _poll_unconfirmed_resizes() periodic task use
objects for looking up the instance state information.
This patch also makes compute_confirm_resize() take instance
objects. Although this method will be obsolete after a full
conversion to objects, this makes it send a full instance object
to the conductor manager, which is then converted to a dict for
passing to compute_api (for now). This will allow a more complete
conversion of the use of it to objects, and then the dict hack
will be removed when the method itself goes away.
Related to blueprint unified-object-model
Change-Id: I03c1a28a1bbd9732f803e140e93d214dd5c7792e
Diffstat (limited to 'nova/compute')
| -rwxr-xr-x | nova/compute/manager.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 0a6a9d08d..237831cd1 100755 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -3707,8 +3707,8 @@ class ComputeManager(manager.SchedulerDependentManager): {'migration_id': migration['id'], 'instance_uuid': instance_uuid}) try: - instance = self.conductor_api.instance_get_by_uuid( - context, instance_uuid) + instance = instance_obj.Instance.get_by_uuid(context, + instance_uuid) except exception.InstanceNotFound: reason = (_("Instance %s not found") % instance_uuid) |