openstack/nova
Code Issues Proposed changes

Correcting exception case

Browse Source
This commit is contained in:
Brian Waldon
2011-04-27 14:23:21 -07:00
parent 8e6875e8c9
commit 0fe36c8ba3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nova/compute/instance_types.py
View File

@@ -64,7 +64,7 @@ def create(name, memory, vcpus, local_gb, flavorid, swap=0,
def destroy(name): def destroy(name):
"""Marks instance types as deleted.""" """Marks instance types as deleted."""
if name is None: if name is None:
raise exception.InstanceNotFound(instance_id=instance_name) raise exception.InvalidInstanceType(instance_type=name)
else: else:
try: try:
db.instance_type_destroy(context.get_admin_context(), name) db.instance_type_destroy(context.get_admin_context(), name)
@@ -76,7 +76,7 @@ def destroy(name):
def purge(name): def purge(name):
"""Removes instance types from database.""" """Removes instance types from database."""
if name is None: if name is None:
raise exception.InnstanceNotFound(instance_id=name) raise exception.InvalidInstanceType(instance_type=name)
else: else:
try: try:
db.instance_type_purge(context.get_admin_context(), name) db.instance_type_purge(context.get_admin_context(), name)