properly adding change for emane node links being wireless, fixed issue when sending emane model configs when there is no interface set

This commit is contained in:
Blake Harnden 2019-11-25 15:46:32 -08:00
parent cdc48a765a
commit ad4ee58ddd
2 changed files with 3 additions and 2 deletions

View file

@ -567,6 +567,8 @@ class CoreClient:
for key, config in self.emane_model_configs.items():
node_id, model, interface = key
config = {x: config[x].value for x in config}
if interface is None:
interface = -1
config_proto = core_pb2.EmaneModelConfig(
node_id=node_id, interface_id=interface, model=model, config=config
)
@ -630,5 +632,4 @@ class CoreClient:
def set_emane_model_config(self, node_id, model, config, interface=None):
logging.info("setting emane model config: %s %s %s", node_id, model, interface)
logging.info("model config: %s", config)
self.emane_model_configs[(node_id, model, interface)] = config

View file

@ -25,7 +25,7 @@ class EmaneNet(CoreNetworkBase):
"""
apitype = NodeTypes.EMANE.value
linktype = LinkTypes.WIRELESS.value
linktype = LinkTypes.WIRED.value
type = "wlan"
is_emane = True