summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-06-18 22:07:34 +0000
committerGerrit Code Review <review@openstack.org>2012-06-18 22:07:34 +0000
commit73aec655017afca73e7efeffeac95861ed5e5d33 (patch)
tree2bb2dd9315c8c876edf3d3d705ddc821a2da88b1 /nova/api
parentba52373f3827117f07b1b871eed3970c83131973 (diff)
parent9ce657702cbc4312669f364e68b0c1faefd0f0af (diff)
downloadnova-73aec655017afca73e7efeffeac95861ed5e5d33.tar.gz
nova-73aec655017afca73e7efeffeac95861ed5e5d33.tar.xz
nova-73aec655017afca73e7efeffeac95861ed5e5d33.zip
Merge "bug #996880 change HostNotFound in hosts to HTTPNotFound"
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/compute/contrib/hosts.py3
1 files changed, 2 insertions, 1 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