Added more columns to instance_types tables

1 files changed, 34 insertions, 7 deletions

diff --git a/bin/nova-manage b/bin/nova-manage
index e3c3e70f8..bd2fc0e81 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -614,15 +614,42 @@ class InstanceTypeCommands(object):
     """Class for managing instance types / flavors."""
 
     def _print_instance_types(self, n, val):
-        print "%s: %s memory(MB), %s vcpus, %s storage(GB), %s flavorid"\
-                % (n, val["memory_mb"], val["vcpus"],
-                    val["local_gb"], val["flavorid"])
-
-    def create(self, name, memory, vcpus, local_gb, flavorid):
+        print ("%s: Memory: %sMB, VCPUS: %s, Storage: %sGB, FlavorID: %s, "
+            "Swap: %sGB, RXTX Quota: %sGB, RXTX Cap: %sMB") % (
+            n,
+            val["memory_mb"],
+            val["vcpus"],
+            val["local_gb"],
+            val["flavorid"],
+            val["swap"],
+            val["rxtx_quota"],
+            val["rxtx_cap"])
+
+    def create(
+        self,
+        name,
+        memory,
+        vcpus,
+        local_gb,
+        flavorid,
+        swap,
+        rxtx_quota,
+        rxtx_cap):
         """Creates instance types / flavors
-           arguments: name memory_mb vcpus local_gb"""
+           arguments: name memory vcpus local_gb flavorid swap rxtx_quota
+                      rxtx_cap
+        """
+
         try:
-            instance_types.create(name, memory, vcpus, local_gb, flavorid)
+            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"
             sys.exit(1)