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

variable/grpc cleanup to rename everything using spelt out numbers instead of actual numbers

Browse source
This commit is contained in:
Blake Harnden 2020-06-12 16:52:41 -07:00
parent b28ef76d65
commit 876699e8ef
45 changed files with 932 additions and 966 deletions
Download patch file Download diff file Expand all files Collapse all files

14
daemon/examples/configservices/testing.py
View file

@ -11,7 +11,7 @@ if __name__ == "__main__":
# setup basic network
prefixes = IpPrefixes(ip4_prefix="10.83.0.0/16")
options = NodeOptions(model="nothing")
options = NodeOptions(model=None)
coreemu = CoreEmu()
session = coreemu.create_session()
session.set_state(EventTypes.CONFIGURATION_STATE)
@ -19,14 +19,14 @@ if __name__ == "__main__":
# node one
options.config_services = ["DefaultRoute", "IPForward"]
node_one = session.add_node(CoreNode, options=options)
interface = prefixes.create_interface(node_one)
session.add_link(node_one.id, switch.id, interface_one=interface)
node1 = session.add_node(CoreNode, options=options)
interface = prefixes.create_interface(node1)
session.add_link(node1.id, switch.id, interface1_data=interface)
# node two
node_two = session.add_node(CoreNode, options=options)
interface = prefixes.create_interface(node_two)
session.add_link(node_two.id, switch.id, interface_one=interface)
node2 = session.add_node(CoreNode, options=options)
interface = prefixes.create_interface(node2)
session.add_link(node2.id, switch.id, interface1_data=interface)
# start session and run services
session.instantiate()

10
daemon/examples/docker/docker2core.py
View file

@ -17,15 +17,15 @@ if __name__ == "__main__":
options = NodeOptions(model=None, image="ubuntu")
# create node one
node_one = session.add_node(DockerNode, options=options)
interface_one = prefixes.create_interface(node_one)
node1 = session.add_node(DockerNode, options=options)
interface1_data = prefixes.create_interface(node1)
# create node two
node_two = session.add_node(CoreNode)
interface_two = prefixes.create_interface(node_two)
node2 = session.add_node(CoreNode)
interface2_data = prefixes.create_interface(node2)
# add link
session.add_link(node_one.id, node_two.id, interface_one, interface_two)
session.add_link(node1.id, node2.id, interface1_data, interface2_data)
# instantiate
session.instantiate()

10
daemon/examples/docker/docker2docker.py
View file

@ -18,15 +18,15 @@ if __name__ == "__main__":
options = NodeOptions(model=None, image="ubuntu")
# create node one
node_one = session.add_node(DockerNode, options=options)
interface_one = prefixes.create_interface(node_one)
node1 = session.add_node(DockerNode, options=options)
interface1_data = prefixes.create_interface(node1)
# create node two
node_two = session.add_node(DockerNode, options=options)
interface_two = prefixes.create_interface(node_two)
node2 = session.add_node(DockerNode, options=options)
interface2_data = prefixes.create_interface(node2)
# add link
session.add_link(node_one.id, node_two.id, interface_one, interface_two)
session.add_link(node1.id, node2.id, interface1_data, interface2_data)
# instantiate
session.instantiate()

12
daemon/examples/docker/switch.py
View file

@ -22,20 +22,20 @@ if __name__ == "__main__":
switch = session.add_node(SwitchNode)
# node one
node_one = session.add_node(DockerNode, options=options)
interface_one = prefixes.create_interface(node_one)
node1 = session.add_node(DockerNode, options=options)
interface1_data = prefixes.create_interface(node1)
# node two
node_two = session.add_node(DockerNode, options=options)
interface_two = prefixes.create_interface(node_two)
node2 = session.add_node(DockerNode, options=options)
interface2_data = prefixes.create_interface(node2)
# node three
node_three = session.add_node(CoreNode)
interface_three = prefixes.create_interface(node_three)
# add links
session.add_link(node_one.id, switch.id, interface_one)
session.add_link(node_two.id, switch.id, interface_two)
session.add_link(node1.id, switch.id, interface1_data)
session.add_link(node2.id, switch.id, interface2_data)
session.add_link(node_three.id, switch.id, interface_three)
# instantiate

