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

---
 bin/nova-manage | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'bin')

diff --git a/bin/nova-manage b/bin/nova-manage
index 25695482f..a999571b2 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -819,6 +819,7 @@ class InstanceTypeCommands(object):
     """Class for managing instance types / flavors."""
 
     def _print_instance_types(self, n, val):
+        """helper method to print out instance_types values"""
         deleted = ('', ', inactive')[val["deleted"] == 1]
         print ("%s: Memory: %sMB, VCPUS: %s, Storage: %sGB, FlavorID: %s, "
             "Swap: %sGB, RXTX Quota: %sGB, RXTX Cap: %sMB%s") % (
@@ -836,11 +837,14 @@ class InstanceTypeCommands(object):
             instance_types.create(name, memory, vcpus, local_gb,
                                   flavorid, swap, rxtx_quota, rxtx_cap)
         except exception.InvalidInputException:
-            print "Must supply valid parameters to create instance type"
+            print "Must supply valid parameters to create instance_type"
             print e
             sys.exit(1)
-        except exception.DBError, e:
-            print "DB Error: %s" % e
+        except exception.ApiError, e:
+            print e
+            print "Please ensure instance_type name and flavor id are unique"
+            print "Here are the already defined instance_type names and flavorids:"
+            self.list("--all")
             sys.exit(2)
         except:
             print "Unknown error"
-- 
cgit 


From 59b460e98c5b8f718a654539c5788e8775126dfd Mon Sep 17 00:00:00 2001
From: Ken Pepple <ken.pepple@gmail.com>
Date: Thu, 7 Apr 2011 15:08:29 -0700
Subject: slight typo

---
 bin/nova-manage | 1 -
 1 file changed, 1 deletion(-)

(limited to 'bin')

diff --git a/bin/nova-manage b/bin/nova-manage
index a999571b2..5369a98b3 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -841,7 +841,6 @@ class InstanceTypeCommands(object):
             print e
             sys.exit(1)
         except exception.ApiError, e:
-            print e
             print "Please ensure instance_type name and flavor id are unique"
             print "Here are the already defined instance_type names and flavorids:"
             self.list("--all")
-- 
cgit 


From 86ffed4e988025023b570b9e6e87f89b6075c7b0 Mon Sep 17 00:00:00 2001
From: Ken Pepple <ken.pepple@gmail.com>
Date: Thu, 7 Apr 2011 17:38:24 -0700
Subject: reminde admins of --purge option

---
 bin/nova-manage | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'bin')

diff --git a/bin/nova-manage b/bin/nova-manage
index e63898979..73da83767 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -841,8 +841,10 @@ class InstanceTypeCommands(object):
             print e
             sys.exit(1)
         except exception.ApiError, e:
-            print "Please ensure instance_type name and flavor id are unique"
-            print "Here are the already defined instance_type names and flavorids:"
+            print "\n\nPlease ensure instance_type name and flavor id are unique."
+            print "To complete remove a instance_type, use the --purge flag:"
+            print "\n     # nova-manage instance_type delete <name> --purge\n"
+            print "Currently defined instance_type names and flavorids:"
             self.list("--all")
             sys.exit(2)
         except:
-- 
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

---
 bin/nova-manage | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/nova-manage b/bin/nova-manage
index 750cd2596..8ec3a1e64 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -832,7 +832,8 @@ class InstanceTypeCommands(object):
             print e
             sys.exit(1)
         except exception.ApiError, e:
-            print "\n\nPlease ensure instance_type name and flavor id are unique."
+            print "\n\n"
+            print "Please ensure instance_type name and flavorid are unique."
             print "To complete remove a instance_type, use the --purge flag:"
             print "\n     # nova-manage instance_type delete <name> --purge\n"
             print "Currently defined instance_type names and flavorids:"
-- 
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.

---
 bin/nova-manage | 1 +
 1 file changed, 1 insertion(+)

(limited to 'bin')

diff --git a/bin/nova-manage b/bin/nova-manage
index 8ec3a1e64..6b47cc4f5 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -833,6 +833,7 @@ class InstanceTypeCommands(object):
             sys.exit(1)
         except exception.ApiError, e:
             print "\n\n"
+            print "\n%s" % e
             print "Please ensure instance_type name and flavorid are unique."
             print "To complete remove a instance_type, use the --purge flag:"
             print "\n     # nova-manage instance_type delete <name> --purge\n"
-- 
cgit