DGNum/netbox-agent
6
0
Fork 0
Code Issues 28 Pull requests 9 Projects Releases 14 Packages Wiki Activity Actions

Merge pull request #271 from AlexDaichendt/fix-227-lshw

Browse source
This commit is contained in:
Cyril Levis 2023-04-08 12:42:53 +02:00 committed by GitHub
commit 19a158ec82
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
netbox_agent/lshw.py
View file

@ -72,9 +72,17 @@ class LSHW():
# Some interfaces do not have device (logical) name (eth0, for # Some interfaces do not have device (logical) name (eth0, for
# instance), such as not connected network mezzanine cards in blade # instance), such as not connected network mezzanine cards in blade
# servers. In such situations, the card will be named `unknown[0-9]`. # servers. In such situations, the card will be named `unknown[0-9]`.
unkn_intfs = [ unkn_intfs = []
i for i in self.interfaces if i["name"].startswith("unknown") for i in self.interfaces:
] # newer versions of lshw can return a list of names, see issue #227
if not isinstance(i["name"], list):
if i["name"].startswith("unknown"):
unkn_intfs.push(i)
else:
for j in i["name"]:
if j.startswith("unknown"):
unkn_intfs.push(j)
unkn_name = "unknown{}".format(len(unkn_intfs)) unkn_name = "unknown{}".format(len(unkn_intfs))
self.interfaces.append({ self.interfaces.append({
"name": obj.get("logicalname", unkn_name), "name": obj.get("logicalname", unkn_name),