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

use lshw for inventory #58

Merged
ThomasADavis merged 15 commits from lshw-inventory into master 2019-09-05 15:13:37 +02:00
Conversation 3 Commits 15 Files changed 8 +13 -16
2 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 88387a595c - Show all commits

2
netbox_agent/inventory.py
View file

@ -86,7 +86,7 @@ class Inventory():
device_id=device_id, device_id=device_id,
tag=tag tag=tag
) )
except: except BaseException:
logging.info('Tag {tag} is missing, returning empty array.'.format(tag=tag)) logging.info('Tag {tag} is missing, returning empty array.'.format(tag=tag))
items = [] items = []

7
netbox_agent/lshw.py
View file

@ -1,5 +1,4 @@
import subprocess import subprocess
import getpass
import json import json
@ -8,8 +7,7 @@ class LSHW():
self.hw_info = json.loads( self.hw_info = json.loads(
subprocess.check_output(["lshw", "-quiet", "-json"], subprocess.check_output(["lshw", "-quiet", "-json"],
encoding='utf8') encoding='utf8')) # noqa: E128
)
self.info = {} self.info = {}
self.memories = [] self.memories = []
@ -82,8 +80,7 @@ class LSHW():
elif "nvme" in obj["configuration"]["driver"]: elif "nvme" in obj["configuration"]["driver"]:
nvme = json.loads( nvme = json.loads(
subprocess.check_output(["nvme", '-list', '-o', 'json'], subprocess.check_output(["nvme", '-list', '-o', 'json'],
encoding='utf8') encoding='utf8')) # noqa: E128
)
d = {} d = {}
d["vendor"] = obj["vendor"] d["vendor"] = obj["vendor"]