12
daemon/examples/grpc/distributed_switch.py
View file

@ -44,11 +44,11 @@ def main(args):
node = Node(position=position)
response = core.add_node(session_id, node)
logging.info("created node one: %s", response)
node_one_id = response.node_id
node1_id = response.node_id
# create link
interface_one = interface_helper.create_interface(node_one_id, 0)
response = core.add_link(session_id, node_one_id, switch_id, interface_one)
interface1 = interface_helper.create_interface(node1_id, 0)
response = core.add_link(session_id, node1_id, switch_id, interface1)
logging.info("created link from node one to switch: %s", response)
# create node two
@ -56,11 +56,11 @@ def main(args):
node = Node(position=position, server=server_name)
response = core.add_node(session_id, node)
logging.info("created node two: %s", response)
node_two_id = response.node_id
node2_id = response.node_id
# create link
interface_one = interface_helper.create_interface(node_two_id, 0)
response = core.add_link(session_id, node_two_id, switch_id, interface_one)
interface1 = interface_helper.create_interface(node2_id, 0)
response = core.add_link(session_id, node2_id, switch_id, interface1)
logging.info("created link from node two to switch: %s", response)
# change session state

8
daemon/examples/grpc/emane80211.py
View file

@ -57,11 +57,11 @@ def main():
node2_id = response.node_id
# links nodes to switch
interface_one = interface_helper.create_interface(node1_id, 0)
response = core.add_link(session_id, node1_id, emane_id, interface_one)
interface1 = interface_helper.create_interface(node1_id, 0)
response = core.add_link(session_id, node1_id, emane_id, interface1)
logging.info("created link: %s", response)
interface_one = interface_helper.create_interface(node2_id, 0)
response = core.add_link(session_id, node2_id, emane_id, interface_one)
interface1 = interface_helper.create_interface(node2_id, 0)
response = core.add_link(session_id, node2_id, emane_id, interface1)
logging.info("created link: %s", response)
# change session state

8
daemon/examples/grpc/switch.py
View file

@ -53,11 +53,11 @@ def main():
node2_id = response.node_id
# links nodes to switch
interface_one = interface_helper.create_interface(node1_id, 0)
response = core.add_link(session_id, node1_id, switch_id, interface_one)
interface1 = interface_helper.create_interface(node1_id, 0)
response = core.add_link(session_id, node1_id, switch_id, interface1)
logging.info("created link: %s", response)
interface_one = interface_helper.create_interface(node2_id, 0)
response = core.add_link(session_id, node2_id, switch_id, interface_one)
interface1 = interface_helper.create_interface(node2_id, 0)
response = core.add_link(session_id, node2_id, switch_id, interface1)
logging.info("created link: %s", response)
# change session state

8
daemon/examples/grpc/wlan.py
View file

@ -65,11 +65,11 @@ def main():
node2_id = response.node_id
# links nodes to switch
interface_one = interface_helper.create_interface(node1_id, 0)
response = core.add_link(session_id, node1_id, wlan_id, interface_one)
interface1 = interface_helper.create_interface(node1_id, 0)
response = core.add_link(session_id, node1_id, wlan_id, interface1)
logging.info("created link: %s", response)
interface_one = interface_helper.create_interface(node2_id, 0)
response = core.add_link(session_id, node2_id, wlan_id, interface_one)
interface1 = interface_helper.create_interface(node2_id, 0)
response = core.add_link(session_id, node2_id, wlan_id, interface1)
logging.info("created link: %s", response)
# change session state

10
daemon/examples/lxd/lxd2core.py
View file

