changes to replaces known usages of ipaddress, leaving only ipaddress.MacAddress

daemon/core/emulator/distributed.py

@@ -8,13 +8,13 @@ import threading
 from collections import OrderedDict
 from tempfile import NamedTemporaryFile
 
+import netaddr
 from fabric import Connection
 from invoke import UnexpectedExit
 
 from core import utils
 from core.errors import CoreCommandError
 from core.nodes.interface import GreTap
-from core.nodes.ipaddress import IpAddress
 from core.nodes.network import CoreNetwork, CtrlNet
 
 LOCK = threading.Lock()
@@ -196,7 +196,7 @@ class DistributedController:
         :rtype: tuple
         """
         host = server.host
-        key = self.tunnel_key(node.id, IpAddress.to_int(host))
+        key = self.tunnel_key(node.id, netaddr.IPAddress(host).value)
         tunnel = self.tunnels.get(key)
         if tunnel is not None:
             return tunnel

daemon/core/emulator/emudata.py

@@ -1,6 +1,8 @@
+import netaddr
+
 from core.emane.nodes import EmaneNet
 from core.emulator.enumerations import LinkTypes
-from core.nodes.ipaddress import Ipv4Prefix, Ipv6Prefix, MacAddress
+from core.nodes.ipaddress import MacAddress
 from core.nodes.physical import PhysicalNode
 
 
@@ -164,10 +166,10 @@ class IpPrefixes:
 
         self.ip4 = None
         if ip4_prefix:
-            self.ip4 = Ipv4Prefix(ip4_prefix)
+            self.ip4 = netaddr.IPNetwork(ip4_prefix)
         self.ip6 = None
         if ip6_prefix:
-            self.ip6 = Ipv6Prefix(ip6_prefix)
+            self.ip6 = netaddr.IPNetwork(ip6_prefix)
 
     def ip4_address(self, node):
         """
@@ -179,7 +181,7 @@ class IpPrefixes:
         """
         if not self.ip4:
             raise ValueError("ip4 prefixes have not been set")
-        return str(self.ip4.addr(node.id))
+        return str(self.ip4[node.id])
 
     def ip6_address(self, node):
         """
@@ -191,7 +193,7 @@ class IpPrefixes:
         """
         if not self.ip6:
             raise ValueError("ip6 prefixes have not been set")
-        return str(self.ip6.addr(node.id))
+        return str(self.ip6[node.id])
 
     def create_interface(self, node, name=None, mac=None):
         """
@@ -212,14 +214,14 @@ class IpPrefixes:
         ip4 = None
         ip4_mask = None
         if self.ip4:
-            ip4 = str(self.ip4.addr(node.id))
+            ip4 = self.ip4_address(node)
             ip4_mask = self.ip4.prefixlen
 
         # generate ip6 data
         ip6 = None
         ip6_mask = None
         if self.ip6:
-            ip6 = str(self.ip6.addr(node.id))
+            ip6 = self.ip6_address(node)
             ip6_mask = self.ip6.prefixlen
 
         # random mac

daemon/core/emulator/session.py

@@ -1764,7 +1764,7 @@ class Session:
         control_ip = node.id
 
         try:
-            address = control_net.prefix.addr(control_ip)
+            address = control_net.prefix[control_ip]
             prefix = control_net.prefix.prefixlen
             addrlist = [f"{address}/{prefix}"]
         except ValueError: