diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-05-04 20:21:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-05-04 20:21:10 +0000 |
| commit | 87ca5570ff8cf8e172e8a1f36128b2b2badc9206 (patch) | |
| tree | 0d8d7356ef939fde91ebfe53e1f8331f859a632e /nova/tests | |
| parent | 90f305c3994f2707263ecd2acb70ff1908e20f6d (diff) | |
| parent | 066d4c0bf25a9e4c6493e9fe575d9086dab2ea33 (diff) | |
Merge "Add instance_system_metadata modeling."
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/test_db_api.py | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/nova/tests/test_db_api.py b/nova/tests/test_db_api.py index b5607cee4..c1002d98a 100644 --- a/nova/tests/test_db_api.py +++ b/nova/tests/test_db_api.py @@ -168,37 +168,47 @@ class DbApiTestCase(test.TestCase): ctxt = context.get_admin_context() # Create an instance with some metadata - metadata = {'host': 'foo'} - values = {'metadata': metadata} + values = {'metadata': {'host': 'foo'}, + 'system_metadata': {'original_image_ref': 'blah'}} instance = db.instance_create(ctxt, values) # Update the metadata - metadata = {'host': 'bar'} - values = {'metadata': metadata} + values = {'metadata': {'host': 'bar'}, + 'system_metadata': {'original_image_ref': 'baz'}} db.instance_update(ctxt, instance.id, values) - # Retrieve the metadata to ensure it was successfully updated + # Retrieve the user-provided metadata to ensure it was successfully + # updated instance_meta = db.instance_metadata_get(ctxt, instance.id) self.assertEqual('bar', instance_meta['host']) + # Retrieve the system metadata to ensure it was successfully updated + system_meta = db.instance_system_metadata_get(ctxt, instance.uuid) + self.assertEqual('baz', system_meta['original_image_ref']) + def test_instance_update_with_instance_uuid(self): """ test instance_update() works when an instance UUID is passed """ ctxt = context.get_admin_context() # Create an instance with some metadata - metadata = {'host': 'foo'} - values = {'metadata': metadata} + values = {'metadata': {'host': 'foo'}, + 'system_metadata': {'original_image_ref': 'blah'}} instance = db.instance_create(ctxt, values) # Update the metadata - metadata = {'host': 'bar'} - values = {'metadata': metadata} + values = {'metadata': {'host': 'bar'}, + 'system_metadata': {'original_image_ref': 'baz'}} db.instance_update(ctxt, instance.uuid, values) - # Retrieve the metadata to ensure it was successfully updated + # Retrieve the user-provided metadata to ensure it was successfully + # updated instance_meta = db.instance_metadata_get(ctxt, instance.id) self.assertEqual('bar', instance_meta['host']) + # Retrieve the system metadata to ensure it was successfully updated + system_meta = db.instance_system_metadata_get(ctxt, instance.uuid) + self.assertEqual('baz', system_meta['original_image_ref']) + def test_instance_fault_create(self): """Ensure we can create an instance fault""" ctxt = context.get_admin_context() |