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

removed emane transport definitions from external configurations

Browse source
This commit is contained in:
Blake J. Harnden 2018-07-12 15:28:26 -07:00
parent 3d59a68299
commit a6f2b9d7c1
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
daemon/core/xml/emanexml.py
View file

@ -129,17 +129,17 @@ def build_node_platform_xml(emane_manager, control_net, node, nem_id, platform_x
add_param(nem_element, platform_endpoint, config[platform_endpoint]) add_param(nem_element, platform_endpoint, config[platform_endpoint])
transport_endpoint = "transportendpoint" transport_endpoint = "transportendpoint"
add_param(nem_element, transport_endpoint, config[transport_endpoint]) add_param(nem_element, transport_endpoint, config[transport_endpoint])
else:
# build transport xml
transport_type = netif.transport_type
if not transport_type:
logger.info("warning: %s interface type unsupported!", netif.name)
transport_type = "raw"
transport_file = transport_file_name(node.objid, transport_type)
transport_element = etree.SubElement(nem_element, "transport", definition=transport_file)
# build transport xml # add transport parameter
transport_type = netif.transport_type add_param(transport_element, "device", netif.name)
if not transport_type:
logger.info("warning: %s interface type unsupported!", netif.name)
transport_type = "raw"
transport_file = transport_file_name(node.objid, transport_type)
transport_element = etree.SubElement(nem_element, "transport", definition=transport_file)
# add transport parameter
add_param(transport_element, "device", netif.name)
# add nem entry # add nem entry
nem_entries[netif] = nem_element nem_entries[netif] = nem_element
@ -334,7 +334,8 @@ def create_nem_xml(emane_model, config, nem_file, transport_definition, mac_defi
nem_element = etree.Element("nem", name="%s NEM" % emane_model.name) nem_element = etree.Element("nem", name="%s NEM" % emane_model.name)
if is_external(config): if is_external(config):
nem_element.set("type", "unstructured") nem_element.set("type", "unstructured")
etree.SubElement(nem_element, "transport", definition=transport_definition) else:
etree.SubElement(nem_element, "transport", definition=transport_definition)
etree.SubElement(nem_element, "mac", definition=mac_definition) etree.SubElement(nem_element, "mac", definition=mac_definition)
etree.SubElement(nem_element, "phy", definition=phy_definition) etree.SubElement(nem_element, "phy", definition=phy_definition)
create_file(nem_element, "nem", nem_file) create_file(nem_element, "nem", nem_file)