Skip to content

Commit 6829e60

Browse files
Merge pull request #78 from amd/alex_pcie_update
PciePlugin update: lspci -vt -> lspci -vvvt
2 parents eff353b + f5f44d3 commit 6829e60

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

nodescraper/plugins/inband/pcie/pcie_collector.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class PcieCollector(InBandDataCollector[PcieDataModel, None]):
6464
6565
This class will collect important PCIe data from the system running the commands
6666
- `lspci -vvv` : Verbose collection of PCIe data
67-
- `lspci -vt`: Tree view of PCIe data
67+
- `lspci -vvvt`: Verbose tree view of PCIe data
6868
- `lspci -PP`: Path view of PCIe data for the GPUs
6969
- If system interaction level is set to STANDARD or higher, the following commands will be run with sudo:
7070
- `lspci -xxxx`: Hex view of PCIe data for the GPUs
@@ -83,7 +83,7 @@ class PcieCollector(InBandDataCollector[PcieDataModel, None]):
8383
DATA_MODEL = PcieDataModel
8484

8585
CMD_LSPCI_VERBOSE = "lspci -vvv"
86-
CMD_LSPCI_TREE = "lspci -vt"
86+
CMD_LSPCI_VERBOSE_TREE = "lspci -vvvt"
8787
CMD_LSPCI_PATH = "lspci -PP"
8888
CMD_LSPCI_HEX_SUDO = "lspci -xxxx"
8989
CMD_LSPCI_HEX = "lspci -x"
@@ -142,8 +142,8 @@ def show_lspci_verbose(self, sudo=True) -> Optional[str]:
142142
return self._run_os_cmd(self.CMD_LSPCI_VERBOSE, sudo=sudo)
143143

144144
def show_lspci_verbose_tree(self, sudo=True) -> Optional[str]:
145-
"""Show lspci with -vt."""
146-
return self._run_os_cmd(self.CMD_LSPCI_TREE, sudo=sudo)
145+
"""Show lspci with -vvvt (verbose tree view)."""
146+
return self._run_os_cmd(self.CMD_LSPCI_VERBOSE_TREE, sudo=sudo)
147147

148148
def show_lspci_path(self, sudo=True) -> Optional[str]:
149149
"""Show lspci with -PP."""
@@ -548,13 +548,13 @@ def _log_pcie_artifacts(
548548
self,
549549
lspci_pp: Optional[str],
550550
lspci_hex: Optional[str],
551-
lspci_tree: Optional[str],
551+
lspci_verbose_tree: Optional[str],
552552
lspci_verbose: Optional[str],
553553
):
554554
"""Log the file artifacts for the PCIe data collector."""
555555
name_log_map = {
556556
"lspci_hex.txt": lspci_hex,
557-
"lspci_tree.txt": lspci_tree,
557+
"lspci_verbose_tree.txt": lspci_verbose_tree,
558558
"lspci_verbose.txt": lspci_verbose,
559559
"lspci_pp.txt": lspci_pp,
560560
}
@@ -629,7 +629,7 @@ def _get_pcie_data(
629629
self._log_pcie_artifacts(
630630
lspci_pp=lspci_path,
631631
lspci_hex=lspci_hex,
632-
lspci_tree=lspci_verbose_tree,
632+
lspci_verbose_tree=lspci_verbose_tree,
633633
lspci_verbose=lspci_verbose,
634634
)
635635
pcie_data = PcieDataModel(

0 commit comments

Comments
 (0)