From 1767e0ae9595003c22facc86e590b7c9b1ed6a75 Mon Sep 17 00:00:00 2001 From: Anthony Young Date: Tue, 21 Feb 2012 21:10:57 -0800 Subject: Return 40x for flavor.create duplicate. * Fixes bug 938194 * Return error 409 instead of 400 Change-Id: Ia3c597dc996d88e7026f76d1104058259c96301c --- nova/api/openstack/compute/contrib/flavormanage.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'nova/api') diff --git a/nova/api/openstack/compute/contrib/flavormanage.py b/nova/api/openstack/compute/contrib/flavormanage.py index 3fe9bc669..547760e94 100644 --- a/nova/api/openstack/compute/contrib/flavormanage.py +++ b/nova/api/openstack/compute/contrib/flavormanage.py @@ -66,9 +66,12 @@ class FlavorManageController(wsgi.Controller): swap = vals.get('swap') rxtx_factor = vals.get('rxtx_factor') - flavor = instance_types.create(name, memory_mb, vcpus, - root_gb, ephemeral_gb, flavorid, - swap, rxtx_factor) + try: + flavor = instance_types.create(name, memory_mb, vcpus, + root_gb, ephemeral_gb, flavorid, + swap, rxtx_factor) + except exception.InstanceTypeExists as err: + raise webob.exc.HTTPConflict(explanation=str(err)) return self._view_builder.show(req, flavor) -- cgit