diff options
| author | Dan Prince <dan.prince@rackspace.com> | 2011-07-21 20:57:26 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-07-21 20:57:26 +0000 |
| commit | 490226870887f9986f9f57b6af7cfcc92e45da7c (patch) | |
| tree | 2a7ce461be3c132f049c8890afc88cbd8a98d3f8 | |
| parent | a1b4bf0d74deab62482d8244f8985f5dc1c0b56f (diff) | |
| parent | 5913e537ceb352ec4e5999cdadb1d826771d5d72 (diff) | |
| download | nova-490226870887f9986f9f57b6af7cfcc92e45da7c.tar.gz nova-490226870887f9986f9f57b6af7cfcc92e45da7c.tar.xz nova-490226870887f9986f9f57b6af7cfcc92e45da7c.zip | |
Updated the compute API so that has_finished_migration uses instance_uuid.
Fixes some regressions with 1295-1296.
| -rw-r--r-- | nova/api/openstack/views/servers.py | 2 | ||||
| -rw-r--r-- | nova/compute/api.py | 4 | ||||
| -rw-r--r-- | nova/db/api.py | 6 |
3 files changed, 6 insertions, 6 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 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: diff --git a/nova/db/api.py b/nova/db/api.py index d69732920..47308bdba 100644 --- a/nova/db/api.py +++ b/nova/db/api.py @@ -314,9 +314,9 @@ def migration_get(context, migration_id): return IMPL.migration_get(context, migration_id) -def migration_get_by_instance_and_status(context, instance_id, status): - """Finds a migration by the instance id its migrating.""" - return IMPL.migration_get_by_instance_and_status(context, instance_id, +def migration_get_by_instance_and_status(context, instance_uuid, status): + """Finds a migration by the instance uuid its migrating.""" + return IMPL.migration_get_by_instance_and_status(context, instance_uuid, status) |