Update hw_diags so it can be used by wk-ddrescue

This commit is contained in:
2Shirt 2018-07-14 21:17:32 -06:00
parent afef5e9052
commit d57b08ec6f
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C

View file

@ -588,19 +588,21 @@ def scan_disks():
TESTS['NVMe/SMART']['Devices'] = devs TESTS['NVMe/SMART']['Devices'] = devs
TESTS['badblocks']['Devices'] = devs TESTS['badblocks']['Devices'] = devs
TESTS['iobenchmark']['Devices'] = devs TESTS['iobenchmark']['Devices'] = devs
return devs
def show_disk_details(dev): def show_disk_details(dev, only_attributes=False):
"""Display disk details.""" """Display disk details."""
dev_name = dev['lsblk']['name'] dev_name = dev['lsblk']['name']
# Device description if not only_attributes:
print_info('Device: /dev/{}'.format(dev['lsblk']['name'])) # Device description
print_standard(' {:>4} ({}) {} {}'.format( print_info('Device: /dev/{}'.format(dev['lsblk']['name']))
str(dev['lsblk'].get('size', '???b')).strip(), print_standard(' {:>4} ({}) {} {}'.format(
str(dev['lsblk'].get('tran', '???')).strip().upper().replace( str(dev['lsblk'].get('size', '???b')).strip(),
'NVME', 'NVMe'), str(dev['lsblk'].get('tran', '???')).strip().upper().replace(
str(dev['lsblk'].get('model', 'Unknown Model')).strip(), 'NVME', 'NVMe'),
str(dev['lsblk'].get('serial', 'Unknown Serial')).strip(), str(dev['lsblk'].get('model', 'Unknown Model')).strip(),
)) str(dev['lsblk'].get('serial', 'Unknown Serial')).strip(),
))
# Warnings # Warnings
if dev.get('NVMe Disk', False): if dev.get('NVMe Disk', False):