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

Merge branch 'use-choices-api' of github.com:ThomasADavis/netbox_agent into use-choices-api

Browse source
This commit is contained in:
Thomas Davis 2020-01-26 19:23:16 -08:00
commit f7d135232c
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
netbox_agent/network.py
View file

@ -29,7 +29,6 @@ class Network():
for c in dcim_c[choice]: for c in dcim_c[choice]:
self.dcim_choices[choice][c['label']] = c['value'] self.dcim_choices[choice][c['label']] = c['value']
self.ipam_choices = {} self.ipam_choices = {}
ipam_c = nb.ipam.choices() ipam_c = nb.ipam.choices()
@ -38,7 +37,6 @@ class Network():
for c in ipam_c[choice]: for c in ipam_c[choice]:
self.ipam_choices[choice][c['label']] = c['value'] self.ipam_choices[choice][c['label']] = c['value']
def scan(self): def scan(self):
for interface in os.listdir('/sys/class/net/'): for interface in os.listdir('/sys/class/net/'):
# ignore if it's not a link (ie: bonding_masters etc) # ignore if it's not a link (ie: bonding_masters etc)
@ -206,7 +204,7 @@ class Network():
interface.untagged_vlan = None interface.untagged_vlan = None
# if it's a vlan interface # if it's a vlan interface
elif vlan_id and ( elif vlan_id and (
interface.mode is None or interface.mode is None or
interface.mode.value != self.dcim_choices['interface:mode']['Access'] or interface.mode.value != self.dcim_choices['interface:mode']['Access'] or
len(interface.tagged_vlans) != 1 or len(interface.tagged_vlans) != 1 or
interface.tagged_vlans[0].vid != vlan_id): interface.tagged_vlans[0].vid != vlan_id):