From 3db7a943bebbda5fea07fc80813cabc436fb892b Mon Sep 17 00:00:00 2001 From: Andy McCrae Date: Thu, 27 Sep 2012 11:58:14 +0000 Subject: Fixes error message for flavor-create duplicate ID Fixes bug 1056918 Change-Id: I516153211504b67f6e8b8ebb138abcef4be4d73e --- nova/api/openstack/compute/contrib/flavormanage.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'nova/api') diff --git a/nova/api/openstack/compute/contrib/flavormanage.py b/nova/api/openstack/compute/contrib/flavormanage.py index 69d5d6ed9..e8ac4d522 100644 --- a/nova/api/openstack/compute/contrib/flavormanage.py +++ b/nova/api/openstack/compute/contrib/flavormanage.py @@ -73,7 +73,8 @@ class FlavorManageController(wsgi.Controller): root_gb, ephemeral_gb, flavorid, swap, rxtx_factor, is_public) req.cache_db_flavor(flavor) - except exception.InstanceTypeExists as err: + except (exception.InstanceTypeExists, + exception.InstanceTypeIdExists) as err: raise webob.exc.HTTPConflict(explanation=str(err)) return self._view_builder.show(req, flavor) -- cgit