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

refactored how getters for configurations worked, to avoid setting defaults and causing undesireable states

Browse source
This commit is contained in:
Blake J. Harnden 2018-07-11 21:34:21 -07:00
parent b03662dbeb
commit 3d59a68299
6 changed files with 46 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -120,17 +120,14 @@ class EmaneManager(ModelManager):
key += interface.netindex
# try retrieve interface specific configuration, avoid getting defaults
config = {}
if self.has_configs(key):
config = self.get_configs(key)
config = self.get_configs(node_id=key, config_type=model_name)
# otherwise retrieve the interfaces node configuration, avoid using defaults
if not config and self.has_configs(interface.node.objid):
if not config:
config = self.get_configs(node_id=interface.node.objid, config_type=model_name)
# get non interface config, when none found
# if not config and interface.transport_type == "raw":
if not config and self.has_configs(node_id):
if not config:
# with EMANE 0.9.2+, we need an extra NEM XML from
# model.buildnemxmlfiles(), so defaults are returned here
config = self.get_configs(node_id=node_id, config_type=model_name)