turned transport type usages of raw and virtual across the board to an enumerated type

daemon/core/emane/commeffect.py

@@ -11,6 +11,7 @@ from lxml import etree
 from core.config import ConfigGroup, Configuration
 from core.emane import emanemanifest, emanemodel
 from core.emane.nodes import EmaneNet
+from core.emulator.enumerations import TransportType
 from core.nodes.interface import CoreInterface
 from core.xml import emanexml
 
@@ -79,9 +80,9 @@ class EmaneCommEffectModel(emanemodel.EmaneModel):
 
         # create and write nem document
         nem_element = etree.Element("nem", name=f"{self.name} NEM", type="unstructured")
-        transport_type = "virtual"
-        if interface and interface.transport_type == "raw":
-            transport_type = "raw"
+        transport_type = TransportType.VIRTUAL
+        if interface and interface.transport_type == TransportType.RAW:
+            transport_type = TransportType.RAW
         transport_file = emanexml.transport_file_name(self.id, transport_type)
         etree.SubElement(nem_element, "transport", definition=transport_file)
 

daemon/core/emane/emanemanager.py

@@ -30,6 +30,7 @@ from core.errors import CoreCommandError, CoreError
 from core.nodes.base import CoreNode, NodeBase
 from core.nodes.interface import CoreInterface
 from core.nodes.network import CtrlNet
+from core.nodes.physical import Rj45Node
 from core.xml import emanexml
 
 if TYPE_CHECKING:
@@ -596,7 +597,7 @@ class EmaneManager(ModelManager):
 
         run_emane_on_host = False
         for node in self.getnodes():
-            if hasattr(node, "transport_type") and node.transport_type == "raw":
+            if isinstance(node, Rj45Node):
                 run_emane_on_host = True
                 continue
             path = self.session.session_dir
@@ -655,7 +656,7 @@ class EmaneManager(ModelManager):
         kill_transortd = "killall -q emanetransportd"
         stop_emane_on_host = False
         for node in self.getnodes():
-            if hasattr(node, "transport_type") and node.transport_type == "raw":
+            if isinstance(node, Rj45Node):
                 stop_emane_on_host = True
                 continue
 

daemon/core/emane/emanemodel.py

@@ -8,7 +8,7 @@ from typing import Dict, List
 from core.config import ConfigGroup, Configuration
 from core.emane import emanemanifest
 from core.emane.nodes import EmaneNet
-from core.emulator.enumerations import ConfigDataTypes
+from core.emulator.enumerations import ConfigDataTypes, TransportType
 from core.errors import CoreError
 from core.location.mobility import WirelessModel
 from core.nodes.interface import CoreInterface
@@ -111,9 +111,9 @@ class EmaneModel(WirelessModel):
             server = interface.node.server
 
         # check if this is external
-        transport_type = "virtual"
-        if interface and interface.transport_type == "raw":
-            transport_type = "raw"
+        transport_type = TransportType.VIRTUAL
+        if interface and interface.transport_type == TransportType.RAW:
+            transport_type = TransportType.RAW
         transport_name = emanexml.transport_file_name(self.id, transport_type)
 
         # create nem xml file

daemon/core/emane/nodes.py

@@ -8,7 +8,13 @@ from typing import TYPE_CHECKING, Dict, List, Optional, Tuple, Type
 
 from core.emulator.data import LinkData
 from core.emulator.distributed import DistributedServer
-from core.emulator.enumerations import LinkTypes, MessageFlags, NodeTypes, RegisterTlvs
+from core.emulator.enumerations import (
+    LinkTypes,
+    MessageFlags,
+    NodeTypes,
+    RegisterTlvs,
+    TransportType,
+)
 from core.nodes.base import CoreNetworkBase
 from core.nodes.interface import CoreInterface
 
@@ -173,7 +179,7 @@ class EmaneNet(CoreNetworkBase):
         emanetransportd terminates.
         """
         for netif in self.netifs():
-            if "virtual" in netif.transport_type.lower():
+            if netif.transport_type == TransportType.VIRTUAL:
                 netif.shutdown()
             netif.poshook = None