diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-13 15:36:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-13 15:36:28 +0000 |
| commit | 2db23f6ba4db8fe95d05874dc3c6bef017a412ae (patch) | |
| tree | 6d026ffa59c735fda184e6b3523d1bf14739c06e /nova/tests | |
| parent | 726bd9bb3fa3acc4c72d71617f9ba3e0b3276697 (diff) | |
| parent | 9575a426fa4adcd79f1fa0c3a1d1008d8010c44c (diff) | |
Merge "Flavor extra specs extension use instance_type id"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/test_instance_types_extra_specs.py | 15 | ||||
| -rw-r--r-- | nova/tests/test_nova_manage.py | 9 |
2 files changed, 13 insertions, 11 deletions
diff --git a/nova/tests/test_instance_types_extra_specs.py b/nova/tests/test_instance_types_extra_specs.py index e78d6d0b3..f53840b86 100644 --- a/nova/tests/test_instance_types_extra_specs.py +++ b/nova/tests/test_instance_types_extra_specs.py @@ -41,6 +41,7 @@ class InstanceTypeExtraSpecsTestCase(test.TestCase): ref = db.instance_type_create(self.context, values) self.instance_type_id = ref["id"] + self.flavorid = ref["flavorid"] def tearDown(self): # Remove the instance type from the database @@ -55,7 +56,7 @@ class InstanceTypeExtraSpecsTestCase(test.TestCase): xpu_model="Tesla 2050") actual_specs = db.instance_type_extra_specs_get( self.context, - self.instance_type_id) + self.flavorid) self.assertEquals(expected_specs, actual_specs) def test_instance_type_extra_specs_delete(self): @@ -64,11 +65,11 @@ class InstanceTypeExtraSpecsTestCase(test.TestCase): xpu_arch="fermi", xpus="2") db.instance_type_extra_specs_delete(self.context, - self.instance_type_id, + self.flavorid, "xpu_model") actual_specs = db.instance_type_extra_specs_get( self.context, - self.instance_type_id) + self.flavorid) self.assertEquals(expected_specs, actual_specs) def test_instance_type_extra_specs_update(self): @@ -79,11 +80,11 @@ class InstanceTypeExtraSpecsTestCase(test.TestCase): xpu_model="Tesla 2050") db.instance_type_extra_specs_update_or_create( self.context, - self.instance_type_id, + self.flavorid, dict(cpu_model="Sandy Bridge")) actual_specs = db.instance_type_extra_specs_get( self.context, - self.instance_type_id) + self.flavorid) self.assertEquals(expected_specs, actual_specs) def test_instance_type_extra_specs_create(self): @@ -96,12 +97,12 @@ class InstanceTypeExtraSpecsTestCase(test.TestCase): net_mbps="10000") db.instance_type_extra_specs_update_or_create( self.context, - self.instance_type_id, + self.flavorid, dict(net_arch="ethernet", net_mbps=10000)) actual_specs = db.instance_type_extra_specs_get( self.context, - self.instance_type_id) + self.flavorid) self.assertEquals(expected_specs, actual_specs) def test_instance_type_get_with_extra_specs(self): diff --git a/nova/tests/test_nova_manage.py b/nova/tests/test_nova_manage.py index e0431360f..805ac8e0d 100644 --- a/nova/tests/test_nova_manage.py +++ b/nova/tests/test_nova_manage.py @@ -284,6 +284,7 @@ class InstanceTypeCommandsTestCase(test.TestCase): values) self.instance_type_name = ref["name"] self.instance_type_id = ref["id"] + self.instance_type_flavorid = ref["flavorid"] self.set_key = nova_manage.InstanceTypeCommands().set_key self.unset_key = nova_manage.InstanceTypeCommands().unset_key @@ -307,7 +308,7 @@ class InstanceTypeCommandsTestCase(test.TestCase): self.set_key(self.instance_type_name, "k1", "v1") actual_specs = db.instance_type_extra_specs_get( context.get_admin_context(), - self.instance_type_id) + self.instance_type_flavorid) self.assertEquals(expected_specs, actual_specs) self.unset_key(self.instance_type_name, "k1") @@ -322,13 +323,13 @@ class InstanceTypeCommandsTestCase(test.TestCase): self.set_key(self.instance_type_name, "k1", "v1") actual_specs = db.instance_type_extra_specs_get( context.get_admin_context(), - self.instance_type_id) + self.instance_type_flavorid) self.assertEquals(expected_specs, actual_specs) self.set_key(self.instance_type_name, "k1", "v2") actual_specs = db.instance_type_extra_specs_get( context.get_admin_context(), - self.instance_type_id) + self.instance_type_flavorid) self.assertEquals(updated_specs, actual_specs) self.unset_key(self.instance_type_name, "k1") @@ -343,7 +344,7 @@ class InstanceTypeCommandsTestCase(test.TestCase): self.set_key(self.instance_type_name, "k3", "v3") actual_specs = db.instance_type_extra_specs_get( context.get_admin_context(), - self.instance_type_id) + self.instance_type_flavorid) self.assertEquals(two_items_extra_specs, actual_specs) self.unset_key(self.instance_type_name, "k1") |