diff options
| author | Stephen Finucane <stephenfin@redhat.com> | 2020-04-27 14:06:31 +0100 |
|---|---|---|
| committer | Stephen Finucane <stephenfin@redhat.com> | 2022-03-23 15:16:00 +0000 |
| commit | 86ded7f65d560b3c653237ad6eb698f86c8303dd (patch) | |
| tree | 6dfb40f11ecf4e6c253c5b08abf792b6433683e4 /nova/objects | |
| parent | 028b3bca16c750f6c7edf1b389ed6c79a2c9843d (diff) | |
| download | nova-86ded7f65d560b3c653237ad6eb698f86c8303dd.tar.gz | |
objects: Remove 'NovaObjectDictCompat' from 'InstancePCIRequest'
Addresses a long-standing TODO. We remove the
'InstancePCIRequests.from_request_spec_instance_props' helper since it's
entirely unnecessary: the built-in 'obj_from_primitive' wrapper will do
what we want here (creating an o.vo from a serialized representation of
the object).
Change-Id: I5208b7dff996828137dfddfdd2db8737126884e3
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
Diffstat (limited to 'nova/objects')
| -rw-r--r-- | nova/objects/instance_pci_requests.py | 14 | ||||
| -rw-r--r-- | nova/objects/request_spec.py | 6 |
2 files changed, 5 insertions, 15 deletions
diff --git a/nova/objects/instance_pci_requests.py b/nova/objects/instance_pci_requests.py index ee94db87dd..3500c9a68d 100644 --- a/nova/objects/instance_pci_requests.py +++ b/nova/objects/instance_pci_requests.py @@ -18,10 +18,8 @@ from nova.objects import base from nova.objects import fields -# TODO(berrange): Remove NovaObjectDictCompat @base.NovaObjectRegistry.register -class InstancePCIRequest(base.NovaObject, - base.NovaObjectDictCompat): +class InstancePCIRequest(base.NovaObject): # Version 1.0: Initial version # Version 1.1: Added request_id field # Version 1.2: Added numa_policy field @@ -70,10 +68,8 @@ class InstancePCIRequest(base.NovaObject, del primitive['request_id'] -# TODO(berrange): Remove NovaObjectDictCompat @base.NovaObjectRegistry.register -class InstancePCIRequests(base.NovaObject, - base.NovaObjectDictCompat): +class InstancePCIRequests(base.NovaObject): # Version 1.0: Initial version # Version 1.1: InstancePCIRequest 1.1 VERSION = '1.1' @@ -155,9 +151,3 @@ class InstancePCIRequests(base.NovaObject, 'request_id': x.request_id, 'requester_id': x.requester_id} for x in self.requests] return jsonutils.dumps(blob) - - @classmethod - def from_request_spec_instance_props(cls, pci_requests): - objs = [InstancePCIRequest(**request) - for request in pci_requests['requests']] - return cls(requests=objs, instance_uuid=pci_requests['instance_uuid']) diff --git a/nova/objects/request_spec.py b/nova/objects/request_spec.py index 9ce77a4043..818edd561d 100644 --- a/nova/objects/request_spec.py +++ b/nova/objects/request_spec.py @@ -248,9 +248,9 @@ class RequestSpec(base.NovaObject): def _from_instance_pci_requests(self, pci_requests): if isinstance(pci_requests, dict): - pci_req_cls = objects.InstancePCIRequests - self.pci_requests = pci_req_cls.from_request_spec_instance_props( - pci_requests) + self.pci_requests = objects.InstancePCIRequests.obj_from_primitive( + pci_requests, + ) else: self.pci_requests = pci_requests |