openstack/nova
Code Issues Proposed changes

Fixes error message for flavor-create duplicate ID

Browse Source 
Fixes bug 1056918

Change-Id: I516153211504b67f6e8b8ebb138abcef4be4d73e
This commit is contained in:
Andy McCrae
2012-09-27 11:58:14 +00:00
parent 32b674b0ab
commit 3db7a943be
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nova/api/openstack/compute/contrib/flavormanage.py
View File

@@ -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)

2
nova/db/sqlalchemy/api.py
View File

@@ -3869,7 +3869,7 @@ def instance_type_create(context, values):
try:
instance_type_get_by_flavor_id(context, values['flavorid'],
session)
raise exception.InstanceTypeExists(name=values['name'])
raise exception.InstanceTypeIdExists(flavor_id=values['flavorid'])
except exception.FlavorNotFound:
pass
try:

6
nova/exception.py
View File

@@ -876,7 +876,11 @@ class InstanceExists(Duplicate):
class InstanceTypeExists(Duplicate):
message = _("Instance Type %(name)s already exists.")
message = _("Instance Type with name %(name)s already exists.")
class InstanceTypeIdExists(Duplicate):
message = _("Instance Type with ID %(flavor_id)s already exists.")
class FlavorAccessExists(Duplicate):

2
nova/tests/test_instance_types.py
View File

@@ -159,7 +159,7 @@ class InstanceTypeTestCase(test.TestCase):
"""Ensures that flavorid duplicates raise InstanceTypeCreateFailed"""
flavorid = 'flavor1'
instance_types.create('name one', 256, 1, 120, 200, flavorid)
self.assertRaises(exception.InstanceTypeExists,
self.assertRaises(exception.InstanceTypeIdExists,
instance_types.create,
'name two', 256, 1, 120, 200, flavorid)