diff --git a/zun/container/os_capability/host_capability.py b/zun/container/os_capability/host_capability.py index 04789eefe..5bba703a9 100644 --- a/zun/container/os_capability/host_capability.py +++ b/zun/container/os_capability/host_capability.py @@ -136,7 +136,7 @@ class Host(object): {'network': pcinet_info.get('capabilities')}} return {} - def _get_product_and_vendor(address): + def _get_vendor_and_product(address): output, status = utils.execute('lspci', '-n', '-s', address) value = output.split()[2] result = value.split(":") @@ -152,7 +152,7 @@ class Host(object): return numa_node dev_name = 'pci_' + address.replace(":", "_").replace(".", "_") - product_id, vendor_id = _get_product_and_vendor(address) + vendor_id, product_id = _get_vendor_and_product(address) numa_node = _get_numa_node(address) device = { "dev_id": dev_name, diff --git a/zun/tests/unit/container/os_capability/linux/os_capability_linux/test_os_capability_linux.py b/zun/tests/unit/container/os_capability/linux/os_capability_linux/test_os_capability_linux.py index 924dbc99c..31a56cb8f 100644 --- a/zun/tests/unit/container/os_capability/linux/os_capability_linux/test_os_capability_linux.py +++ b/zun/tests/unit/container/os_capability/linux/os_capability_linux/test_os_capability_linux.py @@ -132,10 +132,10 @@ rx-vlan-stag-filter: off [fixed]''' mock_output.side_effect = values expected = {"dev_id": "pci_0000_02_10_7", "address": "0000:02:10.7", - "product_id": "8086", - "vendor_id": "1520", + "vendor_id": "8086", + "product_id": "1520", "numa_node": 0, - "label": "label_1520_8086", + "label": "label_8086_1520", "dev_type": "VF", "parent_addr": "0000:02:10.7"} output = os_capability_linux.LinuxHost().get_pci_resources()