diff options
Diffstat (limited to 'nova/tests/unit/objects/test_pci_device.py')
| -rw-r--r-- | nova/tests/unit/objects/test_pci_device.py | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/nova/tests/unit/objects/test_pci_device.py b/nova/tests/unit/objects/test_pci_device.py index f4aa442e6a..4fbe3430ff 100644 --- a/nova/tests/unit/objects/test_pci_device.py +++ b/nova/tests/unit/objects/test_pci_device.py @@ -27,6 +27,7 @@ from nova.objects import instance from nova.objects import pci_device from nova import test from nova.tests.unit.objects import test_objects +from nova.tests import uuidsentinel as uuids dev_dict = { 'compute_node_id': 1, @@ -208,11 +209,11 @@ class _TestPciDeviceObject(object): ctxt = context.get_admin_context() self._create_fake_pci_device(ctxt=ctxt) return_dev = dict(fake_db_dev, status=fields.PciDeviceStatus.AVAILABLE, - instance_uuid='fake-uuid-3') + instance_uuid=uuids.instance3) self.pci_device.status = fields.PciDeviceStatus.ALLOCATED - self.pci_device.instance_uuid = 'fake-uuid-2' + self.pci_device.instance_uuid = uuids.instance2 expected_updates = dict(status=fields.PciDeviceStatus.ALLOCATED, - instance_uuid='fake-uuid-2') + instance_uuid=uuids.instance2) self.mox.StubOutWithMock(db, 'pci_device_update') db.pci_device_update(ctxt, 1, 'a', expected_updates).AndReturn(return_dev) @@ -221,11 +222,11 @@ class _TestPciDeviceObject(object): self.assertEqual(self.pci_device.status, fields.PciDeviceStatus.AVAILABLE) self.assertEqual(self.pci_device.instance_uuid, - 'fake-uuid-3') + uuids.instance3) def test_save_no_extra_info(self): return_dev = dict(fake_db_dev, status=fields.PciDeviceStatus.AVAILABLE, - instance_uuid='fake-uuid-3') + instance_uuid=uuids.instance3) def _fake_update(ctxt, node_id, addr, updates): self.extra_info = updates.get('extra_info') @@ -356,7 +357,7 @@ class _TestPciDeviceObject(object): def test_claim_device(self): self._create_fake_instance() devobj = pci_device.PciDevice.create(None, dev_dict) - devobj.claim(self.inst) + devobj.claim(self.inst.uuid) self.assertEqual(devobj.status, fields.PciDeviceStatus.CLAIMED) self.assertEqual(devobj.instance_uuid, @@ -373,7 +374,7 @@ class _TestPciDeviceObject(object): def test_allocate_device(self): self._create_fake_instance() devobj = pci_device.PciDevice.create(None, dev_dict) - devobj.claim(self.inst) + devobj.claim(self.inst.uuid) devobj.allocate(self.inst) self.assertEqual(devobj.status, fields.PciDeviceStatus.ALLOCATED) @@ -396,14 +397,14 @@ class _TestPciDeviceObject(object): inst_2 = instance.Instance() inst_2.uuid = 'fake-inst-uuid-2' devobj = pci_device.PciDevice.create(None, dev_dict) - devobj.claim(self.inst) + devobj.claim(self.inst.uuid) self.assertRaises(exception.PciDeviceInvalidOwner, devobj.allocate, inst_2) def test_free_claimed_device(self): self._create_fake_instance() devobj = pci_device.PciDevice.create(None, dev_dict) - devobj.claim(self.inst) + devobj.claim(self.inst.uuid) devobj.free(self.inst) self.assertEqual(devobj.status, fields.PciDeviceStatus.AVAILABLE) @@ -414,7 +415,7 @@ class _TestPciDeviceObject(object): ctx = context.get_admin_context() devobj = pci_device.PciDevice._from_db_object( ctx, pci_device.PciDevice(), fake_db_dev) - devobj.claim(self.inst) + devobj.claim(self.inst.uuid) devobj.allocate(self.inst) self.assertEqual(len(self.inst.pci_devices), 1) devobj.free(self.inst) @@ -439,7 +440,7 @@ class _TestPciDeviceObject(object): def test_remove_device_fail(self): self._create_fake_instance() devobj = pci_device.PciDevice.create(None, dev_dict) - devobj.claim(self.inst) + devobj.claim(self.inst.uuid) self.assertRaises(exception.PciDeviceInvalidStatus, devobj.remove) @@ -561,7 +562,7 @@ class _TestSRIOVPciDeviceObject(object): side_effect=self._fake_get_by_parent_address): self._create_pci_devices() devobj = self.sriov_pf_devices[0] - devobj.claim(self.inst) + devobj.claim(self.inst.uuid) self.assertEqual(devobj.status, fields.PciDeviceStatus.CLAIMED) self.assertEqual(devobj.instance_uuid, @@ -579,7 +580,7 @@ class _TestSRIOVPciDeviceObject(object): side_effect=self._fake_pci_device_get_by_addr): self._create_pci_devices() devobj = self.sriov_vf_devices[0] - devobj.claim(self.inst) + devobj.claim(self.inst.uuid) self.assertEqual(devobj.status, fields.PciDeviceStatus.CLAIMED) self.assertEqual(devobj.instance_uuid, @@ -597,7 +598,7 @@ class _TestSRIOVPciDeviceObject(object): side_effect=self._fake_get_by_parent_address): self._create_pci_devices() devobj = self.sriov_pf_devices[0] - devobj.claim(self.inst) + devobj.claim(self.inst.uuid) devobj.allocate(self.inst) self.assertEqual(devobj.status, fields.PciDeviceStatus.ALLOCATED) @@ -616,7 +617,7 @@ class _TestSRIOVPciDeviceObject(object): side_effect=self._fake_pci_device_get_by_addr): self._create_pci_devices() devobj = self.sriov_vf_devices[0] - devobj.claim(self.inst) + devobj.claim(self.inst.uuid) devobj.allocate(self.inst) self.assertEqual(devobj.status, fields.PciDeviceStatus.ALLOCATED) @@ -683,7 +684,7 @@ class _TestSRIOVPciDeviceObject(object): side_effect=self._fake_get_by_parent_address): self._create_pci_devices() devobj = self.sriov_pf_devices[0] - devobj.claim(self.inst) + devobj.claim(self.inst.uuid) devobj.allocate(self.inst) devobj.free(self.inst) self.assertEqual(devobj.status, @@ -707,7 +708,7 @@ class _TestSRIOVPciDeviceObject(object): dependents = self._fake_get_by_parent_address(None, None, vf.parent_addr) for devobj in dependents: - devobj.claim(self.inst) + devobj.claim(self.inst.uuid) devobj.allocate(self.inst) self.assertEqual(devobj.status, fields.PciDeviceStatus.ALLOCATED) |