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

some fixes after test

Browse source
This commit is contained in:
Solvik Blum 2019-08-08 15:09:43 +02:00
parent ab660b4fcf
commit a68bc10f38
No known key found for this signature in database
GPG key ID: CC12B3DC262B6C47
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
netbox_agent/network.py
View file

@ -57,6 +57,11 @@ class Network():
continue continue
else: else:
ip_addr = netifaces.ifaddresses(interface).get(netifaces.AF_INET) ip_addr = netifaces.ifaddresses(interface).get(netifaces.AF_INET)
if NETWORK_IGNORE_IPS and ip_addr:
for i, ip in enumerate(ip_addr):
if re.match(NETWORK_IGNORE_IPS, ip['addr']):
ip_addr.pop(i)
mac = open('/sys/class/net/{}/address'.format(interface), 'r').read().strip() mac = open('/sys/class/net/{}/address'.format(interface), 'r').read().strip()
vlan = None vlan = None
if len(interface.split('.')) > 1: if len(interface.split('.')) > 1:
@ -75,7 +80,7 @@ class Network():
'{}/{}'.format( '{}/{}'.format(
x['addr'], x['addr'],
IPAddress(x['netmask']).netmask_bits() IPAddress(x['netmask']).netmask_bits()
) for x in ip_addr if not re.match(NETWORK_IGNORE_IPS, x['addr']) ) for x in ip_addr
] if ip_addr else None, # FIXME: handle IPv6 addresses ] if ip_addr else None, # FIXME: handle IPv6 addresses
'ethtool': Ethtool(interface).parse(), 'ethtool': Ethtool(interface).parse(),
'vlan': vlan, 'vlan': vlan,
@ -230,7 +235,8 @@ class Network():
interface.mode = None interface.mode = None
type = self.get_netbox_type_for_nic(nic) type = self.get_netbox_type_for_nic(nic)
if type != interface.type.value: if not interface.type or \
type != interface.type.value:
logging.info('Interface type is wrong, resetting') logging.info('Interface type is wrong, resetting')
nic_update = True nic_update = True
interface.type = type interface.type = type
@ -257,13 +263,14 @@ class Network():
logging.info('Created new IP {ip} on {interface}'.format( logging.info('Created new IP {ip} on {interface}'.format(
ip=ip, interface=interface)) ip=ip, interface=interface))
else: else:
if netbox_ip.interface.id != interface.id: if not netbox_ip.interface or \
netbox_ip.interface.id != interface.id:
logging.info( logging.info(
'Detected interface change: old interface is {old_interface} ' 'Detected interface change for ip {ip}: old interface is {old_interface} '
'(id: {old_id}), new interface is {new_interface} (id: {new_id})' '(id: {old_id}), new interface is {new_interface} (id: {new_id})'
.format( .format(
old_interface=netbox_ip.interface, new_interface=interface, old_interface=netbox_ip.interface, new_interface=interface,
old_id=netbox_ip.id, new_id=interface.id old_id=netbox_ip.id, new_id=interface.id, ip=netbox_ip.address
)) ))
netbox_ip.interface = interface netbox_ip.interface = interface
netbox_ip.save() netbox_ip.save()