(Boeing r1760)

fix Session.instantiate() for EMANE slave servers, which wait for their 
  platform ID and starting NEM ID from the master server
This commit is contained in:
ahrenholz 2013-08-30 18:41:39 +00:00
parent 8f007a223f
commit aad3f07560
2 changed files with 25 additions and 10 deletions

View file

@ -573,8 +573,10 @@ class Session(object):
for transition to the runtime state.
'''
self.writeobjs()
# controlnet may be needed by some EMANE models
self.addremovectrlif(node=None, remove=False)
self.emane.startup()
if self.emane.startup() == self.emane.NOT_READY:
return # instantiate() will be invoked again upon Emane.configure()
self.broker.startup()
self.mobility.startup()
# boot the services on each node