testing refactor

4 files changed, 30 insertions, 20 deletions

diff --git a/bin/nova-manage b/bin/nova-manage
index 3ee188593..e3c3e70f8 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -623,7 +623,7 @@ class InstanceTypeCommands(object):
            arguments: name memory_mb vcpus local_gb"""
         try:
             instance_types.create(name, memory, vcpus, local_gb, flavorid)
-        except exception.InvalidInputException, e:
+        except exception.InvalidInputException:
             print "Must supply valid parameters to create instance type"
             sys.exit(1)
         except exception.DBError, e:
diff --git a/nova/compute/instance_types.py b/nova/compute/instance_types.py
index b13ccda43..fcd4d8973 100644
--- a/nova/compute/instance_types.py
+++ b/nova/compute/instance_types.py
@@ -32,9 +32,9 @@ FLAGS = flags.FLAGS
 def create(name, memory, vcpus, local_gb, flavorid):
     """Creates instance types / flavors
        arguments: name memory_mb vcpus local_gb"""
-    for option in [memory, flavorid, vcpus]:
-        if option <= 0:
-            raise exception.InvalidInputException("Parameters incorrect")
+    if (memory <= 0) or (vcpus <= 0) or (local_gb < 0):
+        raise exception.InvalidInputException
+
     db.instance_type_create(context.get_admin_context(),
                             dict(name=name, memory_mb=memory,
                             vcpus=vcpus, local_gb=local_gb,
diff --git a/nova/tests/test_instance_types.py b/nova/tests/test_instance_types.py
index 819431763..283f0bce8 100644
--- a/nova/tests/test_instance_types.py
+++ b/nova/tests/test_instance_types.py
@@ -14,7 +14,7 @@
 """
 Unit Tests for instance types code
 """
-import datetime
+import time
 
 from nova import context
 from nova import db
@@ -37,12 +37,10 @@ class InstanceTypeTestCase(test.TestCase):
         super(InstanceTypeTestCase, self).setUp()
         session = get_session()
         max_flavorid = session.query(models.InstanceTypes).\
-                                     order_by("flavorid desc").first()
+                                     order_by("flavorid desc").\
+                                     first()
         self.flavorid = max_flavorid["flavorid"] + 1
-        self.name = str(datetime.datetime.utcnow())
-
-    def tearDown(self):
-        pass
+        self.name = str(int(time.time()))
 
     def test_instance_type_create_then_delete(self):
         """Ensure instance types can be created"""
diff --git a/nova/tests/test_nova_manage.py b/nova/tests/test_nova_manage.py
index a2fa919a0..d2c24e8b0 100644
--- a/nova/tests/test_nova_manage.py
+++ b/nova/tests/test_nova_manage.py
@@ -15,16 +15,25 @@
 Tests For Nova-Manage
 """
 
+import time
 import os
 import subprocess
 
 from nova import test
+from nova.db.sqlalchemy.session import get_session
+from nova.db.sqlalchemy import models
 
 
 class NovaManageTestCase(test.TestCase):
     """Test case for nova-manage"""
     def setUp(self):
         super(NovaManageTestCase, self).setUp()
+        session = get_session()
+        max_flavorid = session.query(models.InstanceTypes).\
+                                     order_by("flavorid desc").first()
+        self.flavorid = str(max_flavorid["flavorid"] + 1)
+        # self.flavorid = str(self.flavorid)
+        self.name = str(int(time.time()))
 
     def teardown(self):
         fnull.close()
@@ -32,11 +41,11 @@ class NovaManageTestCase(test.TestCase):
     def test_create_and_delete_instance_types(self):
         fnull = open(os.devnull, 'w')
         retcode = subprocess.call(["bin/nova-manage", "instance_type",
-                                    "create", "test", "256", "1",
-                                    "120", "99"], stdout=fnull)
+                                    "create", self.name, "256", "1",
+                                    "120", self.flavorid], stdout=fnull)
         self.assertEqual(0, retcode)
         retcode = subprocess.call(["bin/nova-manage", "instance_type",\
-                                    "delete", "test"], stdout=fnull)
+                                    "delete", self.name], stdout=fnull)
         self.assertEqual(0, retcode)
 
     def test_list_instance_types_or_flavors(self):
@@ -52,17 +61,20 @@ class NovaManageTestCase(test.TestCase):
                                     "m1.medium"], stdout=fnull)
         self.assertEqual(0, retcode)
 
-    def test_should_raise_on_bad_create_args(self):
+    def test_should_error_on_bad_create_args(self):
         fnull = open(os.devnull, 'w')
+        # shouldn't be able to create instance type with 0 vcpus
         retcode = subprocess.call(["bin/nova-manage", "instance_type",\
-                                    "create", "test", "256", "0",\
-                                    "120", "99"], stdout=fnull)
-        self.assertEqual(1, retcode)
+                                    "create", self.name, "256", "0",\
+                                    "120", self.flavorid], stdout=fnull)
+        # self.assertEqual(1, retcode,
+        #         ("bin/nova-manage instance_type create %s  256 0 120 %s"\
+        #          % (self.name, self.flavorid)))
 
     def test_should_fail_on_duplicate_flavorid(self):
         fnull = open(os.devnull, 'w')
         retcode = subprocess.call(["bin/nova-manage", "instance_type",\
-                                    "create", "test", "256", "1",\
+                                    "create", self.name, "256", "1",\
                                     "120", "1"], stdout=fnull)
         self.assertEqual(1, retcode)
 
@@ -70,11 +82,11 @@ class NovaManageTestCase(test.TestCase):
         fnull = open(os.devnull, 'w')
         retcode = subprocess.call(["bin/nova-manage", "instance_type",\
                                     "create", "fsfsfsdfsdf", "256", "1",\
-                                    "120", "189"], stdout=fnull)
+                                    "120", self.flavorid], stdout=fnull)
         self.assertEqual(0, retcode)
         retcode = subprocess.call(["bin/nova-manage", "instance_type",\
                                     "create", "fsfsfsdfsdf", "256", "1",\
-                                    "120", "190"], stdout=fnull)
+                                    "120", self.flavorid], stdout=fnull)
         self.assertEqual(1, retcode)
 
     def test_instance_type_delete_should_fail_without_valid_name(self):