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

initial sweeping changes to call all usages of various interface related variables and functions (netif, interface, if, ifc, etc) to use a consistent name iface

Browse source
This commit is contained in:
Blake Harnden 2020-06-16 09:30:16 -07:00
parent 0462c1b084
commit 0725199d6d
93 changed files with 1955 additions and 2156 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,13 +20,13 @@ if __name__ == "__main__":
# node one
options.config_services = ["DefaultRoute", "IPForward"]
node1 = session.add_node(CoreNode, options=options)
interface = prefixes.create_interface(node1)
session.add_link(node1.id, switch.id, interface1_data=interface)
interface = prefixes.create_iface(node1)
session.add_link(node1.id, switch.id, iface1_data=interface)
# node two
node2 = session.add_node(CoreNode, options=options)
interface = prefixes.create_interface(node2)
session.add_link(node2.id, switch.id, interface1_data=interface)
interface = prefixes.create_iface(node2)
session.add_link(node2.id, switch.id, iface1_data=interface)
# start session and run services
session.instantiate()

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

@ -18,11 +18,11 @@ if __name__ == "__main__":
# create node one
node1 = session.add_node(DockerNode, options=options)
interface1_data = prefixes.create_interface(node1)
interface1_data = prefixes.create_iface(node1)
# create node two
node2 = session.add_node(CoreNode)
interface2_data = prefixes.create_interface(node2)
interface2_data = prefixes.create_iface(node2)
# add link
session.add_link(node1.id, node2.id, interface1_data, interface2_data)

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

@ -19,11 +19,11 @@ if __name__ == "__main__":
# create node one
node1 = session.add_node(DockerNode, options=options)
interface1_data = prefixes.create_interface(node1)
interface1_data = prefixes.create_iface(node1)
# create node two
node2 = session.add_node(DockerNode, options=options)
interface2_data = prefixes.create_interface(node2)
interface2_data = prefixes.create_iface(node2)
# add link
session.add_link(node1.id, node2.id, interface1_data, interface2_data)

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

@ -23,15 +23,15 @@ if __name__ == "__main__":
# node one
node1 = session.add_node(DockerNode, options=options)
interface1_data = prefixes.create_interface(node1)
interface1_data = prefixes.create_iface(node1)
# node two
node2 = session.add_node(DockerNode, options=options)
interface2_data = prefixes.create_interface(node2)
interface2_data = prefixes.create_iface(node2)
# node three
node_three = session.add_node(CoreNode)
interface_three = prefixes.create_interface(node_three)
interface_three = prefixes.create_iface(node_three)
# add links
session.add_link(node1.id, switch.id, interface1_data)

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

@ -47,7 +47,7 @@ def main(args):
node1_id = response.node_id
# create link
interface1 = interface_helper.create_interface(node1_id, 0)
interface1 = interface_helper.create_iface(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)
@ -59,7 +59,7 @@ def main(args):
node2_id = response.node_id
# create link
interface1 = interface_helper.create_interface(node2_id, 0)
interface1 = interface_helper.create_iface(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)

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

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

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

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

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

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

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

@ -18,11 +18,11 @@ if __name__ == "__main__":
# create node one
node1 = session.add_node(LxcNode, options=options)
interface1_data = prefixes.create_interface(node1)
interface1_data = prefixes.create_iface(node1)
# create node two
node2 = session.add_node(CoreNode)
interface2_data = prefixes.create_interface(node2)
interface2_data = prefixes.create_iface(node2)
# add link
session.add_link(node1.id, node2.id, interface1_data, interface2_data)

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

@ -19,11 +19,11 @@ if __name__ == "__main__":
# create node one
node1 = session.add_node(LxcNode, options=options)
interface1_data = prefixes.create_interface(node1)
interface1_data = prefixes.create_iface(node1)
# create node two
node2 = session.add_node(LxcNode, options=options)
interface2_data = prefixes.create_interface(node2)
interface2_data = prefixes.create_iface(node2)
# add link
session.add_link(node1.id, node2.id, interface1_data, interface2_data)

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

