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

fix smartctl bugs

Browse source
This commit is contained in:
Cayo Puigdefabregas 2022-04-18 17:14:26 +02:00
parent 093e78d2c8
commit 252c7b8d7d
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
ereuse_devicehub/parser/parser.py
View file

@ -120,7 +120,11 @@ class ParseSnapshot:
def get_usb_num(self):
return len(
[u for u in self.dmi.get("Port Connector") if u.get("Port Type") == "USB"]
[
u
for u in self.dmi.get("Port Connector")
if "USB" in u.get("Port Type", "").upper()
]
)
def get_serial_num(self):
@ -128,7 +132,7 @@ class ParseSnapshot:
[
u
for u in self.dmi.get("Port Connector")
if u.get("Port Type") == "SERIAL"
if "SERIAL" in u.get("Port Type", "").upper()
]
)
@ -137,7 +141,7 @@ class ParseSnapshot:
[
u
for u in self.dmi.get("Port Connector")
if u.get("Port Type") == "PCMCIA"
if "PCMCIA" in u.get("Port Type", "").upper()
]
)
@ -461,6 +465,8 @@ class ParseSnapshotLsHw:
def get_data_storage(self):
for sm in self.smart:
if sm.get('smartctl', {}).get('exit_status') != 0:
continue
model = sm.get('model_name')
manufacturer = None
if model and len(model.split(" ")) > 1:
@ -487,7 +493,7 @@ class ParseSnapshotLsHw:
SSD = 'SolidStateDrive'
HDD = 'HardDrive'
type_dev = x.get('device', {}).get('type')
trim = x.get("trim", {}).get("supported") == "true"
trim = x.get('trim', {}).get("supported") in [True, "true"]
return SSD if type_dev in SSDS or trim else HDD
def get_data_storage_interface(self, x):
@ -503,15 +509,14 @@ class ParseSnapshotLsHw:
return "ATA"
def get_data_storage_size(self, x):
type_dev = x.get('device', {}).get('protocol', '').lower()
total_capacity = "{type}_total_capacity".format(type=type_dev)
if not x.get(total_capacity):
total_capacity = x.get('user_capacity', {}).get('bytes')
if not total_capacity:
return 1
# convert bytes to Mb
return x.get(total_capacity) / 1024**2
return total_capacity / 1024**2
def get_test_data_storage(self, smart):
log = "smart_health_information_log"
hours = smart.get("power_on_time", {}).get('hours', 0)
action = {
"status": "Completed without error",
"reallocatedSectorCount": smart.get("reallocated_sector_count", 0),
@ -519,7 +524,8 @@ class ParseSnapshotLsHw:
"assessment": True,
"severity": "Info",
"offlineUncorrectable": smart.get("offline_uncorrectable", 0),
"lifetime": 0,
"lifetime": hours,
"powerOnHours": hours,
"type": "TestDataStorage",
"length": "Short",
"elapsed": 0,
@ -529,11 +535,6 @@ class ParseSnapshotLsHw:
"powerCycleCount": smart.get("power_cycle_count", 0),
}
for k in smart.keys():
if log in k:
action['lifetime'] = smart[k].get("power_on_hours", 0)
action['powerOnHours'] = smart[k].get("power_on_hours", 0)
return action
def errors(self, txt=None, severity=Severity.Info):