Add dynamic detection of SOS “numa” plugin name

Previously, the code used a hard-coded SOS NUMA plugin name (numa1).
However, some distributions do not provide the numa1 plugin and instead use numa.
This commit adds logic to dynamically detect the supported NUMA plugin for the running distribution.
With this change, the correct plugin name (numa1 or numa) is selected automatically at runtime, improving portability across distros.

Signed-off-by: “Samir <“[email protected]”>

Removed unwanted print statements.

Removed unwanted print debug statements.

Signed-off-by: “Samir <“[email protected]”>

Author: “Samir

ras/sosreport.py

@@ -49,6 +49,24 @@ def run_cmd_search(self, cmd, search_str):
             if search_str in line:
                 return line.strip()
 
+    def get_sos_plugin(self):
+        """
+        Here we are trying to fetch the supported numa plugin
+        as per the linux distro.
+        """
+        matched_plugin = ""
+        cmd = "sos report --list-plugins"
+        sos_plugin = self.run_cmd_out(cmd)
+        plain_payload = sos_plugin.split('\n')
+        for plugins in plain_payload:
+            if "numa" in plugins or "numa1" in plugins:
+                match = re.match(r"^(\w+)\s+(.*)$", plugins.strip())
+                if match:
+                    matched_plugin = match.group(1)
+                break
+
+        return matched_plugin
+
     def setUp(self):
         dist = distro.detect()
         sm = SoftwareManager()
@@ -184,6 +202,7 @@ def test_others(self):
         """
         self.log.info(
             "===============Executing sosreport tool test (others)===============")
+        sos_supported_plugin = self.get_sos_plugin()
         directory_name = tempfile.mkdtemp()
         self.is_fail = 0
         self.run_cmd("%s --list-profiles" % self.sos_cmd, None)
@@ -199,13 +218,15 @@ def test_others(self):
 
         dir_name = self.run_cmd_search(
             "%s --batch --tmp-dir=%s --build" % (self.sos_cmd, directory_name), directory_name)
+
         if not os.path.isdir(dir_name):
             self.is_fail += 1
             self.log.info("--build option failed")
 
-        if "version" not in self.run_cmd_out("%s --batch --tmp-dir=%s --quiet "
-                                             "--no-report -e ntp,numa1"
-                                             % (self.sos_cmd, directory_name)):
+        if not self.run_cmd_out("%s --batch --tmp-dir=%s --quiet "
+                                "--no-report -e ntp,%s"
+                                % (self.sos_cmd, directory_name,
+                                   sos_supported_plugin)):
             self.is_fail += 1
             self.log.info("--quiet --no-report option failed")
         self.run_cmd("%s --batch --tmp-dir=%s --debug" %
@@ -223,13 +244,13 @@ def test_others(self):
             self.is_fail += 1
             self.log.info("--no-report option failed")
         if 'powerpc' in cpu.get_arch():
-            file_list = self.params.get('file_list', default=['proc/device-tree/'])
+            file_list = self.params.get(
+                'file_list', default=['proc/device-tree/'])
             for files in file_list:
                 file_path = os.path.join(dir_name, files)
                 if not os.path.exists(file_path):
                     self.is_fail += 1
                     self.log.info("%s file/directory not created" % file_path)
-
         self.run_cmd("%s --batch --tmp-dir=%s -s /" %
                      (self.sos_cmd, directory_name))
 
@@ -270,7 +291,8 @@ def test_archive(self):
 
         if os.path.exists(file_name):
             md5_sum1 = self.run_cmd_out("cat %s.md5" % file_name).strip()
-            md5_sum2 = self.run_cmd_out("md5sum %s" % file_name).strip().split()[0]
+            md5_sum2 = self.run_cmd_out(
+                "md5sum %s" % file_name).strip().split()[0]
             if md5_sum1 != md5_sum2:
                 self.is_fail += 1
                 self.log.info("md5sum check failed")
@@ -390,7 +412,8 @@ def test_fs(self):
         if not mnt:
             mnt = self.workdir
         if 'blockfile' not in self.run_cmd_out("ls /tmp"):
-            blk_dev = process.run("dd if=/dev/zero of=/tmp/blockfile bs=1M count=5120")
+            blk_dev = process.run(
+                "dd if=/dev/zero of=/tmp/blockfile bs=1M count=5120")
             process.run("losetup %s /tmp/blockfile" % loop_dev)
         if fstype == "ext4":
             cmd = "mkfs.%s %s" % (fstype, loop_dev)