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

Merge pull request #259 from Solvik/fix/cle/hp-inventory-fix-wait

Browse source 
disk inventory fix and hp improvement
This commit is contained in:
Cyril Levis 2022-12-13 17:28:57 +01:00 committed by GitHub
commit b82dc80fe3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
netbox_agent/inventory.py
View file

@ -371,7 +371,7 @@ class Inventory():
desc = disk.get('description')
name = '{} ({})'.format(disk['Model'], disk['Size'])
description = disk['Type']
sn = getattr(disk, 'SN', 'unknown')
sn = disk.get('SN', 'unknown')
parms = {
'device': self.device_id,

25
netbox_agent/raid/hp.py
View file

@ -18,20 +18,20 @@ def ssacli(sub_command):
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT
)
p.wait()
stdout = p.stdout.read().decode("utf-8")
if p.returncode != 0 and 'does not have any physical' not in stdout:
stdout, stderr = p.communicate()
stdout = stdout.decode("utf-8")
if p.returncode != 0:
mesg = "Failed to execute command '{}':\n{}".format(
" ".join(command), stdout
)
raise HPRaidControllerError(mesg)
if 'does not have any physical' in stdout:
return list()
else:
if 'does not have any physical' in stdout:
return list()
else:
lines = stdout.split('\n')
lines = list(filter(None, lines))
return lines
lines = stdout.split('\n')
lines = list(filter(None, lines))
return lines
def _test_if_valid_line(line):
ignore_patterns = ['Note:', 'Error:', 'is not loaded', 'README', ' failure', ' cache']
@ -172,7 +172,12 @@ class HPRaidController(RaidController):
'Type': 'SSD' if attrs.get('Interface Type') == 'Solid State SATA'
else 'HDD',
'_src': self.__class__.__name__,
'custom_fields': {'pd_identifier': name}
'custom_fields': {
'pd_identifier': name,
'mount_point': attrs['Mount Points'],
'vd_device': attrs['Disk Name'],
'vd_size': attrs['Size'],
}
}
return ret