changes to replace MacAddress usage and remove ipaddress module altogether

daemon/core/api/grpc/client.py

@@ -9,8 +9,8 @@ from contextlib import contextmanager
 import grpc
 import netaddr
 
+from core import utils
 from core.api.grpc import core_pb2, core_pb2_grpc
-from core.nodes.ipaddress import MacAddress
 
 
 class InterfaceHelper:
@@ -88,7 +88,7 @@ class InterfaceHelper:
 
         # random mac
         if not mac:
-            mac = MacAddress.random()
+            mac = utils.random_mac()
 
         return core_pb2.Interface(
             id=interface_id,

daemon/core/api/grpc/grpcutils.py

@@ -6,7 +6,6 @@ from core.api.grpc import core_pb2
 from core.emulator.emudata import InterfaceData, LinkOptions, NodeOptions
 from core.emulator.enumerations import LinkTypes, NodeTypes
 from core.nodes.base import CoreNetworkBase
-from core.nodes.ipaddress import MacAddress
 
 WORKERS = 10
 
@@ -57,8 +56,6 @@ def link_interface(interface_proto):
         mac = interface_proto.mac
         if mac == "":
             mac = None
-        else:
-            mac = MacAddress.from_string(mac)
         interface = InterfaceData(
             _id=interface_proto.id,
             name=name,

daemon/core/api/tlv/coreapi.py

@@ -5,10 +5,13 @@ types and objects used for parsing and building CORE API messages.
 CORE API messaging is leveraged for communication with the GUI.
 """
 
+import binascii
 import socket
 import struct
 from enum import Enum
 
+import netaddr
+
 from core.api.tlv import structutils
 from core.emulator.enumerations import (
     ConfigTlvs,
@@ -24,7 +27,6 @@ from core.emulator.enumerations import (
     RegisterTlvs,
     SessionTlvs,
 )
-from core.nodes.ipaddress import MacAddress
 
 
 class CoreTlvData:
@@ -323,7 +325,7 @@ class CoreTlvDataMacAddr(CoreTlvDataObj):
     """
 
     data_format = "!2x8s"
-    data_type = MacAddress.from_string
+    data_type = str
     pad_len = 2
 
     @staticmethod
@@ -331,23 +333,27 @@ class CoreTlvDataMacAddr(CoreTlvDataObj):
         """
         Retrieve Ipv6 address value from object.
 
-        :param core.nodes.ipaddress.MacAddress obj: mac address to get value from
-        :return:
+        :param str obj: mac address to get value from
+        :return: packed mac address
+        :rtype: bytes
         """
         # extend to 64 bits
-        return b"\0\0" + obj.addr
+        return b"\0\0" + netaddr.EUI(obj).packed
 
     @staticmethod
     def new_obj(value):
         """
         Retrieve mac address from a string representation.
 
-        :param str value: value to get Ipv4 address from
-        :return: Ipv4 address
-        :rtype: core.nodes.ipaddress.MacAddress
+        :param bytes value: value to get Ipv4 address from
+        :return: mac address
+        :rtype: str
         """
         # only use 48 bits
-        return MacAddress(address=value[2:])
+        value = binascii.hexlify(value[2:]).decode()
+        mac = netaddr.EUI(value)
+        mac.dialect = netaddr.mac_unix
+        return str(mac)
 
 
 class CoreTlv: