From 84a9aca14163b111d2184c201d3f4ce6e77687e2 Mon Sep 17 00:00:00 2001
From: Christophe Simon <geektophe@gmail.com>
Date: Mon, 7 Mar 2022 17:14:00 +0100
Subject: [PATCH] Unnamed network interfaces.

Some interfaces do not have device (logical) name (eth0, for instance), such
as not connected network mezzanine cards in blade servers.

In such situations, the card will be named `unknown[0-9]`.
---
 netbox_agent/lshw.py | 67 +++++++++++++++++++++++---------------------
 setup.py             |  2 +-
 2 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/netbox_agent/lshw.py b/netbox_agent/lshw.py
index e19effc..15ac086 100644
--- a/netbox_agent/lshw.py
+++ b/netbox_agent/lshw.py
@@ -69,15 +69,21 @@ class LSHW():
             return self.memories
 
     def find_network(self, obj):
-        d = {}
-        d["name"] = obj["logicalname"]
-        d["macaddress"] = obj["serial"]
-        d["serial"] = obj["serial"]
-        d["product"] = obj["product"]
-        d["vendor"] = obj["vendor"]
-        d["description"] = obj["description"]
-
-        self.interfaces.append(d)
+        # Some interfaces do not have device (logical) name (eth0, for
+        # instance), such as not connected network mezzanine cards in blade
+        # servers. In such situations, the card will be named `unknown[0-9]`.
+        unkn_intfs = [
+            i for i in self.interfaces if i["name"].startswith("unknown")
+        ]
+        unkn_name = "unknown{}".format(len(unkn_intfs))
+        self.interfaces.append({
+            "name": obj.get("logicalname", unkn_name),
+            "macaddress": obj.get("serial", ""),
+            "serial": obj.get("serial", ""),
+            "product": obj["product"],
+            "vendor": obj["vendor"],
+            "description": obj["description"],
+        })
 
     def find_storage(self, obj):
         if "children" in obj:
@@ -120,13 +126,12 @@ class LSHW():
 
     def find_cpus(self, obj):
         if "product" in obj:
-            c = {}
-            c["product"] = obj["product"]
-            c["vendor"] = obj["vendor"]
-            c["description"] = obj["description"]
-            c["location"] = obj["slot"]
-
-            self.cpus.append(c)
+            self.cpus.append({
+                "product": obj["product"],
+                "vendor": obj["vendor"],
+                "description": obj["description"],
+                "location": obj["slot"],
+            })
 
     def find_memories(self, obj):
         if "children" not in obj:
@@ -137,25 +142,23 @@ class LSHW():
             if "empty" in dimm["description"]:
                 continue
 
-            d = {}
-            d["slot"] = dimm.get("slot")
-            d["description"] = dimm.get("description")
-            d["id"] = dimm.get("id")
-            d["serial"] = dimm.get("serial", 'N/A')
-            d["vendor"] = dimm.get("vendor", 'N/A')
-            d["product"] = dimm.get("product", 'N/A')
-            d["size"] = dimm.get("size", 0) / 2 ** 20 / 1024
-
-            self.memories.append(d)
+            self.memories.append({
+                "slot": dimm.get("slot"),
+                "description": dimm.get("description"),
+                "id": dimm.get("id"),
+                "serial": dimm.get("serial", 'N/A'),
+                "vendor": dimm.get("vendor", 'N/A'),
+                "product": dimm.get("product", 'N/A'),
+                "size": dimm.get("size", 0) / 2 ** 20 / 1024,
+            })
 
     def find_gpus(self, obj):
         if "product" in obj:
-            c = {}
-            c["product"] = obj["product"]
-            c["vendor"] = obj["vendor"]
-            c["description"] = obj["description"]
-
-            self.gpus.append(c)
+            self.gpus.append({
+                "product": obj["product"],
+                "vendor": obj["vendor"],
+                "description": obj["description"],
+            })
 
     def walk_bridge(self, obj):
         if "children" not in obj:
diff --git a/setup.py b/setup.py
index f46a5f9..3233cb1 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ def get_requirements():
 
 setup(
     name='netbox_agent',
-    version='0.7.0',
+    version='0.7.1',
     description='NetBox agent for server',
     long_description=open('README.md', encoding="utf-8").read(),
     long_description_content_type='text/markdown',