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

Add openvpn TUN and TAP interfaces support, change type to Virtual and remove mac address #132

Merged
cyrinux merged 3 commits from tun_tap_support into master 2020-06-14 18:18:14 +02:00
Conversation 0 Commits 3 Files changed 1 +7 -3
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 6d3564389d - Show all commits

10
netbox_agent/network.py
View file

@ -80,6 +80,10 @@ class Network(object):
ip_addr.pop(i)
mac = open('/sys/class/net/{}/address'.format(interface), 'r').read().strip()
# Loopback lo
if mac == '00:00:00:00:00:00':
mac = None
vlan = None
if len(interface.split('.')) > 1:
vlan = int(interface.split('.')[1])
@ -98,7 +102,7 @@ class Network(object):
nic = {
'name': interface,
'mac': mac if mac != '00:00:00:00:00:00' else None,
'mac': mac,
'ip': [
'{}/{}'.format(
x['addr'],
@ -167,7 +171,7 @@ class Network(object):
if nic.get('bonding'):
return self.dcim_choices['interface:type']['Link Aggregation Group (LAG)']
if nic.get('virtual') or nic.get('mac') is None:
if nic.get('virtual'):
return self.dcim_choices['interface:type']['Virtual']
if nic.get('ethtool') is None:
@ -257,7 +261,7 @@ class Network(object):
**self.custom_arg,
}
# Remove mac for virtual
# Remove mac for virtual interface
if nic.get('virtual', False):
del params['mac_address']