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

modified session.add_node parameter node_options, to just be options

Browse source
This commit is contained in:
Blake Harnden 2019-10-22 15:31:50 -07:00
parent ce411a07d7
commit ab0abd65aa
21 changed files with 100 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -62,9 +62,9 @@ class TestEmane:
# create nodes
options = NodeOptions(model="mdr")
options.set_position(150, 150)
node_one = session.add_node(node_options=options)
node_one = session.add_node(options=options)
options.set_position(300, 150)
node_two = session.add_node(node_options=options)
node_two = session.add_node(options=options)
for i, node in enumerate([node_one, node_two]):
node.setposition(x=150 * (i + 1), y=150)
@ -97,9 +97,9 @@ class TestEmane:
# create nodes
options = NodeOptions(model="mdr")
options.set_position(150, 150)
node_one = session.add_node(node_options=options)
node_one = session.add_node(options=options)
options.set_position(300, 150)
node_two = session.add_node(node_options=options)
node_two = session.add_node(options=options)
for i, node in enumerate([node_one, node_two]):
node.setposition(x=150 * (i + 1), y=150)

8
daemon/tests/test_core.py
View file

@ -148,8 +148,8 @@ class TestCore:
# create nodes
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)
node_one = session.add_node(options=options)
node_two = session.add_node(options=options)
# link nodes
for node in [node_one, node_two]:
@ -178,8 +178,8 @@ class TestCore:
# create nodes
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)
node_one = session.add_node(options=options)
node_two = session.add_node(options=options)
# link nodes
for node in [node_one, node_two]:

8
daemon/tests/test_grpc.py
View file

@ -245,8 +245,8 @@ class TestGrpc:
client = CoreGrpcClient()
session = grpc_server.coreemu.create_session()
session.set_state(EventTypes.CONFIGURATION_STATE)
node_options = NodeOptions(model="Host")
node = session.add_node(node_options=node_options)
options = NodeOptions(model="Host")
node = session.add_node(options=options)
session.instantiate()
output = "hello world"
@ -263,8 +263,8 @@ class TestGrpc:
client = CoreGrpcClient()
session = grpc_server.coreemu.create_session()
session.set_state(EventTypes.CONFIGURATION_STATE)
node_options = NodeOptions(model="Host")
node = session.add_node(node_options=node_options)
options = NodeOptions(model="Host")
node = session.add_node(options=options)
session.instantiate()
# then

4
daemon/tests/test_nodes.py
View file

@ -17,10 +17,10 @@ class TestNodes:
@pytest.mark.parametrize("model", MODELS)
def test_node_add(self, session, model):
# given
node_options = NodeOptions(model=model)
options = NodeOptions(model=model)
# when
node = session.add_node(node_options=node_options)
node = session.add_node(options=options)
# give time for node services to boot
time.sleep(1)

8
daemon/tests/test_xml.py
View file

@ -108,8 +108,8 @@ class TestXml:
ptp_node = session.add_node(_type=NodeTypes.PEER_TO_PEER)
# create nodes
node_options = NodeOptions(model="host")
node_one = session.add_node(node_options=node_options)
options = NodeOptions(model="host")
node_one = session.add_node(options=options)
node_two = session.add_node()
# link nodes to ptp net
@ -176,8 +176,8 @@ class TestXml:
# create nodes
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)
node_one = session.add_node(options=options)
node_two = session.add_node(options=options)
# link nodes
for node in [node_one, node_two]: