updated tests and added more error checking

bin/nova-manage

@@ -623,15 +623,16 @@ class InstanceTypeCommands(object):
            arguments: name memory_mb vcpus local_gb"""
         try:
             instance_types.create(name, memory, vcpus, local_gb, flavorid)
-        except exception.InvalidInputException:
+        except exception.InvalidInputException, e:
             print "Must supply valid parameters to create instance type"
+            print e
             sys.exit(1)
         except exception.DBError, e:
             print "DB Error: %s" % e
-            sys.exit(1)
+            sys.exit(2)
         except:
             print "Unknown error"
-            sys.exit(1)
+            sys.exit(3)
         else:
             print "%s created" % name
 
@@ -639,14 +640,10 @@ class InstanceTypeCommands(object):
         """Marks instance types / flavors as deleted
         arguments: name"""
         try:
-            records = instance_types.destroy(name)
-        except exception.InvalidParameters:
+            instance_types.destroy(name)
+        except exception.ApiError:
             print "Valid instance type name is required"
             sys.exit(1)
-        except exception.NotFound, e:
-            print "Instance type name %s not found. \
-                    No instance type deleted." % name
-            sys.exit(1)
         else:
             print "%s deleted" % name
 

nova/tests/test_instance_types.py

@@ -62,3 +62,20 @@ class InstanceTypeTestCase(test.TestCase):
                                             count()
         inst_types = instance_types.get_all_types()
         self.assertEqual(total_instance_types, len(inst_types))
+
+    def test_invalid_create_args_should_fail(self):
+        """Ensures that instance type creation fails with invalid args"""
+        self.assertRaises(
+                exception.InvalidInputException,
+                instance_types.create, self.name, 0, 1, 120, self.flavorid)
+        self.assertRaises(
+                exception.InvalidInputException,
+                instance_types.create, self.name, 256, -1, 120, self.flavorid)
+        self.assertRaises(
+                exception.InvalidInputException,
+                instance_types.create, self.name, 256, 1, "aa", self.flavorid)
+
+    def test_non_existant_inst_type_shouldnt_delete(self):
+        """Ensures that instance type creation fails with invalid args"""
+        self.assertRaises(exception.ApiError,
+                          instance_types.destroy, "sfsfsdfdfs")