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

clean up the ipv6 address also by removing the interface information.

Browse source
This commit is contained in:
Thomas Davis 2019-08-28 09:17:17 -07:00
parent ed2754f676
commit d7e4153ca7
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
netbox_agent/network.py
View file

@ -63,13 +63,15 @@ class Network():
ip6_addr = netifaces.ifaddresses(interface).get(netifaces.AF_INET6) ip6_addr = netifaces.ifaddresses(interface).get(netifaces.AF_INET6)
# netifaces returns a ipv6 netmask that netaddr does not understand. # netifaces returns a ipv6 netmask that netaddr does not understand.
# this strips the netmask down to the correct format for netaddr. # this strips the netmask down to the correct format for netaddr, and remove the interface.
# ie, this: # ie, this:
# {'addr': 'fe80::ec4:7aff:fe59:ec4a%eno1.50', 'netmask': 'ffff:ffff:ffff:ffff::/64'} # {'addr': 'fe80::ec4:7aff:fe59:ec4a%eno1.50', 'netmask': 'ffff:ffff:ffff:ffff::/64'}
#
# becomes: # becomes:
# {'addr': 'fe80::ec4:7aff:fe59:ec4a%eno1.50', 'netmask': 'ffff:ffff:ffff:ffff::'} # {'addr': 'fe80::ec4:7aff:fe59:ec4a', 'netmask': 'ffff:ffff:ffff:ffff::'}
# #
for addr in ip6_addr: for addr in ip6_addr:
addr["addr"] = re.sub("\%.*$", "", addr["addr"])
addr["netmask"] = re.sub("/\d+$", "", addr["netmask"]) addr["netmask"] = re.sub("/\d+$", "", addr["netmask"])
ip_addr.append(addr) ip_addr.append(addr)