From 4de24a4d44040ba38a474cd789b95a2b59d494ff Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Mon, 8 Aug 2011 17:33:03 -0400
Subject: making server metadata work functionally

---
 nova/api/openstack/server_metadata.py | 18 +++++++++++-------
 nova/db/api.py                        |  2 +-
 nova/db/sqlalchemy/api.py             | 12 ++++++------
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/nova/api/openstack/server_metadata.py b/nova/api/openstack/server_metadata.py
index 969769729..ed90be0c9 100644
--- a/nova/api/openstack/server_metadata.py
+++ b/nova/api/openstack/server_metadata.py
@@ -23,6 +23,10 @@ from nova.api.openstack import wsgi
 from nova import exception
 from nova import quota
 
+from nova import log as logging
+
+LOG = logging.getLogger("nova.api.openstack.server_metadata")
+
 
 class Controller(object):
     """ The server metadata API controller for the Openstack API """
@@ -69,19 +73,19 @@ class Controller(object):
             raise exc.HTTPBadRequest(explanation=expl)
 
         try:
-            meta_value = meta_item.pop(id)
+            meta_value = meta_item[id]
         except (AttributeError, KeyError):
             expl = _('Request body and URI mismatch')
             raise exc.HTTPBadRequest(explanation=expl)
 
-        if len(meta_item) > 0:
+        if len(meta_item) > 1:
             expl = _('Request body contains too many items')
             raise exc.HTTPBadRequest(explanation=expl)
 
         context = req.environ['nova.context']
         self._update_instance_metadata(context, server_id, meta_item, False)
 
-        return {'meta': {id: meta_value}}
+        return {'meta': meta_item}
 
     def update_all(self, req, server_id, body):
         try:
@@ -107,8 +111,8 @@ class Controller(object):
             msg = _('Server does not exist')
             raise exc.HTTPNotFound(explanation=msg)
 
-        except (ValueError, AttributeError):
-            msg = _("Malformed request body")
+        except (ValueError, AttributeError), ex:
+            msg = _("Malformed request body: %s") % (str(ex),)
             raise exc.HTTPBadRequest(explanation=msg)
 
         except quota.QuotaError as error:
@@ -132,12 +136,12 @@ class Controller(object):
         metadata = self._get_metadata(context, server_id)
 
         try:
-            meta_key = metadata[id]
+            meta_value = metadata[id]
         except KeyError:
             msg = _("Metadata item was not found")
             raise exc.HTTPNotFound(explanation=msg)
 
-        self.compute_api.delete_instance_metadata(context, server_id, meta_key)
+        self.compute_api.delete_instance_metadata(context, server_id, id)
 
     def _handle_quota_error(self, error):
         """Reraise quota errors as api-specific http exceptions."""
diff --git a/nova/db/api.py b/nova/db/api.py
index 90003cf86..0516c683f 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -1383,7 +1383,7 @@ def instance_metadata_delete(context, instance_id, key):
 
 def instance_metadata_update(context, instance_id, metadata, delete):
     """Update metadata if it exists, otherwise create it."""
-    IMPL.instance_metadata_update(context, instance_id, metadata)
+    IMPL.instance_metadata_update(context, instance_id, metadata, delete)
 
 
 ####################
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 5ae14261c..2e29f34ac 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -3208,10 +3208,12 @@ def instance_metadata_update(context, instance_id, metadata, delete):
     # Set all metadata that isn't passed in if delete kwarg is True
     if delete:
         original_metadata = instance_metadata_get(context, instance_id)
-        for meta in original_metadata.iteritems():
-            if meta.key not in metadata:
-                meta.update({"deleted": True})
-                meta.save(session=session)
+        for meta_key, meta_value in original_metadata.iteritems():
+            if meta_key not in metadata:
+                meta_ref = instance_metadata_get_item(context, instance_id,
+                                                      meta_key, session)
+                meta_ref.update({'deleted': True})
+                meta_ref.save(session=session)
 
     meta_ref = None
 
@@ -3221,11 +3223,9 @@ def instance_metadata_update(context, instance_id, metadata, delete):
         # update the value whether it exists or not
         item = {"value": meta_value}
 
-        # if the metadata item exists, make sure it is not delete
         try:
             meta_ref = instance_metadata_get_item(context, instance_id,
                                                   meta_key, session)
-            item.update({"deleted": False})
 
         # if the item doesn't exist, we also need to set key and instance_id
         except exception.InstanceMetadataNotFound, e:
-- 
cgit