afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

initial changes towards removing ipaddress and using netaddr

Browse source
This commit is contained in:
Blake Harnden 2020-01-07 14:08:29 -08:00
parent 93ce2a3755
commit f431254e15
10 changed files with 47 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

6
daemon/core/xml/corexmldeployment.py
View file

@ -1,12 +1,12 @@
import os
import socket
import netaddr
from lxml import etree
from core import utils
from core.constants import IP_BIN
from core.emane.nodes import EmaneNet
from core.nodes import ipaddress
from core.nodes.base import CoreNodeBase
@ -56,9 +56,9 @@ def add_emane_interface(host_element, netif, platform_name="p1", transport_name=
def get_address_type(address):
addr, _slash, _prefixlen = address.partition("/")
if ipaddress.is_ipv4_address(addr):
if netaddr.valid_ipv4(addr):
address_type = "IPv4"
elif ipaddress.is_ipv6_address(addr):
elif netaddr.valid_ipv6(addr):
address_type = "IPv6"
else:
raise NotImplementedError