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

Several minor fixes

Browse source 
raid_arry check should return an empty array, not NoneType

not all systems will have IPv6 defined, so try to get the information..  if not
just continue on.

Vendor Supermicro was incomplete.
This commit is contained in:
Thomas Davis 2019-08-27 10:30:04 -07:00
parent 5b7e349aa3
commit 1c3ea69d9e
3 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
netbox_agent/inventory.py
View file

@ -102,7 +102,7 @@ class Inventory():
self.raid = HPRaid() self.raid = HPRaid()
if not self.raid: if not self.raid:
return return []
controllers = self.raid.get_controllers() controllers = self.raid.get_controllers()
if len(self.raid.get_controllers()): if len(self.raid.get_controllers()):

6
netbox_agent/network.py
View file

@ -60,7 +60,11 @@ class Network():
continue continue
ip_addr = netifaces.ifaddresses(interface).get(netifaces.AF_INET) ip_addr = netifaces.ifaddresses(interface).get(netifaces.AF_INET)
ip_addr += netifaces.ifaddresses(interface).get(netifaces.AF_INET6) try:
ip_addr += netifaces.ifaddresses(interface).get(netifaces.AF_INET6)
except:
logging.debug('No IPv6 addresses defined.')
if NETWORK_IGNORE_IPS and ip_addr: if NETWORK_IGNORE_IPS and ip_addr:
for i, ip in enumerate(ip_addr): for i, ip in enumerate(ip_addr):
if re.match(NETWORK_IGNORE_IPS, ip['addr']): if re.match(NETWORK_IGNORE_IPS, ip['addr']):

8
netbox_agent/vendors/supermicro.py vendored
View file

@ -2,8 +2,14 @@ from netbox_agent.server import ServerBase
class SupermicroHost(ServerBase): class SupermicroHost(ServerBase):
def __init__(self, *args, **kwargs):
super(SupermicroHost, self).__init__(*args, **kwargs)
self.manufacturer = 'Supermicro'
def is_blade(self): def is_blade(self):
return self.get_product_name().startswith('SBI') blade = self.get_product_name().startswith('SBI')
blade |= self.get_product_name().startswith('SYS')
return blade
def get_blade_slot(self): def get_blade_slot(self):
# No supermicro on hands # No supermicro on hands