Hosterra/netbox-agent
Hosterra/netbox-agent
1
0
Fork 0
Code Issues Pull requests Activity

delete device_id support

Browse source
This commit is contained in:
Thomas Davis 2019-08-29 12:54:41 -07:00
commit 82261d2213
1 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
netbox_agent/lshw.py
View file

@ -7,7 +7,7 @@ import json
from pprint import pprint from pprint import pprint
class LSHW(): class LSHW():
def __init__(self, device_id): def __init__(self):
self.hw_info = json.loads(subprocess.check_output(["lshw", "-quiet", "-json"],encoding='utf8')) self.hw_info = json.loads(subprocess.check_output(["lshw", "-quiet", "-json"],encoding='utf8'))
@ -22,7 +22,6 @@ class LSHW():
self.chassis_serial = self.hw_info["serial"] self.chassis_serial = self.hw_info["serial"]
self.motherboard_serial = self.hw_info["children"][0]["serial"] self.motherboard_serial = self.hw_info["children"][0]["serial"]
self.motherboard = self.hw_info["children"][0]["product"] self.motherboard = self.hw_info["children"][0]["product"]
self.device_id = device_id
for k in self.hw_info["children"]: for k in self.hw_info["children"]:
if k["class"] == "power": if k["class"] == "power":
@ -46,7 +45,7 @@ class LSHW():
if j["class"] == "bridge": if j["class"] == "bridge":
self.walk_bridge(j) self.walk_bridge(j)
def get_hw_linux(self, hwclass, device_id): def get_hw_linux(self, hwclass):
if hwclass == "cpu": if hwclass == "cpu":
return self.cpus return self.cpus
if hwclass == "network": if hwclass == "network":
@ -58,7 +57,6 @@ class LSHW():
def find_network(self, obj): def find_network(self, obj):
d = {} d = {}
d["bus info"] = "%s@%s" % ( self.device_id, obj["logicalname"])
d["name"] = obj["logicalname"] d["name"] = obj["logicalname"]
d["macaddress"] = obj["serial"] d["macaddress"] = obj["serial"]
d["serial"] = obj["serial"] d["serial"] = obj["serial"]
@ -72,7 +70,6 @@ class LSHW():
if "children" in obj: if "children" in obj:
for device in obj["children"]: for device in obj["children"]:
d = {} d = {}
d["bus info"] = "%s@%s" % ( self.device_id, device["logicalname"])
d["logicalname"] = device["logicalname"] d["logicalname"] = device["logicalname"]
d["product"] = device["product"] d["product"] = device["product"]
d["serial"] = device["serial"] d["serial"] = device["serial"]
@ -84,7 +81,6 @@ class LSHW():
elif "nvme" in obj["configuration"]["driver"]: elif "nvme" in obj["configuration"]["driver"]:
d = {} d = {}
d["bus info"] = "%s@%s" % ( self.device_id, obj["businfo"])
d["vendor"] = obj["vendor"] d["vendor"] = obj["vendor"]
d["version"] = obj["version"] d["version"] = obj["version"]
d["description"] = obj["description"] d["description"] = obj["description"]
@ -95,7 +91,6 @@ class LSHW():
def find_cpus(self, obj): def find_cpus(self, obj):
pprint(obj) pprint(obj)
c = {} c = {}
c["bus info"] = "%s@%s" % ( self.device_id, obj["businfo"])
c["product"] = obj["product"] c["product"] = obj["product"]
c["vendor"] = obj["vendor"] c["vendor"] = obj["vendor"]
c["description"] = obj["description"] c["description"] = obj["description"]
@ -112,7 +107,6 @@ class LSHW():
continue continue
d = {} d = {}
d["bus info"] = "%s@%s" % ( self.device_id, dimm["slot"])
d["slot"] = dimm["slot"] d["slot"] = dimm["slot"]
d["description"] = dimm["description"] d["description"] = dimm["description"]
d["id"] = dimm["id"] d["id"] = dimm["id"]