diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-30 07:36:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-30 07:36:35 +0000 |
| commit | 7284dca72a5adb29b3e3e67ffec1c0821f12d7fb (patch) | |
| tree | d5c7e8780a83019da6395b16481180a373528177 | |
| parent | 2377d6a7b6b275febdf57b345c72a402254eb925 (diff) | |
| parent | 3db7a943bebbda5fea07fc80813cabc436fb892b (diff) | |
| download | nova-7284dca72a5adb29b3e3e67ffec1c0821f12d7fb.tar.gz nova-7284dca72a5adb29b3e3e67ffec1c0821f12d7fb.tar.xz nova-7284dca72a5adb29b3e3e67ffec1c0821f12d7fb.zip | |
Merge "Fixes error message for flavor-create duplicate ID"
| -rw-r--r-- | nova/api/openstack/compute/contrib/flavormanage.py | 3 | ||||
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 2 | ||||
| -rw-r--r-- | nova/exception.py | 6 | ||||
| -rw-r--r-- | nova/tests/test_instance_types.py | 2 |
4 files changed, 9 insertions, 4 deletions
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) diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 44f32987a..dbf8a38e3 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -3875,7 +3875,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: diff --git a/nova/exception.py b/nova/exception.py index 0a088cb8c..9c11dd822 100644 --- a/nova/exception.py +++ b/nova/exception.py @@ -880,7 +880,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): diff --git a/nova/tests/test_instance_types.py b/nova/tests/test_instance_types.py index d9d2669a3..5059b155a 100644 --- a/nova/tests/test_instance_types.py +++ b/nova/tests/test_instance_types.py @@ -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) |