From 07a628ada5834d683530af399073bfda29540f19 Mon Sep 17 00:00:00 2001 From: Shay Drory Date: Mon, 3 Feb 2025 11:21:34 +0200 Subject: [PATCH] Fix rdma plugin package Also, use mlnx-iproute2 when available Signed-off-by: Shay Drory --- sos/report/plugins/rdma.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sos/report/plugins/rdma.py b/sos/report/plugins/rdma.py index 21bf2e875..48cd238ab 100644 --- a/sos/report/plugins/rdma.py +++ b/sos/report/plugins/rdma.py @@ -17,7 +17,7 @@ class Rdma(Plugin, IndependentPlugin): plugin_name = "rdma" profiles = ('hardware',) - packages = ('iproute2',) + packages = ('iproute2', 'iproute', 'mlnx-iproute2') def setup(self): @@ -38,7 +38,10 @@ def setup(self): "srq" ] - self.add_cmd_output([f"rdma {cmd} -d" for cmd in rdma_cmds]) + rdma = '/opt/mellanox/iproute2/sbin/rdma' + if not self.path_exists(rdma): + rdma = 'rdma' + self.add_cmd_output([f"{rdma} {cmd} -d" for cmd in rdma_cmds]) - self.add_cmd_output([f"rdma resource show {rsc} -d" + self.add_cmd_output([f"{rdma} resource show {rsc} -d" for rsc in rdma_rsc_obj])