From a1572a4f234bdeda1d25250de62b5892d8f47891 Mon Sep 17 00:00:00 2001
From: Ken Pepple <ken.pepple@gmail.com>
Date: Thu, 7 Apr 2011 15:00:35 -0700
Subject: clarified nova-manage instance_type create error output on duplicate
 flavorid

---
 nova/compute/instance_types.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'nova')

diff --git a/nova/compute/instance_types.py b/nova/compute/instance_types.py
index fa02a5dfa..bfa120675 100644
--- a/nova/compute/instance_types.py
+++ b/nova/compute/instance_types.py
@@ -60,7 +60,9 @@ def create(name, memory, vcpus, local_gb, flavorid, swap=0,
                     rxtx_cap=rxtx_cap))
     except exception.DBError, e:
         LOG.exception(_('DB error: %s' % e))
-        raise exception.ApiError(_("Cannot create instance type: %s" % name))
+        raise exception.ApiError(
+                _("Cannot create instance_type with name %s and flavorid %s"\
+                    % (name, flavorid)))
 
 
 def destroy(name):
-- 
cgit 


From 3d72f59530b1c974dca498fbca44e5720547fc61 Mon Sep 17 00:00:00 2001
From: Ken Pepple <ken.pepple@gmail.com>
Date: Wed, 13 Apr 2011 11:51:03 -0700
Subject: fixed error message i18n-ization. added test.

---
 nova/compute/instance_types.py    |  8 ++++----
 nova/tests/test_instance_types.py | 10 ++++++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

(limited to 'nova')

diff --git a/nova/compute/instance_types.py b/nova/compute/instance_types.py
index 70b43540f..158cf1e9d 100644
--- a/nova/compute/instance_types.py
+++ b/nova/compute/instance_types.py
@@ -59,10 +59,10 @@ def create(name, memory, vcpus, local_gb, flavorid, swap=0,
                     rxtx_quota=rxtx_quota,
                     rxtx_cap=rxtx_cap))
     except exception.DBError, e:
-        LOG.exception(_('DB error: %s' % e))
-        raise exception.ApiError(
-                _("Cannot create instance_type with name %s and flavorid %s"\
-                    % (name, flavorid)))
+        LOG.exception(_('DB error: %s') % e)
+        raise exception.ApiError(_("Cannot create instance_type with\
+                                    name %(name)s and flavorid %(flavorid)s") %
+                                    locals())
 
 
 def destroy(name):
diff --git a/nova/tests/test_instance_types.py b/nova/tests/test_instance_types.py
index 5d6d5e1f4..ec3bc5bbf 100644
--- a/nova/tests/test_instance_types.py
+++ b/nova/tests/test_instance_types.py
@@ -88,3 +88,13 @@ class InstanceTypeTestCase(test.TestCase):
         """Ensures that instance type creation fails with invalid args"""
         self.assertRaises(exception.ApiError,
                           instance_types.destroy, "sfsfsdfdfs")
+
+    def test_repeated_inst_types_should_raise_api_error(self):
+        """Ensures that instance duplicates raises ApiError"""
+        new_name = self.name + "dup"
+        instance_types.create(new_name, 256, 1, 120, self.flavorid + 1)
+        instance_types.destroy(new_name)
+        self.assertRaises(
+                exception.ApiError,
+                instance_types.create, new_name, 256, 1, 120, self.flavorid)
+        
\ No newline at end of file
-- 
cgit 


From 6a20cba0ea3c1e9945897ec27646d74d597492d7 Mon Sep 17 00:00:00 2001
From: Ken Pepple <ken.pepple@gmail.com>
Date: Wed, 13 Apr 2011 12:01:59 -0700
Subject: pep8

---
 nova/tests/test_instance_types.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'nova')

diff --git a/nova/tests/test_instance_types.py b/nova/tests/test_instance_types.py
index ec3bc5bbf..dd7d0737e 100644
--- a/nova/tests/test_instance_types.py
+++ b/nova/tests/test_instance_types.py
@@ -97,4 +97,3 @@ class InstanceTypeTestCase(test.TestCase):
         self.assertRaises(
                 exception.ApiError,
                 instance_types.create, new_name, 256, 1, 120, self.flavorid)
-        
\ No newline at end of file
-- 
cgit 


From 63f5aa5484aa9d61f2ed79caae1c665230a56f35 Mon Sep 17 00:00:00 2001
From: Ken Pepple <ken.pepple@gmail.com>
Date: Tue, 19 Apr 2011 15:25:39 -0700
Subject: revamped spacing per Rick Harris suggestion. Added exact error to
 nova-manage output.

---
 nova/compute/instance_types.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nova')

diff --git a/nova/compute/instance_types.py b/nova/compute/instance_types.py
index a92e5d3bc..6accf82bb 100644
--- a/nova/compute/instance_types.py
+++ b/nova/compute/instance_types.py
@@ -56,8 +56,8 @@ def create(name, memory, vcpus, local_gb, flavorid, swap=0,
                     rxtx_cap=rxtx_cap))
     except exception.DBError, e:
         LOG.exception(_('DB error: %s') % e)
-        raise exception.ApiError(_("Cannot create instance_type with\
-                                    name %(name)s and flavorid %(flavorid)s") %
+        raise exception.ApiError(_("Cannot create instance_type with "
+                                    "name %(name)s and flavorid %(flavorid)s") %
                                     locals())
 
 
-- 
cgit 


From f710ad1e3fff16de696f608986f24bdc8ffc3f6b Mon Sep 17 00:00:00 2001
From: Ken Pepple <ken.pepple@gmail.com>
Date: Fri, 22 Apr 2011 00:22:23 -0700
Subject: pep8

---
 nova/compute/instance_types.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nova')

diff --git a/nova/compute/instance_types.py b/nova/compute/instance_types.py
index 4e250bb83..7e7198b96 100644
--- a/nova/compute/instance_types.py
+++ b/nova/compute/instance_types.py
@@ -57,8 +57,8 @@ def create(name, memory, vcpus, local_gb, flavorid, swap=0,
     except exception.DBError, e:
         LOG.exception(_('DB error: %s') % e)
         raise exception.ApiError(_("Cannot create instance_type with "
-                                    "name %(name)s and flavorid %(flavorid)s") %
-                                    locals())
+                                    "name %(name)s and flavorid %(flavorid)s")
+                                    % locals())
 
 
 def destroy(name):
-- 
cgit