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

updated netif function to remove net parameter, since it was not used

Browse source
This commit is contained in:
bharnden 2019-10-23 09:15:27 -07:00
parent 3dccd073f2
commit 39c40d2a8c
4 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
daemon/core/emulator/emudata.py
View file

@ -29,7 +29,7 @@ def create_interface(node, network, interface_data):
ifindex=interface_data.id,
ifname=interface_data.name,
)
return node.netif(interface_data.id, network)
return node.netif(interface_data.id)
def link_config(network, interface, link_options, devname=None, interface_two=None):

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

@ -594,11 +594,11 @@ class Session(object):
raise CoreError("modify link for unknown nodes")
elif not node_one:
# node1 = layer 2node, node2 = layer3 node
interface = node_two.netif(interface_two_id, net_one)
interface = node_two.netif(interface_two_id)
link_config(net_one, interface, link_options)
elif not node_two:
# node2 = layer 2node, node1 = layer3 node
interface = node_one.netif(interface_one_id, net_one)
interface = node_one.netif(interface_one_id)
link_config(net_one, interface, link_options)
else:
common_networks = node_one.commonnets(node_two)