daemon: fixed naming issues with wireless/emane model attributes, fixed issue with emane controlnet updown script

daemon/core/emane/emanemanager.py

@@ -45,8 +45,6 @@ except ImportError:
         EventServiceException = None
         logger.debug("compatible emane python bindings not installed")
 
-DEFAULT_EMANE_PREFIX = "/usr"
-DEFAULT_DEV = "ctrl0"
 DEFAULT_LOG_LEVEL: int = 3
 
 
@@ -223,7 +221,7 @@ class EmaneManager:
         :param iface: interface running emane
         :return: net, node, or interface model configuration
         """
-        model_name = emane_net.model.name
+        model_name = emane_net.wireless_model.name
         # try to retrieve interface specific configuration
         key = utils.iface_config_id(iface.node.id, iface.id)
         config = self.get_config(key, model_name, default=False)
@@ -237,7 +235,7 @@ class EmaneManager:
             config = self.get_config(emane_net.id, model_name, default=False)
         # return default config values, when a config is not present
         if not config:
-            config = emane_net.model.default_values()
+            config = emane_net.wireless_model.default_values()
         return config
 
     def config_reset(self, node_id: int = None) -> None:
@@ -340,7 +338,7 @@ class EmaneManager:
     def get_ifaces(self) -> List[Tuple[EmaneNet, TunTap]]:
         ifaces = []
         for emane_net in self._emane_nets.values():
-            if not emane_net.model:
+            if not emane_net.wireless_model:
                 logger.error("emane net(%s) has no model", emane_net.name)
                 continue
             for iface in emane_net.get_ifaces():
@@ -498,7 +496,7 @@ class EmaneManager:
                     "post startup for emane node: %s - %s", emane_net.id, emane_net.name
                 )
                 for iface in emane_net.get_ifaces():
-                    emane_net.model.post_startup(iface)
+                    emane_net.wireless_model.post_startup(iface)
                     if events_enabled:
                         iface.setposition()
 
@@ -550,9 +548,11 @@ class EmaneManager:
             emane_net = self._emane_nets[node_id]
             logger.debug("checking emane model for node: %s", node_id)
             # skip nodes that already have a model set
-            if emane_net.model:
+            if emane_net.wireless_model:
                 logger.debug(
-                    "node(%s) already has model(%s)", emane_net.id, emane_net.model.name
+                    "node(%s) already has model(%s)",
+                    emane_net.id,
+                    emane_net.wireless_model.name,
                 )
                 continue
             # set model configured for node, due to legacy messaging configuration

daemon/core/emane/nodes.py

@@ -5,7 +5,7 @@ share the same MAC+PHY model.
 
 import logging
 import time
-from typing import TYPE_CHECKING, Callable, Dict, List, Optional, Type
+from typing import TYPE_CHECKING, Callable, Dict, List, Optional, Type, Union
 
 from core.emulator.data import InterfaceData, LinkData, LinkOptions
 from core.emulator.distributed import DistributedServer
@@ -19,10 +19,7 @@ logger = logging.getLogger(__name__)
 if TYPE_CHECKING:
     from core.emane.emanemodel import EmaneModel
     from core.emulator.session import Session
-    from core.location.mobility import WirelessModel, WayPointMobility
-
-    OptionalEmaneModel = Optional[EmaneModel]
-    WirelessModelType = Type[WirelessModel]
+    from core.location.mobility import WayPointMobility
 
 try:
     from emane.events import LocationEvent
@@ -158,7 +155,7 @@ class EmaneNet(CoreNetworkBase):
     ) -> None:
         super().__init__(session, _id, name, server)
         self.conf: str = ""
-        self.model: "OptionalEmaneModel" = None
+        self.wireless_model: Optional["EmaneModel"] = None
         self.mobility: Optional[WayPointMobility] = None
 
     def linkconfig(
@@ -167,9 +164,9 @@ class EmaneNet(CoreNetworkBase):
         """
         The CommEffect model supports link configuration.
         """
-        if not self.model:
+        if not self.wireless_model:
             return
-        self.model.linkconfig(iface, options, iface2)
+        self.wireless_model.linkconfig(iface, options, iface2)
 
     def startup(self) -> None:
         self.up = True
@@ -190,20 +187,24 @@ class EmaneNet(CoreNetworkBase):
         :param config: configuration to update model with
         :return: nothing
         """
-        if not self.model:
+        if not self.wireless_model:
             raise CoreError(f"no model set to update for node({self.name})")
-        logger.info("node(%s) updating model(%s): %s", self.id, self.model.name, config)
-        self.model.update_config(config)
+        logger.info(
+            "node(%s) updating model(%s): %s", self.id, self.wireless_model.name, config
+        )
+        self.wireless_model.update_config(config)
 
-    def setmodel(self, model: "WirelessModelType", config: Dict[str, str]) -> None:
+    def setmodel(
+        self,
+        model: Union[Type["EmaneModel"], Type["WayPointMobility"]],
+        config: Dict[str, str],
+    ) -> None:
         """
         set the EmaneModel associated with this node
         """
         if model.config_type == RegisterTlvs.WIRELESS:
-            # EmaneModel really uses values from ConfigurableManager
-            #  when buildnemxml() is called, not during init()
-            self.model = model(session=self.session, _id=self.id)
-            self.model.update_config(config)
+            self.wireless_model = model(session=self.session, _id=self.id)
+            self.wireless_model.update_config(config)
         elif model.config_type == RegisterTlvs.MOBILITY:
             self.mobility = model(session=self.session, _id=self.id)
             self.mobility.update_config(config)