diff options
| author | Chris Behrens <cbehrens@codestud.com> | 2011-08-03 00:53:13 -0700 |
|---|---|---|
| committer | Chris Behrens <cbehrens@codestud.com> | 2011-08-03 00:53:13 -0700 |
| commit | a5390a5b1cb95ca9aee6e2f99572498dd60b48e5 (patch) | |
| tree | 97ffaaa593ba45b74ae4a0cd43f6abcefa43a8c2 /nova/api | |
| parent | 994e219ab0b25d48b31484a43a0ac12099cf226e (diff) | |
remove faults.Fault wrapper on exceptions
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/servers.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index b028d3a40..6ad549c97 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -95,9 +95,9 @@ class Controller(object): try: servers = self._servers_from_request(req, is_detail=False) except exception.Invalid as err: - return faults.Fault(exc.HTTPBadRequest(explanation=str(err))) + return exc.HTTPBadRequest(explanation=str(err)) except exception.NotFound: - return faults.Fault(exc.HTTPNotFound()) + return exc.HTTPNotFound() return servers def detail(self, req): @@ -105,9 +105,9 @@ class Controller(object): try: servers = self._servers_from_request(req, is_detail=True) except exception.Invalid as err: - return faults.Fault(exc.HTTPBadRequest(explanation=str(err))) + return exc.HTTPBadRequest(explanation=str(err)) except exception.NotFound as err: - return faults.Fault(exc.HTTPNotFound()) + return exc.HTTPNotFound() return servers def _build_view(self, req, instance, is_detail=False): |