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

daemon: fixed naming issues with wireless/emane model attributes, fixed issue with emane controlnet updown script

Browse source
This commit is contained in:
Blake Harnden 2022-05-09 21:11:14 -07:00
parent 2e4d0e0cea
commit 8ba169c758
10 changed files with 64 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -558,7 +558,7 @@ class Session:
# ensure default emane configuration
if isinstance(node, EmaneNet) and options.emane:
model_class = self.emane.get_model(options.emane)
node.model = model_class(self, node.id)
node.wireless_model = model_class(self, node.id)
if self.state == EventTypes.RUNTIME_STATE:
self.emane.add_node(node)
@ -1328,9 +1328,8 @@ class Session:
# use the updown script for control net 0 only.
updown_script = None
if net_index == 0:
updown_script = self.options.get("controlnet_updown_script")
updown_script = self.options.get("controlnet_updown_script") or None
if not updown_script:
logger.debug("controlnet updown script not configured")