added purge option and tightened up testing

bin/nova-manage

@@ -683,9 +683,9 @@ class InstanceTypeCommands(object):
         vcpus,
         local_gb,
         flavorid,
-        swap,
-        rxtx_quota,
-        rxtx_cap):
+        swap=0,
+        rxtx_quota=0,
+        rxtx_cap=0):
         """Creates instance types / flavors
            arguments: name memory vcpus local_gb flavorid swap rxtx_quota
                       rxtx_cap
@@ -719,13 +719,18 @@ class InstanceTypeCommands(object):
         try:
             if purge == "--purge":
                 instance_types.purge(name)
-                verb = "deleted"
+                verb = "purged"
             else:
                 instance_types.destroy(name)
-                verb = "purged"
+                verb = "deleted"
         except exception.ApiError:
             print "Valid instance type name is required"
             sys.exit(1)
+        except exception.DBError, e:
+            print "DB Error: %s" % e
+            sys.exit(2)
+        except:
+            sys.exit(3)
         else:
             print "%s %s" % (name, verb)
 

nova/tests/test_instance_types.py

@@ -54,7 +54,7 @@ class InstanceTypeTestCase(test.TestCase):
         self.assertEqual(1,
                     instance_types.get_instance_type(self.name)["deleted"])
         self.assertEqual(starting_inst_list, instance_types.get_all_types())
-        db.instance_type_purge(context.get_admin_context(), self.name)
+        instance_types.purge(self.name)
         self.assertEqual(len(starting_inst_list),
                          len(instance_types.get_all_types()),
                          'instance type not purged')