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

daemon: updated emane model platform configuration to remove controlportendpoint option, as this will be something core itself will define

Browse source
This commit is contained in:
Blake Harnden 2021-05-26 12:57:35 -07:00
parent 3fcefc4d79
commit b51200e397
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -27,6 +27,7 @@ class EmaneModel(WirelessModel):
"""
# default platform configuration settings
platform_controlport: str = "controlportendpoint"
platform_xml: str = "nemmanager.xml"
platform_defaults: Dict[str, str] = {
"eventservicedevice": DEFAULT_DEV,
@ -88,6 +89,14 @@ class EmaneModel(WirelessModel):
cls.platform_config = emanemanifest.parse(
platform_xml_path, cls.platform_defaults
)
# remove controlport configuration, since core will set this directly
controlport_index = None
for index, configuration in enumerate(cls.platform_config):
if configuration.id == cls.platform_controlport:
controlport_index = index
break
if controlport_index is not None:
cls.platform_config.pop(controlport_index)
@classmethod
def configurations(cls) -> List[Configuration]: