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

updated logic so emane will always use the last model configured for a node, fixes issue when using gui and configuring multiple models

Browse source
This commit is contained in:
Blake J. Harnden 2018-06-08 14:21:41 -07:00
parent 044e7de5e3
commit 1b843e2868
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,8 +12,8 @@ from core import logger
from core.api import coreapi from core.api import coreapi
from core.api import dataconversion from core.api import dataconversion
from core.conf import ConfigShim from core.conf import ConfigShim
from core.conf import Configuration
from core.conf import ConfigurableManager from core.conf import ConfigurableManager
from core.conf import Configuration
from core.emane import emanemanifest from core.emane import emanemanifest
from core.emane.bypass import EmaneBypassModel from core.emane.bypass import EmaneBypassModel
from core.emane.commeffect import EmaneCommEffectModel from core.emane.commeffect import EmaneCommEffectModel
@ -80,7 +80,7 @@ class EmaneManager(ConfigurableManager):
self._emane_node_lock = threading.Lock() self._emane_node_lock = threading.Lock()
self._ifccounts = {} self._ifccounts = {}
self._ifccountslock = threading.Lock() self._ifccountslock = threading.Lock()
# Port numbers are allocated from these counters # port numbers are allocated from these counters
self.platformport = self.session.get_config_item_int("emane_platform_port", 8100) self.platformport = self.session.get_config_item_int("emane_platform_port", 8100)
self.transformport = self.session.get_config_item_int("emane_transform_port", 8200) self.transformport = self.session.get_config_item_int("emane_transform_port", 8200)
self.doeventloop = False self.doeventloop = False
@ -98,6 +98,10 @@ class EmaneManager(ConfigurableManager):
self.service = None self.service = None
self.emane_check() self.emane_check()
def config_reset(self, node_id=None):
super(EmaneManager, self).config_reset(node_id)
self.set_configs(self.emane_config.default_values())
def emane_models(self): def emane_models(self):
return self._modelclsmap.keys() return self._modelclsmap.keys()
@ -577,8 +581,12 @@ class EmaneManager(ConfigurableManager):
logger.debug("no emane node model configuration, leaving: %s", node_id) logger.debug("no emane node model configuration, leaving: %s", node_id)
return False return False
# retrieve and use the last set model configured for this node
# this supports behavior from the legacy gui due to there not being a formal set model message
emane_node = self._emane_nodes[node_id] emane_node = self._emane_nodes[node_id]
for model_class, config in self.getmodels(emane_node): models = self.getmodels(emane_node)
if models:
model_class, config = models[-1]
logger.debug("setting emane model(%s) config(%s)", model_class, config) logger.debug("setting emane model(%s) config(%s)", model_class, config)
emane_node.setmodel(model_class, config) emane_node.setmodel(model_class, config)
return True return True