From 255a363f78ffd193a4915169d44b85dfeb2c9579 Mon Sep 17 00:00:00 2001 From: Brian Waldon 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/api/openstack/server_metadata.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'nova/api') diff --git a/nova/api/openstack/server_metadata.py b/nova/api/openstack/server_metadata.py index d764075b7..215621546 100644 --- a/nova/api/openstack/server_metadata.py +++ b/nova/api/openstack/server_metadata.py @@ -33,7 +33,8 @@ class Controller(object): def _get_metadata(self, context, server_id): try: - meta = self.compute_api.get_instance_metadata(context, server_id) + server = self.compute_api.get(context, server_id) + meta = self.compute_api.get_instance_metadata(context, server) except exception.InstanceNotFound: msg = _('Server does not exist') raise exc.HTTPNotFound(explanation=msg) @@ -107,8 +108,9 @@ class Controller(object): def _update_instance_metadata(self, context, server_id, metadata, delete=False): try: + server = self.compute_api.get(context, server_id) return self.compute_api.update_instance_metadata(context, - server_id, + server, metadata, delete) @@ -147,7 +149,8 @@ class Controller(object): raise exc.HTTPNotFound(explanation=msg) try: - self.compute_api.delete_instance_metadata(context, server_id, id) + server = self.compute_api.get(context, server_id) + self.compute_api.delete_instance_metadata(context, server, id) except exception.InstanceNotFound: msg = _('Server does not exist') raise exc.HTTPNotFound(explanation=msg) -- cgit