summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
authorKen Pepple <ken.pepple@gmail.com>2011-02-10 11:21:53 -0800
committerKen Pepple <ken.pepple@gmail.com>2011-02-10 11:21:53 -0800
commitfd915e3db7f1006e67342b034eb8db0384c87d34 (patch)
tree3942396643aea973f4eed886c1a3993cbb7ae952 /nova/compute
parentd601471f54de5db95cf06f4a558362f90cc65c6b (diff)
testing refactor
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/instance_types.py6
1 files changed, 3 insertions, 3 deletions
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,