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

fix: dvd-ram should be consider as virtual to be ignore

Browse source
This commit is contained in:
Cyril Levis 2022-08-23 08:55:02 +02:00
commit f4d7796094
No known key found for this signature in database
GPG key ID: 6DB88737C11F5A48
1 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

33
netbox_agent/inventory.py
View file

@ -321,6 +321,7 @@ class Inventory():
'virtual' in product.lower() or \ 'virtual' in product.lower() or \
'logical' in product.lower() or \ 'logical' in product.lower() or \
'volume' in description.lower() or \ 'volume' in description.lower() or \
'dvd-ram' in description.lower() or \
description == 'SCSI Enclosure' or \ description == 'SCSI Enclosure' or \
(size is None and logicalname is None): (size is None and logicalname is None):
return True return True
@ -341,23 +342,21 @@ class Inventory():
for disk in self.lshw.get_hw_linux("storage"): for disk in self.lshw.get_hw_linux("storage"):
if self.is_virtual_disk(disk, raid_devices): if self.is_virtual_disk(disk, raid_devices):
continue continue
size = int(getattr(disk, "size", 0)) size = int(getattr(disk, "size", 0)) / 1073741824
if size > 0: d = {
size /= 1073741824 "name": "",
d = { 'Size': '{} GB'.format(size),
"name": "", 'logicalname': disk.get('logicalname'),
'Size': '{} GB'.format(size), 'description': disk.get('description'),
'logicalname': disk.get('logicalname'), 'SN': disk.get('serial'),
'description': disk.get('description'), 'Model': disk.get('product'),
'SN': disk.get('serial'), 'Type': disk.get('type'),
'Model': disk.get('product'), }
'Type': disk.get('type'), if disk.get('vendor'):
} d['Vendor'] = disk['vendor']
if disk.get('vendor'): else:
d['Vendor'] = disk['vendor'] d['Vendor'] = get_vendor(disk['product'])
else: disks.append(d)
d['Vendor'] = get_vendor(disk['product'])
disks.append(d)
# remove duplicate serials # remove duplicate serials
seen = set() seen = set()