diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-11-10 15:58:17 -0500 |
|---|---|---|
| committer | Brian Waldon <brian.waldon@rackspace.com> | 2011-11-10 16:00:01 -0500 |
| commit | 255a363f78ffd193a4915169d44b85dfeb2c9579 (patch) | |
| tree | 63ea4d8b5439265ca7ca971f3e3fe7ffb58afa34 /nova/api | |
| parent | 1a5418b7cbc6f19000ee2847067c681685dd416e (diff) | |
Converting metadata calls to use instance objects
Related to blueprint internal-uuids
Change-Id: Ic21bffbdb538fb8c1bdd1d729982e2da0a56bdf8
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/server_metadata.py | 9 |
1 files changed, 6 insertions, 3 deletions
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) |