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

Open
maramsmurthy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion avocado/utils/pci.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,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