trustchain-oc1-orchestral/devicehub-teal
Archived
10
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

pass lshw and smart loadeds instead of raw data

Browse source
This commit is contained in:
Cayo Puigdefabregas 2022-03-31 19:44:06 +02:00
parent 7e3904700f
commit 6271c717a3
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ereuse_devicehub/parser/parser.py
View file

@ -316,17 +316,15 @@ class ParseSnapshotLsHw:
def __init__(self, snapshot, default="n/a"): def __init__(self, snapshot, default="n/a"):
self.default = default self.default = default
self.dmidecode_raw = snapshot["data"]["dmidecode"] self.dmidecode_raw = snapshot["data"]["dmidecode"]
self.smart_raw = snapshot["data"]["smart"] self.smart = snapshot["data"]["smart"]
self.hwinfo_raw = snapshot["data"]["hwinfo"] self.hwinfo_raw = snapshot["data"]["hwinfo"]
self.lshw_raw = snapshot["data"]["lshw"] self.lshw = snapshot["data"]["lshw"]
self.device = {"actions": []} self.device = {"actions": []}
self.components = [] self.components = []
self.components_obj = [] self.components_obj = []
self.dmi = DMIParse(self.dmidecode_raw) self.dmi = DMIParse(self.dmidecode_raw)
self.smart = self.loads(self.smart_raw)
self.hwinfo = self.parse_hwinfo() self.hwinfo = self.parse_hwinfo()
self.lshw = self.loads(self.lshw_raw)
self.set_basic_datas() self.set_basic_datas()
self.set_components() self.set_components()
@ -353,7 +351,7 @@ class ParseSnapshotLsHw:
return x return x
def set_basic_datas(self): def set_basic_datas(self):
pc, self.components_obj = Computer.run(self.lshw_raw, self.hwinfo_raw) pc, self.components_obj = Computer.run(self.lshw, self.hwinfo_raw)
self.device = pc.dump() self.device = pc.dump()
self.device['uuid'] = self.dmi.get("System")[0].get("UUID") self.device['uuid'] = self.dmi.get("System")[0].get("UUID")