summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-01-20 18:37:20 +0000
committerGerrit Code Review <review@openstack.org>2012-01-20 18:37:20 +0000
commit889a5215842839342fdbe5b2cb2c7d9053ac36b5 (patch)
tree02e5d82cbfd5cce695296b1bbd470f99e902de01 /nova/api
parentc56630c421867df61875a83adfd99ec931896fe7 (diff)
parent942f0404a3d7052830cdc52c17c85de7cd3bc0da (diff)
downloadnova-889a5215842839342fdbe5b2cb2c7d9053ac36b5.tar.gz
nova-889a5215842839342fdbe5b2cb2c7d9053ac36b5.tar.xz
nova-889a5215842839342fdbe5b2cb2c7d9053ac36b5.zip
Merge "Validating image id for rebuild."
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/compute/servers.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py
index 0d8165784..988b403b1 100644
--- a/nova/api/openstack/compute/servers.py
+++ b/nova/api/openstack/compute/servers.py
@@ -1081,6 +1081,9 @@ class Controller(wsgi.Controller):
except exception.InstanceNotFound:
msg = _("Instance could not be found")
raise exc.HTTPNotFound(explanation=msg)
+ except exception.ImageNotFound as error:
+ msg = _("Cannot find image for rebuild")
+ raise exc.HTTPBadRequest(explanation=msg)
instance = self._get_server(context, id)