summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-06-24 18:19:20 +0000
committerGerrit Code Review <review@openstack.org>2013-06-24 18:19:20 +0000
commit8c62626ec0c5d3526230789a3ab25c358a72eebe (patch)
tree49153f16b23b7a86f5a77ac8dbe9cd6db6d44f8e /nova/api
parent243ea7e668e49a4c121a88b3d1eb075ce20f88ca (diff)
parent8ee10c55b045ab6d85b41dddbbb95384d009fb9b (diff)
downloadnova-8c62626ec0c5d3526230789a3ab25c358a72eebe.tar.gz
nova-8c62626ec0c5d3526230789a3ab25c358a72eebe.tar.xz
nova-8c62626ec0c5d3526230789a3ab25c358a72eebe.zip
Merge "Add invalid number checking in flavor creation api"
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/compute/contrib/flavormanage.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/nova/api/openstack/compute/contrib/flavormanage.py b/nova/api/openstack/compute/contrib/flavormanage.py
index 43d5d2110..441858c25 100644
--- a/nova/api/openstack/compute/contrib/flavormanage.py
+++ b/nova/api/openstack/compute/contrib/flavormanage.py
@@ -76,6 +76,8 @@ class FlavorManageController(wsgi.Controller):
except (exception.InstanceTypeExists,
exception.InstanceTypeIdExists) as err:
raise webob.exc.HTTPConflict(explanation=err.format_message())
+ except exception.InvalidInput as exc:
+ raise webob.exc.HTTPBadRequest(explanation=exc.format_message())
return self._view_builder.show(req, flavor)