diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-10-17 18:17:18 -0400 |
|---|---|---|
| committer | Brian Waldon <brian.waldon@rackspace.com> | 2011-10-17 18:20:11 -0400 |
| commit | 7f37543cb682403274d402f0630545cf2fb765be (patch) | |
| tree | a794829f823eecd1925476bf75b0fc02e5ef0533 /nova/api | |
| parent | 821fae95d6aa86ffd14a4e48254da8ee7392c042 (diff) | |
| download | nova-7f37543cb682403274d402f0630545cf2fb765be.tar.gz nova-7f37543cb682403274d402f0630545cf2fb765be.tar.xz nova-7f37543cb682403274d402f0630545cf2fb765be.zip | |
Refactoring image and server metadata api tests
Change-Id: Ie8abd19af727d665f5b137d34b3d63126eb5d0aa
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/server_metadata.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nova/api/openstack/server_metadata.py b/nova/api/openstack/server_metadata.py index 8ac3319c9..d764075b7 100644 --- a/nova/api/openstack/server_metadata.py +++ b/nova/api/openstack/server_metadata.py @@ -146,7 +146,11 @@ class Controller(object): msg = _("Metadata item was not found") raise exc.HTTPNotFound(explanation=msg) - self.compute_api.delete_instance_metadata(context, server_id, id) + try: + self.compute_api.delete_instance_metadata(context, server_id, id) + except exception.InstanceNotFound: + msg = _('Server does not exist') + raise exc.HTTPNotFound(explanation=msg) def _handle_quota_error(self, error): """Reraise quota errors as api-specific http exceptions.""" |