summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLorin Hochstein <lorin@isi.edu>2011-05-27 13:39:37 -0400
committerLorin Hochstein <lorin@isi.edu>2011-05-27 13:39:37 -0400
commit842bb180f04d8b1fbacbca77171f11bfe3d68cdd (patch)
tree01010f263355721e7c8ad7b51910c0a543cd5a10
parenta28590d77474f7a43d704385cc3815f2c879f397 (diff)
Added delete instance metadata unit test
-rw-r--r--nova/tests/test_instance_types_metadata.py25
1 files changed, 17 insertions, 8 deletions
diff --git a/nova/tests/test_instance_types_metadata.py b/nova/tests/test_instance_types_metadata.py
index 5d8364c3a..c83c5bfca 100644
--- a/nova/tests/test_instance_types_metadata.py
+++ b/nova/tests/test_instance_types_metadata.py
@@ -47,11 +47,8 @@ class InstanceTypeMetadataTestCase(test.TestCase):
metadata_ref['value'] = v
metadata_refs.append(metadata_ref)
values['meta'] = metadata_refs
-
instance_type_ref = models.InstanceTypes()
instance_type_ref.update(values)
-
-
session = get_session()
with session.begin():
instance_type_ref.save(session=session)
@@ -65,10 +62,22 @@ class InstanceTypeMetadataTestCase(test.TestCase):
xpu_model="Tesla 2050",
net_arch="ethernet",
net_mbps="10000")
- retrieved_metadata = db.api.instance_type_metadata_get(
+ actual_metadata = db.api.instance_type_metadata_get(
context.get_admin_context(),
self.instance_type_id)
- self.assertEquals(expected_metadata, retrieved_metadata)
-
-
- \ No newline at end of file
+ self.assertEquals(expected_metadata, actual_metadata)
+
+ def test_instance_type_metadata_delete(self):
+ expected_metadata = dict(cpu_arch="x86_64",
+ cpu_model="Nehalem",
+ xpu_arch="fermi",
+ xpus="2",
+ net_arch="ethernet",
+ net_mbps="10000")
+ db.api.instance_type_metadata_delete(context.get_admin_context(),
+ self.instance_type_id,
+ "xpu_model")
+ actual_metadata = db.api.instance_type_metadata_get(
+ context.get_admin_context(),
+ self.instance_type_id)
+ self.assertEquals(expected_metadata, actual_metadata) \ No newline at end of file