Merge branch 'alex_nvme' into alex_filemodel

Author: alexandraBara

nodescraper/cli/cli.py

@@ -437,7 +437,10 @@ def main(arg_input: Optional[list[str]] = None):
 
         if parsed_args.reference_config:
             ref_config = generate_reference_config(results, plugin_reg, logger)
-            path = os.path.join(os.getcwd(), "reference_config.json")
+            if log_path:
+                path = os.path.join(log_path, "reference_config.json")
+            else:
+                path = os.path.join(os.getcwd(), "reference_config.json")
             try:
                 with open(path, "w") as f:
                     json.dump(

nodescraper/pluginexecutor.py

@@ -243,16 +243,26 @@ def apply_global_args_to_plugin(
             else:
                 run_args[key] = global_args[key]
 
-        if "collection_args" in global_args and hasattr(plugin_class, "COLLECTOR_ARGS"):
-            plugin_fields = set(plugin_class.COLLECTOR_ARGS.__fields__.keys())
+        if (
+            "collection_args" in global_args
+            and hasattr(plugin_class, "COLLECTOR_ARGS")
+            and plugin_class.COLLECTOR_ARGS is not None
+        ):
+
+            plugin_fields = set(plugin_class.COLLECTOR_ARGS.model_fields.keys())
             filtered = {
                 k: v for k, v in global_args["collection_args"].items() if k in plugin_fields
             }
             if filtered:
                 run_args["collection_args"] = filtered
 
-        if "analysis_args" in global_args and hasattr(plugin_class, "ANALYZER_ARGS"):
-            plugin_fields = set(plugin_class.ANALYZER_ARGS.__fields__.keys())
+        if (
+            "analysis_args" in global_args
+            and hasattr(plugin_class, "ANALYZER_ARGS")
+            and plugin_class.ANALYZER_ARGS is not None
+        ):
+
+            plugin_fields = set(plugin_class.ANALYZER_ARGS.model_fields.keys())
             filtered = {k: v for k, v in global_args["analysis_args"].items() if k in plugin_fields}
             if filtered:
                 run_args["analysis_args"] = filtered

nodescraper/plugins/inband/nvme/nvme_collector.py

@@ -25,6 +25,7 @@
 ###############################################################################
 import os
 import re
+import traceback
 
 from pydantic import ValidationError
 
@@ -107,11 +108,11 @@ def collect_data(
         if all_device_data:
             try:
                 nvme_data = NvmeDataModel(devices=all_device_data)
-            except ValidationError as e:
+            except ValidationError as exp:
                 self._log_event(
                     category=EventCategory.SW_DRIVER,
                     description="Validation error while building NvmeDataModel",
-                    data={"error": str(e)},
+                    data={"errors": traceback.format_tb(exp.__traceback__)},
                     priority=EventPriority.ERROR,
                 )
                 self.result.message = "NVMe data invalid format"
@@ -139,9 +140,19 @@ def collect_data(
 
     def _get_nvme_devices(self) -> list[str]:
         nvme_devs = []
-        for entry in os.listdir("/dev"):
-            full_path = os.path.join("/dev", entry)
 
-            if re.fullmatch(r"nvme\d+$", entry) and os.path.exists(full_path):
-                nvme_devs.append(full_path)
+        res = self._run_sut_cmd("ls /dev", sudo=False)
+        if res.exit_code != 0:
+            self._log_event(
+                category=EventCategory.SW_DRIVER,
+                description="Failed to list /dev directory",
+                data={"exit_code": res.exit_code, "stderr": res.stderr},
+                priority=EventPriority.ERROR,
+            )
+            return []
+
+        for entry in res.stdout.strip().splitlines():
+            if re.fullmatch(r"nvme\d+$", entry):
+                nvme_devs.append(f"/dev/{entry}")
+
         return nvme_devs

test/unit/plugin/test_nvme_collector.py

@@ -107,3 +107,12 @@ def test_no_data_collected(collector):
         call.kwargs["priority"] == EventPriority.ERROR
         for call in collector._log_event.call_args_list
     )
+
+
+def test_get_nvme_devices_filters_partitions(collector):
+    fake_ls_output = "\n".join(["nvme0", "nvme0n1", "nvme1", "nvme1n1", "sda", "loop0", "nvme2"])
+    collector._run_sut_cmd.return_value = MagicMock(exit_code=0, stdout=fake_ls_output)
+
+    devices = collector._get_nvme_devices()
+
+    assert devices == ["/dev/nvme0", "/dev/nvme1", "/dev/nvme2"]