@ -23,15 +23,15 @@ if __name__ == "__main__":
# node one
node1 = session.add_node(LxcNode, options=options)
interface1_data = prefixes.create_interface(node1)
interface1_data = prefixes.create_iface(node1)
# node two
node2 = session.add_node(LxcNode, options=options)
interface2_data = prefixes.create_interface(node2)
interface2_data = prefixes.create_iface(node2)
# node three
node3 = session.add_node(CoreNode)
interface3_data = prefixes.create_interface(node3)
interface3_data = prefixes.create_iface(node3)
# add links
session.add_link(node1.id, switch.id, interface1_data)

4
daemon/examples/myservices/sample.py
View file

@ -80,8 +80,8 @@ class MyService(CoreService):
if filename == cls.configs[0]:
cfg += "# auto-generated by MyService (sample.py)\n"
for ifc in node.netifs():
cfg += f'echo "Node {node.name} has interface {ifc.name}"\n'
for iface in node.get_ifaces():
cfg += f'echo "Node {node.name} has interface {iface.name}"\n'
elif filename == cls.configs[1]:
cfg += "echo hello"

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

@ -59,10 +59,10 @@ def main(args):
node2 = session.add_node(CoreNode, options=options)
# create node interfaces and link
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)
interface1_data = prefixes.create_iface(node1)
interface2_data = prefixes.create_iface(node2)
session.add_link(node1.id, emane_net.id, iface1_data=interface1_data)
session.add_link(node2.id, emane_net.id, iface1_data=interface2_data)
# instantiate session
session.instantiate()

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

@ -48,8 +48,8 @@ def main(args):
node2 = session.add_node(LxcNode, options=options)
# create node interfaces and link
interface1_data = prefixes.create_interface(node1)
interface2_data = prefixes.create_interface(node2)
interface1_data = prefixes.create_iface(node1)
interface2_data = prefixes.create_iface(node2)
session.add_link(node1.id, node2.id, interface1_data, interface2_data)
# instantiate session

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

@ -48,8 +48,8 @@ def main(args):
node2 = session.add_node(CoreNode, options=options)
# create node interfaces and link
interface1_data = prefixes.create_interface(node1)
interface2_data = prefixes.create_interface(node2)
interface1_data = prefixes.create_iface(node1)
interface2_data = prefixes.create_iface(node2)
session.add_link(node1.id, node2.id, interface1_data, interface2_data)
# instantiate session

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

@ -52,10 +52,10 @@ def main(args):
node2 = session.add_node(CoreNode, options=options)
# create node interfaces and link
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)
interface1_data = prefixes.create_iface(node1)
interface2_data = prefixes.create_iface(node2)
session.add_link(node1.id, switch.id, iface1_data=interface1_data)
session.add_link(node2.id, switch.id, iface1_data=interface2_data)
# instantiate session
session.instantiate()

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

@ -42,8 +42,8 @@ def main():
for i in range(NODES):
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, interface1_data=interface)
interface = prefixes.create_iface(node)
session.add_link(node.id, emane_network.id, iface1_data=interface)
# instantiate session
session.instantiate()

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

@ -31,8 +31,8 @@ def main():
# create nodes
for _ in range(NODES):
node = session.add_node(CoreNode)
interface = prefixes.create_interface(node)
session.add_link(node.id, switch.id, interface1_data=interface)
interface = prefixes.create_iface(node)
session.add_link(node.id, switch.id, iface1_data=interface)
# instantiate session
session.instantiate()

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

@ -33,8 +33,8 @@ def main():
# create nodes
for _ in range(NODES):
node = session.add_node(CoreNode)
interface = prefixes.create_interface(node)
session.add_link(node.id, switch.id, interface1_data=interface)
interface = prefixes.create_iface(node)
session.add_link(node.id, switch.id, iface1_data=interface)
# instantiate session
session.instantiate()

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

@ -35,8 +35,8 @@ def main():
options.set_position(0, 0)
for _ in range(NODES):
node = session.add_node(CoreNode, options=options)
interface = prefixes.create_interface(node)
session.add_link(node.id, wlan.id, interface1_data=interface)
interface = prefixes.create_iface(node)
session.add_link(node.id, wlan.id, iface1_data=interface)
# instantiate session
session.instantiate()