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

handle multiple vlans in lldp (#66)

Browse source
This commit is contained in:
Solvik 2019-09-09 15:32:14 +02:00 committed by GitHub
parent fb68907efd
commit f68fed18b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
netbox_agent/lldp.py
View file

@ -8,18 +8,35 @@ class LLDP():
def parse(self): def parse(self):
output_dict = {} output_dict = {}
vlans = {}
vid = None
for entry in self.output.splitlines(): for entry in self.output.splitlines():
if '=' not in entry: if '=' not in entry:
continue continue
path, value = entry.strip().split("=", 1) path, value = entry.strip().split("=", 1)
path = path.split(".") split_path = path.split(".")
path_components, final = path[:-1], path[-1] interface = split_path[1]
path_components, final = split_path[:-1], split_path[-1]
current_dict = output_dict current_dict = output_dict
if vlans.get(interface) is None:
vlans[interface] = {}
for path_component in path_components: for path_component in path_components:
current_dict[path_component] = current_dict.get(path_component, {}) current_dict[path_component] = current_dict.get(path_component, {})
current_dict = current_dict[path_component] current_dict = current_dict[path_component]
current_dict[final] = value if 'vlan-id' in path:
vid = value
vlans[interface][value] = vlans[interface].get(vid, {})
elif path.endswith('vlan'):
vid = value.replace('vlan-', '')
vlans[interface][vid] = vlans[interface].get(vid, {})
elif 'pvid' in path:
vlans[interface][vid]['pvid'] = True
if 'vlan' not in path:
current_dict[final] = value
for interface, vlan in vlans.items():
output_dict['lldp'][interface]['vlan'] = vlan
return output_dict return output_dict
def get_switch_ip(self, interface): def get_switch_ip(self, interface):
@ -38,11 +55,4 @@ class LLDP():
# lldp.eth0.vlan.vlan-id=296 # lldp.eth0.vlan.vlan-id=296
if self.data['lldp'].get(interface) is None: if self.data['lldp'].get(interface) is None:
return None return None
return self.data['lldp'][interface]['vlan']
lldp = self.data['lldp'][interface]
if lldp.get('vlan'):
if type(lldp['vlan']) is str:
return int(lldp['vlan'].replace('vlan-', ''))
elif lldp['vlan'].get('vlan-id'):
return int(lldp['vlan'].get('vlan-id'))
return None

37
netbox_agent/network.py
View file

@ -224,17 +224,20 @@ class Network():
interface.mode = 200 interface.mode = 200
interface.tagged_vlans = [nb_vlan] if nb_vlan else [] interface.tagged_vlans = [nb_vlan] if nb_vlan else []
interface.untagged_vlan = None interface.untagged_vlan = None
# if lldp reports a vlan-id # if lldp reports a vlan-id with pvid
elif lldp_vlan and ( elif lldp_vlan:
interface.mode is None or interface.mode.value != 100 or pvid_vlan = [key for (key, value) in lldp_vlan.items() if value['pvid']]
interface.untagged_vlan is None or if len(pvid_vlan) > 0 and (
interface.untagged_vlan.vid != lldp_vlan): interface.mode is None or
logging.info('Resetting access VLAN on interface {interface}'.format( interface.mode.value != 100 or
interface=interface)) interface.untagged_vlan is None or
update = True interface.untagged_vlan.vid != int(pvid_vlan[0])):
nb_vlan = self.get_or_create_vlan(lldp_vlan) logging.info('Resetting access VLAN on interface {interface}'.format(
interface.mode = 100 interface=interface))
interface.untagged_vlan = nb_vlan.id update = True
nb_vlan = self.get_or_create_vlan(pvid_vlan[0])
interface.mode = 100
interface.untagged_vlan = nb_vlan.id
return update, interface return update, interface
def create_or_update_ipmi(self): def create_or_update_ipmi(self):
@ -295,10 +298,14 @@ class Network():
interface.save() interface.save()
elif config.network.lldp and self.lldp.get_switch_vlan(nic['name']) is not None: elif config.network.lldp and self.lldp.get_switch_vlan(nic['name']) is not None:
# if lldp reports a vlan on an interface, tag the interface in access and set the vlan # if lldp reports a vlan on an interface, tag the interface in access and set the vlan
vlan_id = self.lldp.get_switch_vlan(nic['name']) # report only the interface which has `pvid=yes` (ie: lldp.eth3.vlan.pvid=yes)
nb_vlan = self.get_or_create_vlan(vlan_id) # if pvid is not present, it'll be processed as a vlan tagged interface
interface.mode = 100 vlans = self.lldp.get_switch_vlan(nic['name'])
interface.untagged_vlan = nb_vlan.id for vid, vlan_infos in vlans.items():
nb_vlan = self.get_or_create_vlan(vid)
if vlan_infos.get('vid'):
interface.mode = 100
interface.untagged_vlan = nb_vlan.id
interface.save() interface.save()
# cable the interface # cable the interface