diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-02-22 22:05:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-02-22 22:05:58 +0000 |
| commit | beb49b664cde757784f4f93d2a0ea5346288ed37 (patch) | |
| tree | b842626a74fcae868c15749e6b09f71cbb772361 /nova/api | |
| parent | 1ef939bf40e18a73cfce2d8bc039211ae044c379 (diff) | |
| parent | 1767e0ae9595003c22facc86e590b7c9b1ed6a75 (diff) | |
| download | nova-beb49b664cde757784f4f93d2a0ea5346288ed37.tar.gz nova-beb49b664cde757784f4f93d2a0ea5346288ed37.tar.xz nova-beb49b664cde757784f4f93d2a0ea5346288ed37.zip | |
Merge "Return 40x for flavor.create duplicate."
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/contrib/flavormanage.py | 9 |
1 files changed, 6 insertions, 3 deletions
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) |