x/gantt
Code Issues Proposed changes

Add instance_system_metadata modeling.

Browse Source 
Implements blueprint instance-system-metadata.

Adds a new table to store system-owned metadata tied to an instance. The
intent is to provide a key/value store that compute plugins can use to
persist state.

Change-Id: Ic446fea0f9c8a652f2ac6d554f4f85021ce34fb8
This commit is contained in:
Rick Harris
2012-05-02 21:40:14 +00:00
parent 423a862135
commit c147a94c93
2 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nova/exception.py
View File

@@ -811,6 +811,11 @@ class InstanceMetadataNotFound(NotFound):
"key %(metadata_key)s.") "key %(metadata_key)s.")
class InstanceSystemMetadataNotFound(NotFound):
message = _("Instance %(instance_uuid)s has no system metadata with "
"key %(metadata_key)s.")
class InstanceTypeExtraSpecsNotFound(NotFound): class InstanceTypeExtraSpecsNotFound(NotFound):
message = _("Instance Type %(instance_type_id)s has no extra specs with " message = _("Instance Type %(instance_type_id)s has no extra specs with "
"key %(extra_specs_key)s.") "key %(extra_specs_key)s.")

30
nova/tests/test_db_api.py
View File

@@ -168,37 +168,47 @@ class DbApiTestCase(test.TestCase):
ctxt = context.get_admin_context() ctxt = context.get_admin_context()
# Create an instance with some metadata # Create an instance with some metadata
metadata = {'host': 'foo'} values = {'metadata': {'host': 'foo'},
values = {'metadata': metadata} 'system_metadata': {'original_image_ref': 'blah'}}
instance = db.instance_create(ctxt, values) instance = db.instance_create(ctxt, values)
# Update the metadata # Update the metadata
metadata = {'host': 'bar'} values = {'metadata': {'host': 'bar'},
values = {'metadata': metadata} 'system_metadata': {'original_image_ref': 'baz'}}
db.instance_update(ctxt, instance.id, values) 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) instance_meta = db.instance_metadata_get(ctxt, instance.id)
self.assertEqual('bar', instance_meta['host']) 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): def test_instance_update_with_instance_uuid(self):
""" test instance_update() works when an instance UUID is passed """ """ test instance_update() works when an instance UUID is passed """
ctxt = context.get_admin_context() ctxt = context.get_admin_context()
# Create an instance with some metadata # Create an instance with some metadata
metadata = {'host': 'foo'} values = {'metadata': {'host': 'foo'},
values = {'metadata': metadata} 'system_metadata': {'original_image_ref': 'blah'}}
instance = db.instance_create(ctxt, values) instance = db.instance_create(ctxt, values)
# Update the metadata # Update the metadata
metadata = {'host': 'bar'} values = {'metadata': {'host': 'bar'},
values = {'metadata': metadata} 'system_metadata': {'original_image_ref': 'baz'}}
db.instance_update(ctxt, instance.uuid, values) 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) instance_meta = db.instance_metadata_get(ctxt, instance.id)
self.assertEqual('bar', instance_meta['host']) 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): def test_instance_fault_create(self):
"""Ensure we can create an instance fault""" """Ensure we can create an instance fault"""
ctxt = context.get_admin_context() ctxt = context.get_admin_context()