afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Blake J. Harnden 2018-06-11 12:26:51 -07:00
parent 52230bc026
commit 981e48ed30
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/core/emane/emanemanager.py
View file

@ -335,7 +335,7 @@ class EmaneManager(object):
for key in sorted(self._emane_nodes.keys()): for key in sorted(self._emane_nodes.keys()):
emane_node = self._emane_nodes[key] emane_node = self._emane_nodes[key]
logger.debug("post startup for emane node: %s - %s", emane_node.objid, emane_node.name) 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(): for netif in emane_node.netifs():
x, y, z = netif.node.position.get() x, y, z = netif.node.position.get()
emane_node.setnemposition(netif, x, y, z) emane_node.setnemposition(netif, x, y, z)

3
daemon/core/emane/emanemodel.py
View file

@ -191,11 +191,10 @@ class EmaneModel(WirelessModel):
return phy_document return phy_document
def post_startup(self, emane_manager): def post_startup(self):
""" """
Logic to execute after the emane manager is finished with startup. 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 :return: nothing
""" """
logger.info("emane model(%s) has no post setup tasks", self.name) logger.info("emane model(%s) has no post setup tasks", self.name)

6
daemon/core/emane/tdma.py
View file

@ -40,11 +40,10 @@ class EmaneTdmaModel(emanemodel.EmaneModel):
) )
config_ignore = {schedule_name} 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. 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 :return: nothing
""" """
# get configured schedule # get configured schedule
@ -53,7 +52,8 @@ class EmaneTdmaModel(emanemodel.EmaneModel):
return return
schedule = config[self.schedule_name] 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 # initiate tdma schedule
logger.info("setting up tdma schedule: schedule(%s) device(%s)", schedule, event_device) logger.info("setting up tdma schedule: schedule(%s) device(%s)", schedule, event_device)