Skip to content

Updated regex for slot_ibm to include optional -R\d+ segment. #6246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PraveenPenguin merged 5 commits into from
May 18, 2026
+5 −1
Merged

Updated regex for slot_ibm to include optional -R\d+ segment. #6246

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
af916aa
Updated regex for slot_ibm to include optional -R\d+ segment.
maramsmurthy Nov 27, 2025
d55e440
Added example of return slots formats in doc string
maramsmurthy Mar 3, 2026
1a4aa73
Updated exmples of physical slot formats and added signature to commit
maramsmurthy Mar 3, 2026
916d4f5
Updated exmples of physical slot formats in function description
maramsmurthy Mar 3, 2026
f560230
docs: Fix Sphinx docstring formatting in get_slot_from_sysfs
maramsmurthy Apr 27, 2026
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
6 changes: 5 additions & 1 deletion avocado/utils/pci.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,10 @@ def get_slot_from_sysfs(full_pci_address):

:return: Removed port related details using re, only returns till
physical slot of the adapter.
Examples::

U78CC.001.FZHAK92-P2-C3
U50EE.001.WZS0011-P3-C20-R2
"""
if not os.path.isfile(f"/sys/bus/pci/devices/{full_pci_address}/devspec"):
return None
Expand All @@ -201,7 +205,7 @@ def get_slot_from_sysfs(full_pci_address):
if not os.path.isfile(f"/proc/device-tree/{devspec}/ibm,loc-code"):
return None
slot = genio.read_file(f"/proc/device-tree/{devspec}/ibm,loc-code")
slot_ibm = re.match(r"((\w+)[.])+(\w+)-[PC(\d+)-]*C(\d+)", slot)
slot_ibm = re.match(r"((\w+)[.])+(\w+)-[PC(\d+)-]*C(\d+)(?:-R\d+)?", slot)
if slot_ibm:
return slot_ibm.group()
slot_openpower = re.match(r"(\w+)[\s]*(\w+)(\d*)", slot)
Expand Down
Loading