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

removed session.create_wireless_node, can be achieved simply without needing this function

Browse source
This commit is contained in:
Blake Harnden 2019-10-22 15:13:28 -07:00
parent c1bb9ed5d8
commit ce411a07d7
9 changed files with 56 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -585,7 +585,7 @@ class EmaneManager(ModelManager):
args = f"{emanecmd} -f {log_file} {platform_xml}"
output = node.cmd(args)
logging.info("node(%s) emane daemon running: %s", node.name, args)
logging.info("node(%s) emane daemon output: %s", node.name, output)
logging.debug("node(%s) emane daemon output: %s", node.name, output)
if not run_emane_on_host:
return

16
daemon/core/emulator/session.py
View file

@ -908,22 +908,6 @@ class Session(object):
"""
self.mobility.handleevent(event_data)
def create_wireless_node(self, _id=None, node_options=None):
"""
Create a wireless node for use within an wireless/EMANE networks.
:param int _id: int for node, defaults to None and will be generated
:param core.emulator.emudata.NodeOptions node_options: options for emane node, model will always be "mdr"
:return: new emane node
:rtype: core.nodes.network.WlanNode
"""
if not node_options:
node_options = NodeOptions()
node_options.model = "mdr"
return self.add_node(
_type=NodeTypes.DEFAULT, _id=_id, node_options=node_options
)
def create_emane_network(
self,
model,