summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
authorJosh Kearney <josh.kearney@rackspace.com>2011-02-11 15:04:49 -0600
committerJosh Kearney <josh.kearney@rackspace.com>2011-02-11 15:04:49 -0600
commit4a058908db774bfebce4ece814534225e123345c (patch)
treeee6a6a5fb8e1f4e68ccdfc68107f6ca6054ba411 /nova/compute
parenta36b67d192eb619963494896928efffef5dae4b6 (diff)
downloadnova-4a058908db774bfebce4ece814534225e123345c.tar.gz
nova-4a058908db774bfebce4ece814534225e123345c.tar.xz
nova-4a058908db774bfebce4ece814534225e123345c.zip
Added more columns to instance_types tables
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/instance_types.py28
1 files changed, 22 insertions, 6 deletions
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):