aliased flavor to instance_types in nova-manage. will probably need to make flavor a full fledged class as users will want to list flavors by flavor name

2 files changed, 8 insertions, 6 deletions

diff --git a/bin/nova-manage b/bin/nova-manage
index 73d69fc64..c3fa9cf3f 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -609,7 +609,7 @@ class VolumeCommands(object):
                            "mountpoint": volume['mountpoint']}})
 
 
-class InstanceTypesCommands(object):
+class InstanceTypeCommands(object):
     """Class for managing instance types / flavors."""
 
     def create(self, name, memory, vcpus, local_gb, flavorid):
@@ -674,7 +674,8 @@ CATEGORIES = [
     ('log', LogCommands),
     ('db', DbCommands),
     ('volume', VolumeCommands),
-    ('instance_types', InstanceTypesCommands)]
+    ('instance_type', InstanceTypeCommands),
+    ('flavor', InstanceTypeCommands)]
 
 
 def lazy_match(name, key_value_tuples):
diff --git a/nova/tests/test_nova_manage.py b/nova/tests/test_nova_manage.py
index 09ed8163b..487f172ff 100644
--- a/nova/tests/test_nova_manage.py
+++ b/nova/tests/test_nova_manage.py
@@ -39,11 +39,12 @@ class NovaManageTestCase(test.TestCase):
                                     "delete", "test"], stdout=fnull)
         self.assertEqual(0, retcode)
 
-    def test_list_instance_types(self):
+    def test_list_instance_types_or_flavors(self):
         fnull = open(os.devnull, 'w')
-        retcode = subprocess.call(["bin/nova-manage", "instance_type", \
-                                    "list"], stdout=fnull)
-        self.assertEqual(0, retcode)
+        for c in ["instance_type", "flavor"]:
+            retcode = subprocess.call(["bin/nova-manage", c, \
+                                        "list"], stdout=fnull)
+            self.assertEqual(0, retcode)
 
     def test_list_specific_instance_type(self):
         fnull = open(os.devnull, 'w')