diff options
| author | matt.dietz@rackspace.com <> | 2011-03-23 18:56:23 +0000 |
|---|---|---|
| committer | matt.dietz@rackspace.com <> | 2011-03-23 18:56:23 +0000 |
| commit | c3d47689a762bfa4aa38c7d4700bb1969d37d1d1 (patch) | |
| tree | c6d7513c4264ba3a2d6ee48336c6e02be091b59e /nova/api | |
| parent | 8792383dfbd630388e6a51a76910e73203a3793f (diff) | |
merge prop changes
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/views/servers.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/nova/api/openstack/views/servers.py b/nova/api/openstack/views/servers.py index 709052f22..a21a6e7ff 100644 --- a/nova/api/openstack/views/servers.py +++ b/nova/api/openstack/views/servers.py @@ -18,6 +18,7 @@ import hashlib from nova.compute import power_state +import nova.compute.api import nova.context from nova import db from nova.api.openstack import common @@ -87,14 +88,10 @@ class ViewBuilder(object): for k, v in mapped_keys.iteritems(): inst_dict[k] = inst[v] + ctxt = nova.context.get_admin_context() inst_dict['status'] = power_mapping[inst_dict['status']] - try: - ctxt = nova.context.get_admin_context() - migration = db.migration_get_by_instance_and_status(ctxt, - inst['id'], 'finished') + if nova.compute.api.has_finished_migration(ctxt, inst['id']): inst_dict['status'] = 'resize-confirm' - except: - pass inst_dict['addresses'] = self.addresses_builder.build(inst) |