From d9982a29c18770db20e53d2bbae5d0220dbd2d67 Mon Sep 17 00:00:00 2001 From: Cyril Levis Date: Mon, 8 Jun 2020 13:03:25 +0200 Subject: [PATCH 1/2] Add missing N/A fallback on DIMM memory --- netbox_agent/lshw.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox_agent/lshw.py b/netbox_agent/lshw.py index 6e11fb7..c7841a1 100644 --- a/netbox_agent/lshw.py +++ b/netbox_agent/lshw.py @@ -129,7 +129,7 @@ class LSHW(): d["id"] = dimm.get("id") d["serial"] = dimm.get("serial", 'N/A') d["vendor"] = dimm.get("vendor", 'N/A') - d["product"] = dimm.get("product") + d["product"] = dimm.get("product", 'N/A') d["size"] = dimm.get("size", 0) / 2 ** 20 / 1024 self.memories.append(d) -- 2.47.1 From 9dedbea47a1f88ca53498f3bc78f677ce501020a Mon Sep 17 00:00:00 2001 From: Cyrinux Date: Mon, 8 Jun 2020 14:16:50 +0200 Subject: [PATCH 2/2] Some fixes that prevent crash on register and update (#128) --- netbox_agent/network.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/netbox_agent/network.py b/netbox_agent/network.py index c635236..8659ee2 100644 --- a/netbox_agent/network.py +++ b/netbox_agent/network.py @@ -438,8 +438,8 @@ class ServerNetwork(Network): self.server = server self.device = self.server.get_netbox_server() self.nb_net = nb.dcim - self.custom_arg = {'device': self.device.id} - self.custom_arg_id = {'device_id': self.device.id} + self.custom_arg = {'device': getattr(self.device, "id", None)} + self.custom_arg_id = {'device_id': getattr(self.device, "id", None)} def get_network_type(self): return 'server' @@ -558,8 +558,8 @@ class VirtualNetwork(Network): self.server = server self.device = self.server.get_netbox_vm() self.nb_net = nb.virtualization - self.custom_arg = {'virtual_machine': self.device.id} - self.custom_arg_id = {'virtual_machine_id': self.device.id} + self.custom_arg = {'virtual_machine': getattr(self.device, "id", None)} + self.custom_arg_id = {'virtual_machine_id': getattr(self.device, "id", None)} dcim_c = nb.virtualization.interfaces.choices() for _choice_type in dcim_c: -- 2.47.1