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

shifted session startup order to help ensure broker tunnels get setup before emane starts

Browse source
This commit is contained in:
Blake Harnden 2019-06-19 10:58:49 -07:00
parent 14fc16832d
commit 6270fcbc75
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
daemon/core/emulator/session.py
View file

@ -1214,19 +1214,19 @@ class Session(object):
# write current nodes out to session directory file # write current nodes out to session directory file
self.write_nodes() self.write_nodes()
# controlnet may be needed by some EMANE models # create control net interfaces and broker network tunnels
# which need to exist for emane to sync on location events
# in distributed scenarios
self.add_remove_control_interface(node=None, remove=False) self.add_remove_control_interface(node=None, remove=False)
self.broker.startup()
# instantiate will be invoked again upon Emane configure # instantiate will be invoked again upon Emane configure
if self.emane.startup() == self.emane.NOT_READY: if self.emane.startup() == self.emane.NOT_READY:
return return
# start feature helpers # boot node services and then start mobility
self.broker.startup()
self.mobility.startup()
# boot the services on each node
self.boot_nodes() self.boot_nodes()
self.mobility.startup()
# set broker local instantiation to complete # set broker local instantiation to complete
self.broker.local_instantiation_complete() self.broker.local_instantiation_complete()