summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-01-07 18:40:28 +0000
committerGerrit Code Review <review@openstack.org>2013-01-07 18:40:28 +0000
commite1c7b18c7f3c8d97ba7b2cccf27b968ad4710735 (patch)
treeea71fe2a5d9d204b36e76be6a7d92e28ec70ccd8
parentb6947dd93b416d4c22ec2fc5014f4911eb12c09f (diff)
parentaba9fdbc1a824b3694d29cc45d9528b5a641ef92 (diff)
downloadnova-e1c7b18c7f3c8d97ba7b2cccf27b968ad4710735.tar.gz
nova-e1c7b18c7f3c8d97ba7b2cccf27b968ad4710735.tar.xz
nova-e1c7b18c7f3c8d97ba7b2cccf27b968ad4710735.zip
Merge "Add test for resize server in ComputeAPITestCase."
-rw-r--r--nova/tests/compute/test_compute.py21
1 files changed, 20 insertions, 1 deletions
diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py
index 3bd54cbba..4099a2a15 100644
--- a/nova/tests/compute/test_compute.py
+++ b/nova/tests/compute/test_compute.py
@@ -4203,7 +4203,7 @@ class ComputeAPITestCase(BaseTestCase):
flavorid, 0, 1.0, True)
instance_types.destroy(name)
self.assertRaises(exception.FlavorNotFound, self.compute_api.resize,
- self.context, instance, 200)
+ self.context, instance, flavorid)
self.compute.terminate_instance(self.context, instance=instance)
@@ -4220,6 +4220,25 @@ class ComputeAPITestCase(BaseTestCase):
self.compute.terminate_instance(self.context, instance=instance)
+ def test_resize_quota_exceeds_fails(self):
+ instance = self._create_fake_instance()
+ instance = db.instance_get_by_uuid(self.context, instance['uuid'])
+ instance = jsonutils.to_primitive(instance)
+ self.compute.run_instance(self.context, instance=instance)
+
+ name = 'test_resize_with_big_mem'
+ flavorid = 11
+ memory_mb = 102400
+ root_gb = 0
+ vcpus = 1
+ instance_types.create(name, memory_mb, vcpus, root_gb, 0,
+ flavorid, 0, 1.0, True)
+ self.assertRaises(exception.TooManyInstances, self.compute_api.resize,
+ self.context, instance, flavorid)
+
+ instance_types.destroy(name)
+ self.compute.terminate_instance(self.context, instance=instance)
+
def test_migrate(self):
instance = self._create_fake_instance()
instance = db.instance_get_by_uuid(self.context, instance['uuid'])