From b1a693a0e7ec616df3fb3d922f6c7ad4acb8e4a7 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Thu, 27 Jul 2023 14:10:52 -0400 Subject: [PATCH] Prefer first PCI device id The 'base' device id in a multi-function device may be considered to be the first, rather than the last. Change-Id: I4f39b81fb0225b4221aeffc108c12388cf7a7ea1 --- pyghmi/ipmi/oem/lenovo/imm.py | 2 +- pyghmi/redfish/oem/lenovo/xcc.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyghmi/ipmi/oem/lenovo/imm.py b/pyghmi/ipmi/oem/lenovo/imm.py index 32ed8783..783dfab5 100644 --- a/pyghmi/ipmi/oem/lenovo/imm.py +++ b/pyghmi/ipmi/oem/lenovo/imm.py @@ -796,7 +796,7 @@ class IMMClient(object): if venid is not None: bdata['PCI Vendor ID'] = '{0:04x}'.format(venid) devid = fundata.get(self.ADP_DEVID, None) - if devid is not None: + if devid is not None and 'PCI Device ID' not in bdata: bdata['PCI Device ID'] = '{0:04x}'.format(devid) venid = fundata.get(self.ADP_SUBVENID, None) if venid is not None: diff --git a/pyghmi/redfish/oem/lenovo/xcc.py b/pyghmi/redfish/oem/lenovo/xcc.py index e4ec6da4..b142ea2c 100644 --- a/pyghmi/redfish/oem/lenovo/xcc.py +++ b/pyghmi/redfish/oem/lenovo/xcc.py @@ -1709,7 +1709,7 @@ class OEMHandler(generic.OEMHandler): if venid is not None: bdata['PCI Vendor ID'] = '{0:04x}'.format(venid) devid = fundata.get(self.ADP_DEVID, None) - if devid is not None: + if devid is not None and 'PCIE Device ID' not in bdata: bdata['PCI Device ID'] = '{0:04x}'.format(devid) venid = fundata.get(self.ADP_SUBVENID, None) if venid is not None: