summaryrefslogtreecommitdiffstats
path: root/nova/compute
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/compute
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/compute')
-rw-r--r--nova/compute/api.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 67aa3c20f..9994e5724 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -467,10 +467,10 @@ class API(base.Base):
return [dict(x.iteritems()) for x in instances]
- def has_finished_migration(self, context, instance_id):
+ def has_finished_migration(self, context, instance_uuid):
"""Returns true if an instance has a finished migration."""
try:
- db.migration_get_by_instance_and_status(context, instance_id,
+ db.migration_get_by_instance_and_status(context, instance_uuid,
'finished')
return True
except exception.NotFound: