From 4a058908db774bfebce4ece814534225e123345c Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh.kearney@rackspace.com>
Date: Fri, 11 Feb 2011 15:04:49 -0600
Subject: Added more columns to instance_types tables

---
 nova/compute/instance_types.py | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

(limited to 'nova/compute')

diff --git a/nova/compute/instance_types.py b/nova/compute/instance_types.py
index c6887795a..01abee584 100644
--- a/nova/compute/instance_types.py
+++ b/nova/compute/instance_types.py
@@ -29,16 +29,32 @@ from nova import exception
 FLAGS = flags.FLAGS
 
 
-def create(name, memory, vcpus, local_gb, flavorid):
+def create(
+        name,
+        memory,
+        vcpus,
+        local_gb,
+        flavorid,
+        swap=0,
+        rxtx_quota=0,
+        rxtx_cap=0):
     """Creates instance types / flavors
-       arguments: name memory_mb vcpus local_gb"""
+       arguments: name memory vcpus local_gb flavorid swap rxtx_quota rxtx_cap
+    """
     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,
-                            flavorid=flavorid))
+    db.instance_type_create(
+        context.get_admin_context(),
+        dict(
+            name=name,
+            memory_mb=memory,
+            vcpus=vcpus,
+            local_gb=local_gb,
+            flavorid=flavorid,
+            swap=swap,
+            rxtx_quota=rxtx_quota,
+            rxtx_cap=rxtx_cap))
 
 
 def destroy(name):
-- 
cgit