Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions ras/ras_lsvpd.py
Original file line number Diff line number Diff line change
Expand Up @@ -313,24 +313,30 @@ def test_pci_lsvpd(self):

# Device ID match
sys_pci_id_output = pci.get_pci_id_from_sysfs(pci_addr)
vpd_dev_id = vpd_output['pci_id'][4:]
vpd_dev_id = vpd_output['pci_id'][6:10]
vpd_sdev_id = vpd_output['pci_id'][19:23]
sysfs_dev_id = sys_pci_id_output[5:-10]
sysfs_sdev_id = sys_pci_id_output[15:]
self.log.info("Device ID from sysfs: %s", sysfs_dev_id)
self.log.info("Sub Device ID from sysfs: %s", sysfs_sdev_id)
self.log.info("Device ID from vpd: %s", vpd_dev_id)
if vpd_dev_id == sysfs_sdev_id or vpd_dev_id == sysfs_dev_id:
self.log.info("Sub Device ID from vpd: %s", vpd_sdev_id)
if vpd_sdev_id == sysfs_sdev_id and vpd_dev_id == sysfs_dev_id:
self.log.info("=======>>Device ID Match Success\n\n")
else:
self.log.error("----->>Device ID did not Match\n\n")
error.append(pci_addr + "-> Device_id")

# Subvendor ID Match
sysfs_subvendor_id = sys_pci_id_output[10:-5]
vpd_subvendor_id = vpd_output['pci_id'][:4]
self.log.info("Subvendor ID frm sysfs: %s", sysfs_subvendor_id)
sysfs_vendor_id = sys_pci_id_output[:4]
vpd_subvendor_id = vpd_output['pci_id'][14:18]
vpd_vendor_id = vpd_output['pci_id'][1:5]
self.log.info("Subvendor ID from sysfs: %s", sysfs_subvendor_id)
self.log.info("Vendor ID from sysfs: %s", sysfs_vendor_id)
self.log.info("Subvendor ID from vpd : %s", vpd_subvendor_id)
if sysfs_subvendor_id == vpd_subvendor_id:
self.log.info("Vendor ID from vpd: %s", vpd_vendor_id)
if sysfs_subvendor_id == vpd_subvendor_id and sysfs_vendor_id == vpd_vendor_id:
self.log.info("======>>>Subvendor ID Match Success\n\n")
else:
self.log.error("---->>Subvendor_id Not Matched\n\n")
Expand Down
Loading