addressed review comments

Author: Jaspal Singh

nodescraper/plugins/inband/kernel/kernel_collector.py

@@ -41,11 +41,14 @@ class KernelCollector(InBandDataCollector[KernelDataModel, None]):
     CMD = "sh -c 'uname -a'"
 
     def _parse_kernel_version(self, uname_a: str) -> Optional[str]:
-        """ExtractS the kernel release (`uname -r`) from `uname -a` output.
+        """Extract the kernel release from `uname -a` output.
 
+        Args:
+            uname_a (str): The full output string from the `uname -a` command.
 
-        The kernel_release is normally the 2nd index. If that
-        fails, fall back to a regex looking for a dotted release string.
+        Returns:
+            Optional[str]: The parsed kernel release (e.g., "5.13.0-30-generic")
+            if found, otherwise None.
         """
         if not uname_a:
             return None
@@ -73,7 +76,7 @@ def collect_data(
         """
 
         kernel = None
-        kernel_info = None
+        kernel_info = ""
 
         if self.system_info.os_family == OSFamily.WINDOWS:
             res = self._run_sut_cmd(self.CMD_WINDOWS)
@@ -86,11 +89,16 @@ def collect_data(
             if res.exit_code == 0:
                 if res.stdout:
                     kernel = res.stdout
-                    parts = kernel.split()
-                    if len(parts) == 1:
-                        kernel_info = None
-                    else:
-                        kernel_info = self._parse_kernel_version(kernel)
+                    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
         if res.exit_code != 0:

nodescraper/plugins/inband/kernel/kerneldata.py

@@ -23,11 +23,10 @@
 # SOFTWARE.
 #
 ###############################################################################
-from typing import Optional
 
 from nodescraper.models import DataModel
 
 
 class KernelDataModel(DataModel):
     kernel_version: str
-    kernel_info: Optional[str] = None
+    kernel_info: str

test/unit/plugin/test_kernel_analyzer.py

@@ -35,16 +35,19 @@
 
 @pytest.fixture
 def model_obj():
-    return KernelDataModel(kernel_version="5.13.0-30-generic")
+    return 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",
+    )
 
 
 @pytest.fixture
 def config():
     return {
         "kernel_name": [
-            "5.13.0-30-generic",
-            "5.15.0-31-generic",
-            "5.18.0-32-generic",
+            "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",
+            "Linux MockSystem1 5.15.0-31-generic #39 XYZA Day MonthX 10 24:19:13 IST 2024 x86_64 GNU/Linux",
+            "Linux MockSystem2 5.18.0-32-generic #178 XYZaB Day MonthY 10 15:06:11 PDT 2024 Linux",
         ],
         "invalid": "invalid",
     }
@@ -118,14 +121,14 @@ def test_invalid_kernel_config(system_info, model_obj, config):
 
 
 def test_match_regex(system_info, model_obj):
-    args = KernelAnalyzerArgs(exp_kernel=[r"5.13.\d-\d+-[\w]+"], regex_match=True)
+    args = KernelAnalyzerArgs(exp_kernel=[r".*5\.13\.\d+-\d+-[\w-]+.*"], regex_match=True)
     analyzer = KernelAnalyzer(system_info)
     result = analyzer.analyze_data(model_obj, args)
     assert result.status == ExecutionStatus.OK
 
 
 def test_mismatch_regex(system_info, model_obj):
-    args = KernelAnalyzerArgs(exp_kernel=[r"4.3.\d-\d+-[\w]+"], regex_match=True)
+    args = KernelAnalyzerArgs(exp_kernel=[r".*4\.13\.\d+-\d+-[\w-]+.*"], regex_match=True)
     analyzer = KernelAnalyzer(system_info)
     result = analyzer.analyze_data(model_obj, args)
 

test/unit/plugin/test_kernel_collector.py

@@ -53,22 +53,25 @@ def test_run_windows(collector, conn_mock):
 
     result, data = collector.collect_data()
 
-    assert data == KernelDataModel(kernel_version="10.0.19041.1237")
+    assert data == KernelDataModel(kernel_version="10.0.19041.1237", kernel_info="")
     assert result.status == ExecutionStatus.OK
 
 
 def test_run_linux(collector, conn_mock):
     collector.system_info.os_family = OSFamily.LINUX
     conn_mock.run_command.return_value = CommandArtifact(
         exit_code=0,
-        stdout="5.4.0-88-generic",
+        stdout="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",
         stderr="",
-        command="sh -c 'uname -r'",
+        command="sh -c 'uname -a'",
     )
 
     result, data = collector.collect_data()
 
-    assert data == KernelDataModel(kernel_version="5.4.0-88-generic")
+    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",
+    )
     assert result.status == ExecutionStatus.OK