diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-10-18 19:18:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-10-18 19:18:33 +0000 |
| commit | e92494eeac688677f851028ae0dcb97031bea064 (patch) | |
| tree | 1696c9c2de018841a2be56931b2f5dc5c56ad873 /nova/api | |
| parent | 000174461a96ca70c76c8f3a85d9bf25fe673a2d (diff) | |
| parent | 7f37543cb682403274d402f0630545cf2fb765be (diff) | |
Merge "Refactoring image and server metadata api tests"
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.""" |