openstack
/
nova
Code Issues Proposed changes

Merge "pci: Allow to assign pci devices in pci device list"

This commit is contained in:
Jenkins 2016-05-08 20:36:07 +00:00 committed by Gerrit Code Review
parent e533a7456f fd3be6e1f2
commit 84952371aa
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nova/objects/pci_device.py
View File

@ -465,8 +465,9 @@ class PciDeviceList(base.ObjectListBase, base.NovaObject):
def __init__(self, *args, **kwargs):
super(PciDeviceList, self).__init__(*args, **kwargs)
self.objects = []
self.obj_reset_changes()
if 'objects' not in kwargs:
self.objects = []
self.obj_reset_changes()
@base.remotable_classmethod
def get_by_compute_node(cls, context, node_id):

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

@ -451,6 +451,15 @@ fake_pci_devs = [fake_db_dev, fake_db_dev_1]
class _TestPciDeviceListObject(object):
def test_create_pci_device_list(self):
ctxt = context.get_admin_context()
devobj = pci_device.PciDevice.create(ctxt, dev_dict)
pci_device_list = objects.PciDeviceList(
context=ctxt, objects=[devobj])
self.assertEqual(1, len(pci_device_list))
self.assertIsInstance(pci_device_list[0], pci_device.PciDevice)
def test_get_by_compute_node(self):
ctxt = context.get_admin_context()
self.mox.StubOutWithMock(db, 'pci_device_get_all_by_node')