openstack
/
nova
Code Issues Proposed changes

Merge "pci: add safe-guard to __eq__ of PciDevice"

This commit is contained in:
Jenkins 2016-05-19 20:31:18 +00:00 committed by Gerrit Code Review
parent 813787644b 7268006a2f
commit d8c553955e
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/objects/pci_device.py
View File

@ -30,6 +30,8 @@ LOG = logging.getLogger(__name__)
def compare_pci_device_attributes(obj_a, obj_b):
if not isinstance(obj_b, PciDevice):
return False
pci_ignore_fields = base.NovaPersistentObject.fields.keys()
for name in obj_a.obj_fields:
if name in pci_ignore_fields:

7
nova/tests/unit/objects/test_pci_device.py
View File

@ -347,6 +347,13 @@ class _TestPciDeviceObject(object):
pci_device2.instance_uuid = None
self.assertNotEqual(pci_device1, pci_device2)
def test_pci_device_not_equivalent_with_not_pci_device(self):
pci_device1 = pci_device.PciDevice.create(None, dev_dict)
self.assertNotEqual(pci_device1, None)
self.assertNotEqual(pci_device1, 'foo')
self.assertNotEqual(pci_device1, 1)
self.assertNotEqual(pci_device1, objects.PciDeviceList())
def test_claim_device(self):
self._create_fake_instance()
devobj = pci_device.PciDevice.create(None, dev_dict)