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

daemon: fixed emane setup to move binding check to after validating if emane is needed

Browse source
This commit is contained in:
Blake Harnden 2021-05-26 14:48:28 -07:00
parent b51200e397
commit f928284fb7
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -282,9 +282,6 @@ class EmaneManager:
:return: SUCCESS, NOT_NEEDED, NOT_READY in order to delay session :return: SUCCESS, NOT_NEEDED, NOT_READY in order to delay session
instantiation instantiation
""" """
# check if bindings were installed
if EventService is None:
raise CoreError("EMANE python bindings are not installed")
logger.debug("emane setup") logger.debug("emane setup")
with self.session.nodes_lock: with self.session.nodes_lock:
for node_id in self.session.nodes: for node_id in self.session.nodes:
@ -297,6 +294,9 @@ class EmaneManager:
if not self._emane_nets: if not self._emane_nets:
logger.debug("no emane nodes in session") logger.debug("no emane nodes in session")
return EmaneState.NOT_NEEDED return EmaneState.NOT_NEEDED
# check if bindings were installed
if EventService is None:
raise CoreError("EMANE python bindings are not installed")
self.check_node_models() self.check_node_models()
return EmaneState.SUCCESS return EmaneState.SUCCESS