Merge pull request #336 from coreemu/refactoring/remove-ipaddress

Refactoring/remove ipaddress

daemon/core/xml/corexml.py

@@ -8,7 +8,6 @@ from core.emane.nodes import EmaneNet
 from core.emulator.emudata import InterfaceData, LinkOptions, NodeOptions
 from core.emulator.enumerations import NodeTypes
 from core.nodes.base import CoreNetworkBase
-from core.nodes.ipaddress import MacAddress
 from core.nodes.network import CtrlNet
 
 
@@ -48,8 +47,6 @@ def create_interface_data(interface_element):
     interface_id = int(interface_element.get("id"))
     name = interface_element.get("name")
     mac = interface_element.get("mac")
-    if mac:
-        mac = MacAddress.from_string(mac)
     ip4 = interface_element.get("ip4")
     ip4_mask = get_int(interface_element, "ip4_mask")
     ip6 = interface_element.get("ip6")

daemon/core/xml/corexmldeployment.py

@@ -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

daemon/core/xml/emanexml.py

@@ -5,7 +5,6 @@ from tempfile import NamedTemporaryFile
 from lxml import etree
 
 from core import utils
-from core.nodes.ipaddress import MacAddress
 from core.xml import corexml
 
 _hwaddr_prefix = "02:02"
@@ -208,7 +207,7 @@ def build_node_platform_xml(emane_manager, control_net, node, nem_id, platform_x
         node.setnemid(netif, nem_id)
         macstr = _hwaddr_prefix + ":00:00:"
         macstr += f"{(nem_id >> 8) & 0xFF:02X}:{nem_id & 0xFF:02X}"
-        netif.sethwaddr(MacAddress.from_string(macstr))
+        netif.sethwaddr(macstr)
 
         # increment nem id
         nem_id += 1