diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-06-18 22:07:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-06-18 22:07:34 +0000 |
| commit | 73aec655017afca73e7efeffeac95861ed5e5d33 (patch) | |
| tree | 2bb2dd9315c8c876edf3d3d705ddc821a2da88b1 | |
| parent | ba52373f3827117f07b1b871eed3970c83131973 (diff) | |
| parent | 9ce657702cbc4312669f364e68b0c1faefd0f0af (diff) | |
| download | nova-73aec655017afca73e7efeffeac95861ed5e5d33.tar.gz nova-73aec655017afca73e7efeffeac95861ed5e5d33.tar.xz nova-73aec655017afca73e7efeffeac95861ed5e5d33.zip | |
Merge "bug #996880 change HostNotFound in hosts to HTTPNotFound"
| -rw-r--r-- | nova/api/openstack/compute/contrib/hosts.py | 3 | ||||
| -rw-r--r-- | nova/tests/api/openstack/compute/contrib/test_hosts.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nova/api/openstack/compute/contrib/hosts.py b/nova/api/openstack/compute/contrib/hosts.py index e9d342c53..6cdca56c8 100644 --- a/nova/api/openstack/compute/contrib/hosts.py +++ b/nova/api/openstack/compute/contrib/hosts.py @@ -114,7 +114,8 @@ def check_host(fn): if id in hosts: return fn(self, req, id, *args, **kwargs) else: - raise exception.HostNotFound(host=id) + message = _("Host '%s' could not be found.") % id + raise webob.exc.HTTPNotFound(explanation=message) return wrapped diff --git a/nova/tests/api/openstack/compute/contrib/test_hosts.py b/nova/tests/api/openstack/compute/contrib/test_hosts.py index ae5c39e75..2e4064c21 100644 --- a/nova/tests/api/openstack/compute/contrib/test_hosts.py +++ b/nova/tests/api/openstack/compute/contrib/test_hosts.py @@ -182,7 +182,7 @@ class HostTestCase(test.TestCase): self.assertEqual(result["maintenance_mode"], "on_maintenance") def test_bad_host(self): - self.assertRaises(exception.HostNotFound, self.controller.update, + self.assertRaises(webob.exc.HTTPNotFound, self.controller.update, self.req, "bogus_host_name", body={"status": "disable"}) def test_show_forbidden(self): |