@ -17,15 +17,15 @@ if __name__ == "__main__":
options = NodeOptions(image="ubuntu")
# create node one
node_one = session.add_node(LxcNode, options=options)
interface_one = prefixes.create_interface(node_one)
node1 = session.add_node(LxcNode, options=options)
interface1_data = prefixes.create_interface(node1)
# create node two
node_two = session.add_node(CoreNode)
interface_two = prefixes.create_interface(node_two)
node2 = session.add_node(CoreNode)
interface2_data = prefixes.create_interface(node2)
# add link
session.add_link(node_one.id, node_two.id, interface_one, interface_two)
session.add_link(node1.id, node2.id, interface1_data, interface2_data)
# instantiate
session.instantiate()

10
daemon/examples/lxd/lxd2lxd.py
View file

@ -18,15 +18,15 @@ if __name__ == "__main__":
options = NodeOptions(image="ubuntu:18.04")
# create node one
node_one = session.add_node(LxcNode, options=options)
interface_one = prefixes.create_interface(node_one)
node1 = session.add_node(LxcNode, options=options)
interface1_data = prefixes.create_interface(node1)
# create node two
node_two = session.add_node(LxcNode, options=options)
interface_two = prefixes.create_interface(node_two)
node2 = session.add_node(LxcNode, options=options)
interface2_data = prefixes.create_interface(node2)
# add link
session.add_link(node_one.id, node_two.id, interface_one, interface_two)
session.add_link(node1.id, node2.id, interface1_data, interface2_data)
# instantiate
session.instantiate()

18
daemon/examples/lxd/switch.py
View file

@ -22,21 +22,21 @@ if __name__ == "__main__":
switch = session.add_node(SwitchNode)
# node one
node_one = session.add_node(LxcNode, options=options)
interface_one = prefixes.create_interface(node_one)
node1 = session.add_node(LxcNode, options=options)
interface1_data = prefixes.create_interface(node1)
# node two
node_two = session.add_node(LxcNode, options=options)
interface_two = prefixes.create_interface(node_two)
node2 = session.add_node(LxcNode, options=options)
interface2_data = prefixes.create_interface(node2)
# node three
node_three = session.add_node(CoreNode)
interface_three = prefixes.create_interface(node_three)
node3 = session.add_node(CoreNode)
interface3_data = prefixes.create_interface(node3)
# add links
session.add_link(node_one.id, switch.id, interface_one)
session.add_link(node_two.id, switch.id, interface_two)
session.add_link(node_three.id, switch.id, interface_three)
session.add_link(node1.id, switch.id, interface1_data)
session.add_link(node2.id, switch.id, interface2_data)
session.add_link(node3.id, switch.id, interface3_data)
# instantiate
session.instantiate()

12
daemon/examples/python/distributed_emane.py
View file

@ -52,17 +52,17 @@ def main(args):
# create local node, switch, and remote nodes
options = NodeOptions(model="mdr")
options.set_position(0, 0)
node_one = session.add_node(CoreNode, options=options)
node1 = session.add_node(CoreNode, options=options)
emane_net = session.add_node(EmaneNet)
session.emane.set_model(emane_net, EmaneIeee80211abgModel)
options.server = server_name
node_two = session.add_node(CoreNode, options=options)
node2 = session.add_node(CoreNode, options=options)
# create node interfaces and link
interface_one = prefixes.create_interface(node_one)
interface_two = prefixes.create_interface(node_two)
session.add_link(node_one.id, emane_net.id, interface_one=interface_one)
session.add_link(node_two.id, emane_net.id, interface_one=interface_two)
interface1_data = prefixes.create_interface(node1)
interface2_data = prefixes.create_interface(node2)
session.add_link(node1.id, emane_net.id, interface1_data=interface1_data)
session.add_link(node2.id, emane_net.id, interface1_data=interface2_data)
# instantiate session
session.instantiate()

10
daemon/examples/python/distributed_lxd.py
View file

