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

20
daemon/tests/emane/test_emane.py
View file

@ -60,11 +60,11 @@ class TestEmane:
)
# create nodes
node_options = NodeOptions()
node_options.set_position(150, 150)
node_one = session.create_wireless_node(node_options=node_options)
node_options.set_position(300, 150)
node_two = session.create_wireless_node(node_options=node_options)
options = NodeOptions(model="mdr")
options.set_position(150, 150)
node_one = session.add_node(node_options=options)
options.set_position(300, 150)
node_two = session.add_node(node_options=options)
for i, node in enumerate([node_one, node_two]):
node.setposition(x=150 * (i + 1), y=150)
@ -95,11 +95,11 @@ class TestEmane:
emane_network.setposition(x=80, y=50)
# create nodes
node_options = NodeOptions()
node_options.set_position(150, 150)
node_one = session.create_wireless_node(node_options=node_options)
node_options.set_position(300, 150)
node_two = session.create_wireless_node(node_options=node_options)
options = NodeOptions(model="mdr")
options.set_position(150, 150)
node_one = session.add_node(node_options=options)
options.set_position(300, 150)
node_two = session.add_node(node_options=options)
for i, node in enumerate([node_one, node_two]):
node.setposition(x=150 * (i + 1), y=150)

16
daemon/tests/test_core.py
View file

@ -146,10 +146,10 @@ class TestCore:
session.mobility.set_model(wlan_node, BasicRangeModel)
# create nodes
node_options = NodeOptions()
node_options.set_position(0, 0)
node_one = session.create_wireless_node(node_options=node_options)
node_two = session.create_wireless_node(node_options=node_options)
options = NodeOptions(model="mdr")
options.set_position(0, 0)
node_one = session.add_node(node_options=options)
node_two = session.add_node(node_options=options)
# link nodes
for node in [node_one, node_two]:
@ -176,10 +176,10 @@ class TestCore:
session.mobility.set_model(wlan_node, BasicRangeModel)
# create nodes
node_options = NodeOptions()
node_options.set_position(0, 0)
node_one = session.create_wireless_node(node_options=node_options)
node_two = session.create_wireless_node(node_options=node_options)
options = NodeOptions(model="mdr")
options.set_position(0, 0)
node_one = session.add_node(node_options=options)
node_two = session.add_node(node_options=options)
# link nodes
for node in [node_one, node_two]:

8
daemon/tests/test_xml.py
View file

@ -174,10 +174,10 @@ class TestXml:
session.mobility.set_model(wlan_node, BasicRangeModel, {"test": "1"})
# create nodes
node_options = NodeOptions()
node_options.set_position(0, 0)
node_one = session.create_wireless_node(node_options=node_options)
node_two = session.create_wireless_node(node_options=node_options)
options = NodeOptions(model="mdr")
options.set_position(0, 0)
node_one = session.add_node(node_options=options)
node_two = session.add_node(node_options=options)
# link nodes
for node in [node_one, node_two]: