openstack/nova
Code Issues Proposed changes

Merge "pci: do not filter out any SRIOV Physical Functions"

Browse Source
This commit is contained in:
Jenkins 2016-01-13 14:05:32 +00:00 committed by Gerrit Code Review
commit 5dd9b23e6b
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nova/pci/manager.py
View File

@ -112,9 +112,6 @@ class PciDevTracker(object):
devices = [] devices = []
for dev in jsonutils.loads(devices_json): for dev in jsonutils.loads(devices_json):
if dev.get('dev_type') == fields.PciDeviceType.SRIOV_PF:
continue
if self.dev_filter.device_assignable(dev): if self.dev_filter.device_assignable(dev):
devices.append(dev) devices.append(dev)
self._set_hvdevs(devices) self._set_hvdevs(devices)

17
nova/tests/unit/compute/test_resource_tracker.py
View File

@ -105,7 +105,8 @@ class FakeVirtDriver(driver.ComputeDriver):
'vendor_id': '8086', 'vendor_id': '8086',
'status': 'available', 'status': 'available',
'extra_k1': 'v1', 'extra_k1': 'v1',
'numa_node': 1 'numa_node': 1,
'parent_addr': '0000:00:01.0',
}, },
{ {
'label': 'label_8086_0443', 'label': 'label_8086_0443',
@ -116,7 +117,8 @@ class FakeVirtDriver(driver.ComputeDriver):
'vendor_id': '8086', 'vendor_id': '8086',
'status': 'available', 'status': 'available',
'extra_k1': 'v1', 'extra_k1': 'v1',
'numa_node': 1 'numa_node': 1,
'parent_addr': '0000:00:01.0',
}, },
{ {
'label': 'label_8086_0443', 'label': 'label_8086_0443',
@ -127,7 +129,8 @@ class FakeVirtDriver(driver.ComputeDriver):
'vendor_id': '8086', 'vendor_id': '8086',
'status': 'available', 'status': 'available',
'extra_k1': 'v1', 'extra_k1': 'v1',
'numa_node': 1 'numa_node': 1,
'parent_addr': None,
}, },
{ {
'label': 'label_8086_0123', 'label': 'label_8086_0123',
@ -138,7 +141,8 @@ class FakeVirtDriver(driver.ComputeDriver):
'vendor_id': '8086', 'vendor_id': '8086',
'status': 'available', 'status': 'available',
'extra_k1': 'v1', 'extra_k1': 'v1',
'numa_node': 1 'numa_node': 1,
'parent_addr': None,
}, },
{ {
'label': 'label_8086_7891', 'label': 'label_8086_7891',
@ -149,12 +153,13 @@ class FakeVirtDriver(driver.ComputeDriver):
'vendor_id': '8086', 'vendor_id': '8086',
'status': 'available', 'status': 'available',
'extra_k1': 'v1', 'extra_k1': 'v1',
'numa_node': None 'numa_node': None,
'parent_addr': '0000:08:01.0',
}, },
] if self.pci_support else [] ] if self.pci_support else []
self.pci_stats = [ self.pci_stats = [
{ {
'count': 2, 'count': 3,
'vendor_id': '8086', 'vendor_id': '8086',
'product_id': '0443', 'product_id': '0443',
'numa_node': 1 'numa_node': 1