diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-02 19:52:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-02 19:52:25 +0000 |
| commit | 02c29e9dea6f6b7d2df5a2ba1e611510675b451a (patch) | |
| tree | 0a8ac27b18ba0978471dc8aa223a55691ba93eab /nova/api | |
| parent | ab17a55a18c5936ef17b21057b682e0b1cd816cb (diff) | |
| parent | fa16f2b68603be04cb5f4e915625181ac6c119eb (diff) | |
Merge "Remove improper NotFound except block in list servers"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/servers.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py index b0531d0e4..7a8d7d5a8 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -452,9 +452,6 @@ class Controller(wsgi.Controller): servers = self._get_servers(req, is_detail=False) except exception.Invalid as err: raise exc.HTTPBadRequest(explanation=str(err)) - except exception.NotFound: - msg = _("Instance could not be found") - raise exc.HTTPNotFound(explanation=msg) return servers @wsgi.serializers(xml=ServersTemplate) @@ -464,9 +461,6 @@ class Controller(wsgi.Controller): servers = self._get_servers(req, is_detail=True) except exception.Invalid as err: raise exc.HTTPBadRequest(explanation=str(err)) - except exception.NotFound as err: - msg = _("Instance could not be found") - raise exc.HTTPNotFound(explanation=msg) return servers def _add_instance_faults(self, ctxt, instances): |