Merge "Cleanup instance device metadata object code"
This commit is contained in:
commit
3d66738373
@ -840,11 +840,11 @@ class Instance(base.NovaPersistentObject, base.NovaObject,
|
|||||||
objects.InstancePCIRequests.get_by_instance_uuid(
|
objects.InstancePCIRequests.get_by_instance_uuid(
|
||||||
self._context, self.uuid)
|
self._context, self.uuid)
|
||||||
|
|
||||||
def _load_device_metadata(self, db_requests=None):
|
def _load_device_metadata(self, db_dev_meta=None):
|
||||||
if db_requests is not None:
|
if db_dev_meta is not None:
|
||||||
self.device_metadata = \
|
self.device_metadata = \
|
||||||
objects.InstanceDeviceMetadata.obj_from_db(
|
objects.InstanceDeviceMetadata.obj_from_db(
|
||||||
self._context, db_requests)
|
self._context, db_dev_meta)
|
||||||
else:
|
else:
|
||||||
self.device_metadata = \
|
self.device_metadata = \
|
||||||
objects.InstanceDeviceMetadata.get_by_instance_uuid(
|
objects.InstanceDeviceMetadata.get_by_instance_uuid(
|
||||||
|
@ -94,12 +94,12 @@ class InstanceDeviceMetadata(base.NovaObject):
|
|||||||
VERSION = '1.0'
|
VERSION = '1.0'
|
||||||
fields = {
|
fields = {
|
||||||
'devices': fields.ListOfObjectsField('DeviceMetadata',
|
'devices': fields.ListOfObjectsField('DeviceMetadata',
|
||||||
subclasses=True),
|
subclasses=True),
|
||||||
}
|
}
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def obj_from_db(cls, context, db_requests):
|
def obj_from_db(cls, context, db_dev_meta):
|
||||||
primitive = jsonutils.loads(db_requests)
|
primitive = jsonutils.loads(db_dev_meta)
|
||||||
device_metadata = cls.obj_from_primitive(primitive)
|
device_metadata = cls.obj_from_primitive(primitive)
|
||||||
return device_metadata
|
return device_metadata
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user