openstack/nova
Code Issues Proposed changes

Code dedup in class InstanceTypeExtraSpecsTestCase

Browse Source 
Moved expected specs to setUp()

bp nova-tests-code-duplication

Change-Id: Id5326ad5445688a806b6667e2189e45c8dcdc69b
This commit is contained in:
Elena Ezhova
2013-07-09 13:54:21 +04:00
parent f9b154fc97
commit 05560f73b9
1 changed files with 25 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
nova/tests/test_instance_types_extra_specs.py
View File

@@ -33,14 +33,14 @@ class InstanceTypeExtraSpecsTestCase(test.TestCase):
root_gb=1690, root_gb=1690,
ephemeral_gb=2000, ephemeral_gb=2000,
flavorid=105) flavorid=105)
specs = dict(cpu_arch="x86_64", self.specs = dict(cpu_arch="x86_64",
cpu_model="Nehalem", cpu_model="Nehalem",
xpu_arch="fermi", xpu_arch="fermi",
xpus=2, xpus="2",
xpu_model="Tesla 2050") xpu_model="Tesla 2050")
values['extra_specs'] = specs values['extra_specs'] = self.specs
ref = db.flavor_create(self.context, ref = db.flavor_create(self.context,
values) values)
self.instance_type_id = ref["id"] self.instance_type_id = ref["id"]
self.flavorid = ref["flavorid"] self.flavorid = ref["flavorid"]
@@ -50,35 +50,23 @@ class InstanceTypeExtraSpecsTestCase(test.TestCase):
super(InstanceTypeExtraSpecsTestCase, self).tearDown() super(InstanceTypeExtraSpecsTestCase, self).tearDown()
def test_instance_type_specs_get(self): def test_instance_type_specs_get(self):
expected_specs = dict(cpu_arch="x86_64",
cpu_model="Nehalem",
xpu_arch="fermi",
xpus="2",
xpu_model="Tesla 2050")
actual_specs = db.flavor_extra_specs_get( actual_specs = db.flavor_extra_specs_get(
self.context, self.context,
self.flavorid) self.flavorid)
self.assertEquals(expected_specs, actual_specs) self.assertEquals(self.specs, actual_specs)
def test_instance_type_extra_specs_delete(self): def test_instance_type_extra_specs_delete(self):
expected_specs = dict(cpu_arch="x86_64", del self.specs["xpu_model"]
cpu_model="Nehalem",
xpu_arch="fermi",
xpus="2")
db.flavor_extra_specs_delete(self.context, db.flavor_extra_specs_delete(self.context,
self.flavorid, self.flavorid,
"xpu_model") "xpu_model")
actual_specs = db.flavor_extra_specs_get( actual_specs = db.flavor_extra_specs_get(
self.context, self.context,
self.flavorid) self.flavorid)
self.assertEquals(expected_specs, actual_specs) self.assertEquals(self.specs, actual_specs)
def test_instance_type_extra_specs_update(self): def test_instance_type_extra_specs_update(self):
expected_specs = dict(cpu_arch="x86_64", self.specs["cpu_model"] = "Sandy Bridge"
cpu_model="Sandy Bridge",
xpu_arch="fermi",
xpus="2",
xpu_model="Tesla 2050")
db.flavor_extra_specs_update_or_create( db.flavor_extra_specs_update_or_create(
self.context, self.context,
self.flavorid, self.flavorid,
@@ -86,7 +74,7 @@ class InstanceTypeExtraSpecsTestCase(test.TestCase):
actual_specs = db.flavor_extra_specs_get( actual_specs = db.flavor_extra_specs_get(
self.context, self.context,
self.flavorid) self.flavorid)
self.assertEquals(expected_specs, actual_specs) self.assertEquals(self.specs, actual_specs)
def test_instance_type_extra_specs_update_with_nonexisting_flavor(self): def test_instance_type_extra_specs_update_with_nonexisting_flavor(self):
extra_specs = dict(cpu_arch="x86_64") extra_specs = dict(cpu_arch="x86_64")
@@ -96,33 +84,26 @@ class InstanceTypeExtraSpecsTestCase(test.TestCase):
self.context, nonexisting_flavorid, extra_specs) self.context, nonexisting_flavorid, extra_specs)
def test_instance_type_extra_specs_create(self): def test_instance_type_extra_specs_create(self):
expected_specs = dict(cpu_arch="x86_64", net_attrs = {
cpu_model="Nehalem", "net_arch": "ethernet",
xpu_arch="fermi", "net_mbps": "10000"
xpus="2", }
xpu_model="Tesla 2050", self.specs.update(net_attrs)
net_arch="ethernet",
net_mbps="10000")
db.flavor_extra_specs_update_or_create( db.flavor_extra_specs_update_or_create(
self.context, self.context,
self.flavorid, self.flavorid,
dict(net_arch="ethernet", net_attrs)
net_mbps=10000))
actual_specs = db.flavor_extra_specs_get( actual_specs = db.flavor_extra_specs_get(
self.context, self.context,
self.flavorid) self.flavorid)
self.assertEquals(expected_specs, actual_specs) self.assertEquals(self.specs, actual_specs)
def test_instance_type_get_with_extra_specs(self): def test_instance_type_get_with_extra_specs(self):
instance_type = db.flavor_get( instance_type = db.flavor_get(
self.context, self.context,
self.instance_type_id) self.instance_type_id)
self.assertEquals(instance_type['extra_specs'], self.assertEquals(instance_type['extra_specs'],
dict(cpu_arch="x86_64", self.specs)
cpu_model="Nehalem",
xpu_arch="fermi",
xpus="2",
xpu_model="Tesla 2050"))
instance_type = db.flavor_get( instance_type = db.flavor_get(
self.context, self.context,
5) 5)
@@ -133,12 +114,7 @@ class InstanceTypeExtraSpecsTestCase(test.TestCase):
self.context, self.context,
"cg1.4xlarge") "cg1.4xlarge")
self.assertEquals(instance_type['extra_specs'], self.assertEquals(instance_type['extra_specs'],
dict(cpu_arch="x86_64", self.specs)
cpu_model="Nehalem",
xpu_arch="fermi",
xpus="2",
xpu_model="Tesla 2050"))
instance_type = db.flavor_get_by_name( instance_type = db.flavor_get_by_name(
self.context, self.context,
"m1.small") "m1.small")
@@ -149,24 +125,13 @@ class InstanceTypeExtraSpecsTestCase(test.TestCase):
self.context, self.context,
105) 105)
self.assertEquals(instance_type['extra_specs'], self.assertEquals(instance_type['extra_specs'],
dict(cpu_arch="x86_64", self.specs)
cpu_model="Nehalem",
xpu_arch="fermi",
xpus="2",
xpu_model="Tesla 2050"))
instance_type = db.flavor_get_by_flavor_id( instance_type = db.flavor_get_by_flavor_id(
self.context, self.context,
2) 2)
self.assertEquals(instance_type['extra_specs'], {}) self.assertEquals(instance_type['extra_specs'], {})
def test_instance_type_get_all(self): def test_instance_type_get_all(self):
specs = dict(cpu_arch="x86_64",
cpu_model="Nehalem",
xpu_arch="fermi",
xpus='2',
xpu_model="Tesla 2050")
types = db.flavor_get_all(self.context) types = db.flavor_get_all(self.context)
name2specs = {} name2specs = {}
@@ -174,5 +139,5 @@ class InstanceTypeExtraSpecsTestCase(test.TestCase):
name = instance_type['name'] name = instance_type['name']
name2specs[name] = instance_type['extra_specs'] name2specs[name] = instance_type['extra_specs']
self.assertEquals(name2specs['cg1.4xlarge'], specs) self.assertEquals(name2specs['cg1.4xlarge'], self.specs)
self.assertEquals(name2specs['m1.small'], {}) self.assertEquals(name2specs['m1.small'], {})