summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCerberus <matt.dietz@rackspace.com>2011-03-14 11:55:55 -0500
committerCerberus <matt.dietz@rackspace.com>2011-03-14 11:55:55 -0500
commitaf5e752e8eb21d0e9192d9acd9e75586bdec3685 (patch)
tree62018d4c0d12c0da2b67ef9905e239690742537b
parent35f90b585711b0d4dc54aeddff79968331263758 (diff)
downloadnova-af5e752e8eb21d0e9192d9acd9e75586bdec3685.tar.gz
nova-af5e752e8eb21d0e9192d9acd9e75586bdec3685.tar.xz
nova-af5e752e8eb21d0e9192d9acd9e75586bdec3685.zip
Compute test
-rw-r--r--nova/tests/test_compute.py25
1 files changed, 23 insertions, 2 deletions
diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index c53284216..47e0f66fb 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -76,6 +76,20 @@ class ComputeTestCase(test.TestCase):
inst.update(params)
return db.instance_create(self.context, inst)['id']
+ def _create_instance_type(self, params={}):
+ """Create a test instance"""
+ inst = {}
+ inst['name'] = 'm1.small'
+ inst['memory_mb'] = '1024'
+ inst['vcpus'] = '1'
+ inst['local_gb'] = '20'
+ inst['flavorid'] = '1'
+ inst['swap'] = '2048'
+ inst['rxtx_quota'] = 100
+ inst['rxtx_cap'] = 200
+ inst.update(params)
+ return db.instance_type_create(self.context, inst)['id']
+
def _create_group(self):
values = {'name': 'testgroup',
'description': 'testgroup',
@@ -301,10 +315,17 @@ class ComputeTestCase(test.TestCase):
def test_resize_down_fails(self):
"""Ensure invalid flavors raise"""
instance_id = self._create_instance()
+
+ small_inst_type_id = self._create_instance_type(dict(flavorid=1,
+ memory_mb=512))
+ big_inst_type_id = self._create_instance_type(dict(flavorid=2,
+ name='m1.wowzers', memory_mb=8192))
+
context = self.context.elevated()
self.compute.run_instance(self.context, instance_id)
- db.instance_update(self.context, instance_id,
- {'instance_type': 'm1.large'})
+ db.instance_update(self.context, instance_id,
+ {'instance_type': 'm1.wowzers',
+ 'memory_gb': 8192})
self.assertRaises(exception.ApiError, self.compute_api.resize,
context, instance_id, 1)