diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-11-11 19:21:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-11-11 19:21:28 +0000 |
| commit | b9086d3ad2da90f31001c082d371c8b972ca767b (patch) | |
| tree | d111ebffbf09f942b6e7030363d3c97c20992254 /nova/api | |
| parent | 314539cce77846a7fe9ff7dc52d6291fcc34814e (diff) | |
| parent | 255a363f78ffd193a4915169d44b85dfeb2c9579 (diff) | |
Merge "Converting metadata calls to use instance objects"
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 2d156efbb..4145898c1 100644 --- a/nova/api/openstack/server_metadata.py +++ b/nova/api/openstack/server_metadata.py @@ -32,7 +32,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) @@ -106,8 +107,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) @@ -146,7 +148,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) |