summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
authorCerberus <matt.dietz@rackspace.com>2011-03-11 17:30:51 -0600
committerCerberus <matt.dietz@rackspace.com>2011-03-11 17:30:51 -0600
commit1c4afe23157233b7081872ccbc6ea5fa1ff0015a (patch)
tree5df7419df9de6be974abab0c6271bb598928285b /nova/compute
parent6cd90a95d632d45d1c906d412e3240f730e88b95 (diff)
Some unit tests
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/api.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 1393c01d5..0dc2bb3d3 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -460,10 +460,13 @@ class API(base.Base):
def resize(self, context, instance_id, flavor_id):
"""Resize a running instance."""
instance = self.db.instance_get(context, instance_id)
- current_instance_type = self.db.instance_type_get_by_flavor_id(
- context, instance['flavor_id'])
+ current_instance_type = self.db.instance_type_get_by_name(
+ context, instance['instance_type'])
+
new_instance_type = self.db.instance_type_get_by_flavor_id(
- context, flavor_id)
+ context, flavor_id)
+ if not new_instance_type:
+ raise exception.ApiError(_("Requested flavor does not exist"))
if current_instance_type.memory_mb > new_instance_typ.memory_mb:
raise exception.ApiError(_("Invalid flavor: cannot downsize"