@ -43,14 +43,14 @@ def main(args):
# create local node, switch, and remote nodes
options = NodeOptions(image="ubuntu:18.04")
node_one = session.add_node(LxcNode, options=options)
node1 = session.add_node(LxcNode, options=options)
options.server = server_name
node_two = session.add_node(LxcNode, options=options)
node2 = session.add_node(LxcNode, options=options)
# create node interfaces and link
interface_one = prefixes.create_interface(node_one)
interface_two = prefixes.create_interface(node_two)
session.add_link(node_one.id, node_two.id, interface_one, interface_two)
interface1_data = prefixes.create_interface(node1)
interface2_data = prefixes.create_interface(node2)
session.add_link(node1.id, node2.id, interface1_data, interface2_data)
# instantiate session
session.instantiate()

10
daemon/examples/python/distributed_ptp.py
View file

@ -43,14 +43,14 @@ def main(args):
# create local node, switch, and remote nodes
options = NodeOptions()
node_one = session.add_node(CoreNode, options=options)
node1 = session.add_node(CoreNode, options=options)
options.server = server_name
node_two = session.add_node(CoreNode, options=options)
node2 = session.add_node(CoreNode, options=options)
# create node interfaces and link
interface_one = prefixes.create_interface(node_one)
interface_two = prefixes.create_interface(node_two)
session.add_link(node_one.id, node_two.id, interface_one, interface_two)
interface1_data = prefixes.create_interface(node1)
interface2_data = prefixes.create_interface(node2)
session.add_link(node1.id, node2.id, interface1_data, interface2_data)
# instantiate session
session.instantiate()

12
daemon/examples/python/distributed_switch.py
View file

@ -45,17 +45,17 @@ def main(args):
session.set_state(EventTypes.CONFIGURATION_STATE)
# create local node, switch, and remote nodes
node_one = session.add_node(CoreNode)
node1 = session.add_node(CoreNode)
switch = session.add_node(SwitchNode)
options = NodeOptions()
options.server = server_name
node_two = session.add_node(CoreNode, options=options)
node2 = session.add_node(CoreNode, options=options)
# create node interfaces and link
interface_one = prefixes.create_interface(node_one)
interface_two = prefixes.create_interface(node_two)
session.add_link(node_one.id, switch.id, interface_one=interface_one)
session.add_link(node_two.id, switch.id, interface_one=interface_two)
interface1_data = prefixes.create_interface(node1)
interface2_data = prefixes.create_interface(node2)
session.add_link(node1.id, switch.id, interface1_data=interface1_data)
session.add_link(node2.id, switch.id, interface1_data=interface2_data)
# instantiate session
session.instantiate()

2
daemon/examples/python/emane80211.py
View file

@ -43,7 +43,7 @@ def main():
node = session.add_node(CoreNode, options=options)
node.setposition(x=150 * (i + 1), y=150)
interface = prefixes.create_interface(node)
session.add_link(node.id, emane_network.id, interface_one=interface)
session.add_link(node.id, emane_network.id, interface1_data=interface)
# instantiate session
session.instantiate()

2
daemon/examples/python/switch.py
View file

@ -32,7 +32,7 @@ def main():
for _ in range(NODES):
node = session.add_node(CoreNode)
interface = prefixes.create_interface(node)
session.add_link(node.id, switch.id, interface_one=interface)
session.add_link(node.id, switch.id, interface1_data=interface)
# instantiate session
session.instantiate()

2
daemon/examples/python/switch_inject.py
View file

@ -34,7 +34,7 @@ def main():
for _ in range(NODES):
node = session.add_node(CoreNode)
interface = prefixes.create_interface(node)
session.add_link(node.id, switch.id, interface_one=interface)
session.add_link(node.id, switch.id, interface1_data=interface)
# instantiate session
session.instantiate()

2
daemon/examples/python/wlan.py
View file

@ -36,7 +36,7 @@ def main():
for _ in range(NODES):
node = session.add_node(CoreNode, options=options)
interface = prefixes.create_interface(node)
session.add_link(node.id, wlan.id, interface_one=interface)
session.add_link(node.id, wlan.id, interface1_data=interface)
# instantiate session
session.instantiate()