11 Jan
2019
11 Jan
'19
9:30 a.m.
Module: check_mk
Branch: master
Commit: 55f929b521fd8f82a34c73c48fbb269975523618
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55f929b521fd8f…
Author: Moritz Kiemer <mo(a)mathias-kettner.de>
Date: Fri Jan 11 13:49:14 2019 +0100
prtconf: remove for loop and switch to new signature
Change-Id: I951381de13cae3543ec9a68a124e440c66dccbef
---
inventory/prtconf | 93 +++++++++++++++++++++++++++++--------------------------
1 file changed, 49 insertions(+), 44 deletions(-)
diff --git a/inventory/prtconf b/inventory/prtconf
index e94618b..960e32d 100644
--- a/inventory/prtconf
+++ b/inventory/prtconf
@@ -64,52 +64,57 @@ def parse_prtconf(info):
return parsed
-def inv_prtconf(info):
+def inv_prtconf(info, inventory_tree):
parsed = parse_prtconf(info)
- cpu_dict = inv_tree("hardware.cpu.")
-
- for varname, value in parsed.items():
- if varname == "CPU Type":
- if value == "64-bit":
- arch = "ppc64"
- else:
- arch = "ppc"
- cpu_dict["arch"] = arch
-
- elif varname == "Kernel Type":
- if value == "64-bit":
- arch = "ppc64"
- else:
- arch = "ppc"
- inv_tree("software.os.")["arch"] = arch
-
- elif varname == "Processor Type":
- cpu_dict["model"] = value
-
- elif varname == "Processor Clock Speed":
- cpu_dict["max_speed"] = float(value.split()[0]) * 1000 * 1000
-
- elif varname == "Number Of Processors":
- cpu_dict.setdefault("cpus", int(value))
-
- elif varname == "Firmware Version":
- inv_tree("hardware.bios.")["version"] = value
- if value.startswith("IBM"):
- inv_tree("hardware.bios.")["vendor"] =
"IBM"
- inv_tree("hardware.system.")["manufacturer"] =
"IBM"
-
- elif varname == "Machine Serial Number":
- inv_tree("hardware.system.")["serial"] = value
-
- elif varname == "System Model":
- inv_tree("hardware.system.")["product"] = value
-
- elif varname == "Memory Size":
- inv_tree("hardware.memory.")["total_ram_usable"] =
int(value.split()[0]) * 1024 * 1024
-
- elif varname == "Total Paging Space":
- inv_tree("hardware.memory.")["total_swap"] =
int(value.replace("MB", "")) * 1024 * 1024
+ cpu_dict = inventory_tree.get_dict("hardware.cpu.")
+ sys_dict = inventory_tree.get_dict("hardware.system.")
+ mem_dict = inventory_tree.get_dict("hardware.memory.")
+
+ cpu_type = parsed.get("CPU Type")
+ if cpu_type is not None:
+ cpu_dict["arch"] = "ppc64" if cpu_type == "64-bit"
else "ppc"
+
+ kernel_type = parsed.get("Kernel Type")
+ if kernel_type is not None:
+ os_dict = inventory_tree.get_dict("software.os.")
+ os_dict["arch"] = "ppc64" if kernel_type ==
"64-bit" else "ppc"
+
+ proc_type = parsed.get("Processor Type")
+ if proc_type is not None:
+ cpu_dict["model"] = proc_type
+
+ max_speed = parsed.get("Processor Clock Speed")
+ if max_speed is not None:
+ cpu_dict["max_speed"] = float(max_speed.split()[0]) * 1000 * 1000
+
+ num_cpu = parsed.get("Number Of Processors")
+ if num_cpu is not None:
+ cpu_dict.setdefault("cpus", int(num_cpu))
+
+ fw_version = parsed.get("Firmware Version")
+ if fw_version is not None:
+ bios_dict = inventory_tree.get_dict("hardware.bios.")
+ bios_dict["version"] = fw_version
+ if fw_version.startswith("IBM"):
+ bios_dict["vendor"] = "IBM"
+ sys_dict["manufacturer"] = "IBM"
+
+ serial = parsed.get("Machine Serial Number")
+ if serial is not None:
+ sys_dict["serial"] = serial
+
+ product = parsed.get("System Model")
+ if product is not None:
+ sys_dict["product"] = product
+
+ ram = parsed.get("Memory Size")
+ if ram is not None:
+ mem_dict["total_ram_usable"] = int(ram.split()[0]) * 1024 * 1024
+
+ swap = parsed.get("Total Paging Space")
+ if swap is not None:
+ mem_dict["total_swap"] = int(swap.replace("MB",
"")) * 1024 * 1024
inv_info['prtconf'] = {