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

more ci fixes..

Browse source
This commit is contained in:
Thomas Davis 2019-09-03 15:51:52 -07:00
commit 39842e609f
2 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
netbox_agent/inventory.py
View file

@ -1,3 +1,5 @@
import logging
from netbox_agent.config import netbox_instance as nb, config from netbox_agent.config import netbox_instance as nb, config
from netbox_agent.misc import is_tool from netbox_agent.misc import is_tool
from netbox_agent.raid.hp import HPRaid from netbox_agent.raid.hp import HPRaid

11
netbox_agent/lshw.py
View file

@ -6,7 +6,10 @@ import json
class LSHW(): class LSHW():
def __init__(self): 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')
)
self.info = {} self.info = {}
self.memories = [] self.memories = []
@ -77,8 +80,10 @@ class LSHW():
self.disks.append(d) self.disks.append(d)
elif "nvme" in obj["configuration"]["driver"]: elif "nvme" in obj["configuration"]["driver"]:
nvme = json.loads(subprocess.check_output(["nvme", '-list', '-o', 'json'], nvme = json.loads(
encoding='utf8')) subprocess.check_output(["nvme", '-list', '-o', 'json'],
encoding='utf8')
)
d = {} d = {}
d["vendor"] = obj["vendor"] d["vendor"] = obj["vendor"]