openstack/nova
Code Issues Proposed changes

more error checking on inputs and better errors returned

Browse Source
This commit is contained in:
Ken Pepple
2011-02-11 13:11:28 -08:00
parent a36b67d192
commit e4061a0f5d
1 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
nova/compute/instance_types.py
View File

@@ -32,22 +32,36 @@ FLAGS = flags.FLAGS
def create(name, memory, vcpus, local_gb, flavorid): def create(name, memory, vcpus, local_gb, flavorid):
"""Creates instance types / flavors """Creates instance types / flavors
arguments: name memory_mb vcpus local_gb""" arguments: name memory_mb vcpus local_gb"""
if (memory <= 0) or (vcpus <= 0) or (local_gb < 0): for option in [memory, vcpus, local_gb, flavorid]:
raise exception.InvalidInputException try:
int(option)
db.instance_type_create(context.get_admin_context(), except:
dict(name=name, memory_mb=memory, raise exception.InvalidInputException(
vcpus=vcpus, local_gb=local_gb, _("create arguments must be positive integers"))
flavorid=flavorid)) if (int(memory) <= 0) or (int(vcpus) <= 0) or (int(local_gb) < 0):
raise exception.InvalidInputException(
_("create arguments must be positive integers"))
try:
db.instance_type_create(context.get_admin_context(),
dict(name=name, memory_mb=memory,
vcpus=vcpus, local_gb=local_gb,
flavorid=flavorid))
except exception.DBError:
raise exception.ApiError(_("Cannot create instance type: %s"),
instance_type, "Invalid")
def destroy(name): def destroy(name):
"""Marks instance types / flavors as deleted """Marks instance types / flavors as deleted
arguments: name""" arguments: name"""
if name == None: if name == None:
raise exception.InvalidInputException raise exception.InvalidInputException(_("No instance type specified"))
else: else:
db.instance_type_destroy(context.get_admin_context(), name) try:
db.instance_type_destroy(context.get_admin_context(), name)
except exception.DBError:
raise exception.ApiError(_("Unknown instance type: %s"),
instance_type, "Invalid")
def get_all_types(inactive=0): def get_all_types(inactive=0):
@@ -72,7 +86,7 @@ def get_instance_type(name):
return inst_type return inst_type
except exception.DBError: except exception.DBError:
raise exception.ApiError(_("Unknown instance type: %s"), raise exception.ApiError(_("Unknown instance type: %s"),
instance_type) instance_type, "Invalid")
def get_by_type(instance_type): def get_by_type(instance_type):
@@ -85,7 +99,7 @@ def get_by_type(instance_type):
return inst_type['name'] return inst_type['name']
except exception.DBError: except exception.DBError:
raise exception.ApiError(_("Unknown instance type: %s"), raise exception.ApiError(_("Unknown instance type: %s"),
instance_type) instance_type, "Invalid")
def get_by_flavor_id(flavor_id): def get_by_flavor_id(flavor_id):
@@ -98,4 +112,4 @@ def get_by_flavor_id(flavor_id):
return flavor['name'] return flavor['name']
except exception.DBError: except exception.DBError:
raise exception.ApiError(_("Unknown flavor: %s"), raise exception.ApiError(_("Unknown flavor: %s"),
flavor_id) flavor_id, "Invalid")