removed node map file and utilities, added formal class methods to session objects and added checks for specific classes where needed

daemon/core/api/grpc/server.py

@@ -12,6 +12,7 @@ import grpc
 
 from core import CoreError
 from core.api.grpc import core_pb2, core_pb2_grpc
+from core.emane.nodes import EmaneNode
 from core.emulator.data import (
     ConfigData,
     EventData,
@@ -23,7 +24,6 @@ from core.emulator.data import (
 from core.emulator.emudata import InterfaceData, LinkOptions, NodeOptions
 from core.emulator.enumerations import EventTypes, LinkTypes, NodeTypes
 from core.location.mobility import BasicRangeModel, Ns2ScriptedMobility
-from core.nodes import nodeutils
 from core.nodes.base import CoreNetworkBase
 from core.nodes.docker import DockerNode
 from core.nodes.ipaddress import MacAddress
@@ -444,7 +444,7 @@ class CoreGrpcServer(core_pb2_grpc.CoreApiServicer):
             if not isinstance(node.id, int):
                 continue
 
-            node_type = nodeutils.get_node_type(node.__class__).value
+            node_type = session.get_node_type(node.__class__)
             model = getattr(node, "type", None)
             position = core_pb2.Position(
                 x=node.position.x, y=node.position.y, z=node.position.z
@@ -456,7 +456,7 @@ class CoreGrpcServer(core_pb2_grpc.CoreApiServicer):
             services = [x.name for x in services]
 
             emane_model = None
-            if nodeutils.is_node(node, NodeTypes.EMANE):
+            if isinstance(node, EmaneNode):
                 emane_model = node.model.name
 
             node_proto = core_pb2.Node(
@@ -464,7 +464,7 @@ class CoreGrpcServer(core_pb2_grpc.CoreApiServicer):
                 name=node.name,
                 emane=emane_model,
                 model=model,
-                type=node_type,
+                type=node_type.value,
                 position=position,
                 services=services,
             )
@@ -809,18 +809,18 @@ class CoreGrpcServer(core_pb2_grpc.CoreApiServicer):
             interfaces.append(interface_proto)
 
         emane_model = None
-        if nodeutils.is_node(node, NodeTypes.EMANE):
+        if isinstance(node, EmaneNode):
             emane_model = node.model.name
 
         services = [x.name for x in getattr(node, "services", [])]
         position = core_pb2.Position(
             x=node.position.x, y=node.position.y, z=node.position.z
         )
-        node_type = nodeutils.get_node_type(node.__class__).value
+        node_type = session.get_node_type(node.__class__)
         node_proto = core_pb2.Node(
             id=node.id,
             name=node.name,
-            type=node_type,
+            type=node_type.value,
             emane=emane_model,
             model=node.type,
             position=position,

daemon/core/api/tlv/broker.py

@@ -12,6 +12,7 @@ import threading
 
 from core import utils
 from core.api.tlv import coreapi
+from core.emane.nodes import EmaneNet
 from core.emulator.enumerations import (
     ConfigDataTypes,
     ConfigFlags,
@@ -27,11 +28,10 @@ from core.emulator.enumerations import (
     NodeTypes,
     RegisterTlvs,
 )
-from core.nodes import nodeutils
 from core.nodes.base import CoreNetworkBase, CoreNodeBase
 from core.nodes.interface import GreTap
 from core.nodes.ipaddress import IpAddress
-from core.nodes.network import GreTapBridge
+from core.nodes.network import CtrlNet, GreTapBridge
 from core.nodes.physical import PhysicalNode
 
 
@@ -495,15 +495,12 @@ class CoreBroker(object):
         logging.info("adding net tunnel for: id(%s) %s", node_id, net)
 
         # add other nets here that do not require tunnels
-        if nodeutils.is_node(net, NodeTypes.EMANE_NET):
+        if isinstance(net, EmaneNet):
             logging.warning("emane network does not require a tunnel")
             return None
 
         server_interface = getattr(net, "serverintf", None)
-        if (
-            nodeutils.is_node(net, NodeTypes.CONTROL_NET)
-            and server_interface is not None
-        ):
+        if isinstance(net, CtrlNet) and server_interface is not None:
             logging.warning(
                 "control networks with server interfaces do not need a tunnel"
             )
@@ -824,7 +821,8 @@ class CoreBroker(object):
         nodetype = message.get_tlv(NodeTlvs.TYPE.value)
         if nodetype is not None:
             try:
-                nodecls = nodeutils.get_node_class(NodeTypes(nodetype))
+                nodetype = NodeTypes(nodetype)
+                nodecls = self.session.get_node_class(nodetype)
             except KeyError:
                 logging.warning("broker invalid node type %s", nodetype)
                 return handle_locally, servers

daemon/core/api/tlv/corehandlers.py

@@ -38,7 +38,7 @@ from core.emulator.enumerations import (
     SessionTlvs,
 )
 from core.location.mobility import BasicRangeModel
-from core.nodes import nodeutils
+from core.nodes.network import WlanNode
 from core.services.coreservices import ServiceManager, ServiceShim
 
 
@@ -1603,8 +1603,8 @@ class CoreHandler(socketserver.BaseRequestHandler):
                 node = self.session.get_node(node_id)
 
                 # configure mobility models for WLAN added during runtime
-                if event_type == EventTypes.INSTANTIATION_STATE and nodeutils.is_node(
-                    node, NodeTypes.WIRELESS_LAN
+                if event_type == EventTypes.INSTANTIATION_STATE and isinstance(
+                    node, WlanNode
                 ):
                     self.session.start_mobility(node_ids=(node.id,))
                     return ()