summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorDan Prince <dan.prince@rackspace.com>2011-07-21 20:57:26 +0000
committerTarmac <>2011-07-21 20:57:26 +0000
commit490226870887f9986f9f57b6af7cfcc92e45da7c (patch)
tree2a7ce461be3c132f049c8890afc88cbd8a98d3f8 /nova/api
parenta1b4bf0d74deab62482d8244f8985f5dc1c0b56f (diff)
parent5913e537ceb352ec4e5999cdadb1d826771d5d72 (diff)
Updated the compute API so that has_finished_migration uses instance_uuid.
Fixes some regressions with 1295-1296.
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/views/servers.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/openstack/views/servers.py b/nova/api/openstack/views/servers.py
index ab7e8da61..7131db088 100644
--- a/nova/api/openstack/views/servers.py
+++ b/nova/api/openstack/views/servers.py
@@ -82,7 +82,7 @@ class ViewBuilder(object):
ctxt = nova.context.get_admin_context()
compute_api = nova.compute.API()
- if compute_api.has_finished_migration(ctxt, inst['id']):
+ if compute_api.has_finished_migration(ctxt, inst['uuid']):
inst_dict['status'] = 'RESIZE-CONFIRM'
# Return the metadata as a dictionary