variable fixes and output handling

Author: Jaspal Singh

nodescraper/plugins/inband/kernel/kernel_collector.py

@@ -76,31 +76,28 @@ def collect_data(
         """
 
         kernel = None
-        kernel_info = ""
+        kernel_info = None
 
         if self.system_info.os_family == OSFamily.WINDOWS:
             res = self._run_sut_cmd(self.CMD_WINDOWS)
             if res.exit_code == 0:
-                kernel = [line for line in res.stdout.splitlines() if "Version=" in line][0].split(
-                    "="
-                )[1]
+                kernel_info = [line for line in res.stdout.splitlines() if "Version=" in line][
+                    0
+                ].split("=")[1]
         else:
             res = self._run_sut_cmd(self.CMD)
             if res.exit_code == 0:
-                if res.stdout:
-                    kernel = res.stdout
-                    parsed_info = self._parse_kernel_version(kernel)
-                    kernel_info = parsed_info if parsed_info is not None else ""
-                    if not kernel_info:
-                        self._log_event(
-                            category=EventCategory.OS,
-                            description="Could not extract kernel version from 'uname -a'",
-                            data={"command": res.command, "exit_code": res.exit_code},
-                            priority=EventPriority.ERROR,
-                            console_log=True,
-                        )
-                else:
-                    kernel = None
+                kernel_info = res.stdout
+                kernel = self._parse_kernel_version(kernel_info)
+                if not kernel:
+                    self._log_event(
+                        category=EventCategory.OS,
+                        description="Could not extract kernel version from 'uname -a'",
+                        data={"command": res.command, "exit_code": res.exit_code},
+                        priority=EventPriority.ERROR,
+                        console_log=True,
+                    )
+
         if res.exit_code != 0:
             self._log_event(
                 category=EventCategory.OS,
@@ -110,9 +107,9 @@ def collect_data(
                 console_log=True,
             )
 
-        if kernel:
+        if kernel_info:
 
-            kernel_data = KernelDataModel(kernel_version=kernel, kernel_info=kernel_info)
+            kernel_data = KernelDataModel(kernel_info=kernel_info, kernel_version=kernel)
             self._log_event(
                 category="KERNEL_READ",
                 description="Kernel version read",
@@ -122,6 +119,10 @@ def collect_data(
         else:
             kernel_data = None
 
-        self.result.message = f"Kernel: {kernel}" if kernel else "Kernel not found"
-        self.result.status = ExecutionStatus.OK if kernel else ExecutionStatus.ERROR
+        self.result.message = (
+            "Kernel not found"
+            if not kernel_info
+            else f"Kernel info: {kernel_info} | Kernel version: {kernel if kernel else 'Kernel version not found'}"
+        )
+        self.result.status = ExecutionStatus.OK if kernel_info else ExecutionStatus.ERROR
         return self.result, kernel_data

nodescraper/plugins/inband/kernel/kerneldata.py

@@ -28,5 +28,5 @@
 
 
 class KernelDataModel(DataModel):
-    kernel_version: str
     kernel_info: str
+    kernel_version: str | None = None

test/unit/plugin/test_kernel_collector.py

@@ -53,7 +53,7 @@ def test_run_windows(collector, conn_mock):
 
     result, data = collector.collect_data()
 
-    assert data == KernelDataModel(kernel_version="10.0.19041.1237", kernel_info="")
+    assert data == KernelDataModel(kernel_info="10.0.19041.1237", kernel_version=None)
     assert result.status == ExecutionStatus.OK
 
 
@@ -69,8 +69,8 @@ def test_run_linux(collector, conn_mock):
     result, data = collector.collect_data()
 
     assert data == KernelDataModel(
-        kernel_version="Linux MockSystem 5.13.0-30-generic #1 XYZ Day Month 10 15:19:13 EDT 2024 x86_64 x86_64 x86_64 GNU/Linux",
-        kernel_info="5.13.0-30-generic",
+        kernel_info="Linux MockSystem 5.13.0-30-generic #1 XYZ Day Month 10 15:19:13 EDT 2024 x86_64 x86_64 x86_64 GNU/Linux",
+        kernel_version="5.13.0-30-generic",
     )
     assert result.status == ExecutionStatus.OK