From 255a363f78ffd193a4915169d44b85dfeb2c9579 Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Thu, 10 Nov 2011 15:58:17 -0500
Subject: Converting metadata calls to use instance objects

Related to blueprint internal-uuids

Change-Id: Ic21bffbdb538fb8c1bdd1d729982e2da0a56bdf8
---
 nova/compute/api.py | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

(limited to 'nova/compute')

diff --git a/nova/compute/api.py b/nova/compute/api.py
index 03d5933b0..4ddbb86c5 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -1230,8 +1230,8 @@ class API(base.Base):
         migration_ref = self.db.migration_get_by_instance_and_status(context,
                 instance['uuid'], 'finished')
         if not migration_ref:
-            raise exception.MigrationNotFoundByStatus(instance_id=instance_id,
-                                                      status='finished')
+            raise exception.MigrationNotFoundByStatus(
+                    instance_id=instance['id'], status='finished')
 
         self.update(context,
                     instance['id'],
@@ -1563,24 +1563,16 @@ class API(base.Base):
                                                floating_address=address,
                                                fixed_address=fixed_ip_addrs[0])
 
-    def _get_native_instance_id(self, context, instance_id):
-        """If an instance id is a UUID, convert it to a native ID."""
-        if utils.is_uuid_like(instance_id):
-            instance_id = self.get(context, instance_id)['id']
-        return instance_id
-
-    def get_instance_metadata(self, context, instance_id):
+    def get_instance_metadata(self, context, instance):
         """Get all metadata associated with an instance."""
-        instance_id = self._get_native_instance_id(context, instance_id)
-        rv = self.db.instance_metadata_get(context, instance_id)
+        rv = self.db.instance_metadata_get(context, instance['id'])
         return dict(rv.iteritems())
 
-    def delete_instance_metadata(self, context, instance_id, key):
+    def delete_instance_metadata(self, context, instance, key):
         """Delete the given metadata item from an instance."""
-        instance_id = self._get_native_instance_id(context, instance_id)
-        self.db.instance_metadata_delete(context, instance_id, key)
+        self.db.instance_metadata_delete(context, instance['id'], key)
 
-    def update_instance_metadata(self, context, instance_id,
+    def update_instance_metadata(self, context, instance,
                                  metadata, delete=False):
         """Updates or creates instance metadata.
 
@@ -1588,14 +1580,13 @@ class API(base.Base):
         `metadata` argument will be deleted.
 
         """
-        instance_id = self._get_native_instance_id(context, instance_id)
-
         if delete:
             _metadata = metadata
         else:
-            _metadata = self.get_instance_metadata(context, instance_id)
+            _metadata = self.get_instance_metadata(context, instance)
             _metadata.update(metadata)
 
         self._check_metadata_properties_quota(context, _metadata)
-        self.db.instance_metadata_update(context, instance_id, _metadata, True)
+        self.db.instance_metadata_update(context, instance['id'],
+                                         _metadata, True)
         return _metadata
-- 
cgit