summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLorin Hochstein <lorin@isi.edu>2011-05-27 13:10:19 -0400
committerLorin Hochstein <lorin@isi.edu>2011-05-27 13:10:19 -0400
commitde0122eaae70c92db47f9457b162cc48c5d5f755 (patch)
treefc089477a0c0831e98521187a65ef4f176804e5c
parent556ccd9b0d9c7809395b7720e5dcfb6af514f69f (diff)
downloadnova-de0122eaae70c92db47f9457b162cc48c5d5f755.tar.gz
nova-de0122eaae70c92db47f9457b162cc48c5d5f755.tar.xz
nova-de0122eaae70c92db47f9457b162cc48c5d5f755.zip
Adding test code
-rw-r--r--nova/tests/test_instance_types_metadata.py26
1 files changed, 16 insertions, 10 deletions
diff --git a/nova/tests/test_instance_types_metadata.py b/nova/tests/test_instance_types_metadata.py
index a22bf2b77..06c11a7cf 100644
--- a/nova/tests/test_instance_types_metadata.py
+++ b/nova/tests/test_instance_types_metadata.py
@@ -16,7 +16,9 @@
Unit Tests for instance types metadata code
"""
+import nova.db.api
+from nova import context
from nova import test
from nova.db.sqlalchemy.session import get_session
from nova.db.sqlalchemy import models
@@ -26,15 +28,16 @@ class InstanceTypeMetadataTestCase(test.TestCase):
def setUp(self):
super(InstanceTypeMetadataTestCase, self).setUp()
- values = dict(memory_mb=22000,
+ values = dict(name="cg1.4xlarge",
+ memory_mb=22000,
vcpus=8,
local_gb=1690,
flavorid=105)
metadata = dict(cpu_arch="x86_64",
- cpu_info=dict(model="Nehalem"),
+ cpu_model="Nehalem",
xpu_arch="fermi",
xpus=2,
- xpu_info=dict(model="Tesla 2050", gcores="448"),
+ xpu_model="Tesla 2050",
net_arch="ethernet",
net_mbps=10000)
@@ -44,19 +47,22 @@ class InstanceTypeMetadataTestCase(test.TestCase):
metadata_ref['key'] = k
metadata_ref['value'] = v
metadata_refs.append(metadata_ref)
- values['metadata'] = metadata_refs
+ 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)
- # Add cg1.4xlarge
+ self.instance_type_id = instance_type_ref.id
+ def test_instance_type_metadata_get(self):
+ self.assertEquals( \
+ nova.db.api.instance_type_metadata_get(context.get_admin_context(),
+ self.instance_type_id),
+ {'foo' : 'bar'})
- def test_foo(self):
- # Add a new instance type cg1
- # Add the metadata
- # Retrieve the metadata
- pass
+
+ \ No newline at end of file