Skip to content

Commit dcba123

Browse files
Jaspal SinghJaspal Singh
authored andcommitted
failure fixes
1 parent 3714efe commit dcba123

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

nodescraper/plugins/inband/kernel/kernel_collector.py

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ def collect_data(
7373
"""
7474

7575
kernel = None
76+
kernel_info = None
77+
7678
if self.system_info.os_family == OSFamily.WINDOWS:
7779
res = self._run_sut_cmd(self.CMD_WINDOWS)
7880
if res.exit_code == 0:
@@ -82,9 +84,15 @@ def collect_data(
8284
else:
8385
res = self._run_sut_cmd(self.CMD)
8486
if res.exit_code == 0:
85-
kernel = res.stdout
86-
kernel_version = self._parse_kernel_version(kernel)
87-
87+
if res.stdout:
88+
kernel = res.stdout
89+
parts = kernel.split()
90+
if len(parts) == 1:
91+
kernel_info = None
92+
else:
93+
kernel_info = self._parse_kernel_version(kernel)
94+
else:
95+
kernel = None
8896
if res.exit_code != 0:
8997
self._log_event(
9098
category=EventCategory.OS,
@@ -95,7 +103,8 @@ def collect_data(
95103
)
96104

97105
if kernel:
98-
kernel_data = KernelDataModel(kernel_info=kernel, kernel_version=kernel_version)
106+
107+
kernel_data = KernelDataModel(kernel_version=kernel, kernel_info=kernel_info)
99108
self._log_event(
100109
category="KERNEL_READ",
101110
description="Kernel version read",

nodescraper/plugins/inband/kernel/kerneldata.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@
2929

3030

3131
class KernelDataModel(DataModel):
32-
kernel_info: str
33-
kernel_version: Optional[str] = None
32+
kernel_version: str
33+
kernel_info: Optional[str] = None

0 commit comments

Comments
 (0)