openstack
/
nova
Code Issues Proposed changes

Merge "Cleanup instance device metadata object code"

This commit is contained in:
Jenkins 2016-10-11 14:50:15 +00:00 committed by Gerrit Code Review
parent a63a45805a da0dbd7d31
commit 3d66738373
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nova/objects/instance.py
View File

@ -840,11 +840,11 @@ class Instance(base.NovaPersistentObject, base.NovaObject,
objects.InstancePCIRequests.get_by_instance_uuid(
self._context, self.uuid)
def _load_device_metadata(self, db_requests=None):
if db_requests is not None:
def _load_device_metadata(self, db_dev_meta=None):
if db_dev_meta is not None:
self.device_metadata = \
objects.InstanceDeviceMetadata.obj_from_db(
self._context, db_requests)
self._context, db_dev_meta)
else:
self.device_metadata = \
objects.InstanceDeviceMetadata.get_by_instance_uuid(

6
nova/objects/virt_device_metadata.py
View File

@ -94,12 +94,12 @@ class InstanceDeviceMetadata(base.NovaObject):
VERSION = '1.0'
fields = {
'devices': fields.ListOfObjectsField('DeviceMetadata',
subclasses=True),
subclasses=True),
}
@classmethod
def obj_from_db(cls, context, db_requests):
primitive = jsonutils.loads(db_requests)
def obj_from_db(cls, context, db_dev_meta):
primitive = jsonutils.loads(db_dev_meta)
device_metadata = cls.obj_from_primitive(primitive)
return device_metadata