From 981e48ed30b22ed325a02253390bad56e3d0cdb2 Mon Sep 17 00:00:00 2001 From: "Blake J. Harnden" Date: Mon, 11 Jun 2018 12:26:51 -0700 Subject: [PATCH] removed the emane manager from post_startup on emane models, it was not needed, since we can access it from our local session object, if needed --- daemon/core/emane/emanemanager.py | 2 +- daemon/core/emane/emanemodel.py | 3 +-- daemon/core/emane/tdma.py | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/daemon/core/emane/emanemanager.py b/daemon/core/emane/emanemanager.py index 2dce8b5f..94a7cc58 100644 --- a/daemon/core/emane/emanemanager.py +++ b/daemon/core/emane/emanemanager.py @@ -335,7 +335,7 @@ class EmaneManager(object): for key in sorted(self._emane_nodes.keys()): emane_node = self._emane_nodes[key] logger.debug("post startup for emane node: %s - %s", emane_node.objid, emane_node.name) - emane_node.model.post_startup(self) + emane_node.model.post_startup() for netif in emane_node.netifs(): x, y, z = netif.node.position.get() emane_node.setnemposition(netif, x, y, z) diff --git a/daemon/core/emane/emanemodel.py b/daemon/core/emane/emanemodel.py index 349044d2..e9db964a 100644 --- a/daemon/core/emane/emanemodel.py +++ b/daemon/core/emane/emanemodel.py @@ -191,11 +191,10 @@ class EmaneModel(WirelessModel): return phy_document - def post_startup(self, emane_manager): + def post_startup(self): """ Logic to execute after the emane manager is finished with startup. - :param core.emane.emanemanager.EmaneManager emane_manager: emane manager for the session :return: nothing """ logger.info("emane model(%s) has no post setup tasks", self.name) diff --git a/daemon/core/emane/tdma.py b/daemon/core/emane/tdma.py index 47fbff43..99820cf8 100644 --- a/daemon/core/emane/tdma.py +++ b/daemon/core/emane/tdma.py @@ -40,11 +40,10 @@ class EmaneTdmaModel(emanemodel.EmaneModel): ) config_ignore = {schedule_name} - def post_startup(self, emane_manager): + def post_startup(self): """ Logic to execute after the emane manager is finished with startup. - :param core.emane.emanemanager.EmaneManager emane_manager: emane manager for the session :return: nothing """ # get configured schedule @@ -53,7 +52,8 @@ class EmaneTdmaModel(emanemodel.EmaneModel): return schedule = config[self.schedule_name] - event_device = emane_manager.event_device + # get the set event device + event_device = self.session.emane.event_device # initiate tdma schedule logger.info("setting up tdma schedule: schedule(%s) device(%s)", schedule, event_device)