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

updates to grpc add_link to return created interface data

Browse source
This commit is contained in:
Blake Harnden 2020-02-14 13:18:05 -08:00
parent 0d3460e2ec
commit 71aeb98bb9
7 changed files with 77 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -42,7 +42,7 @@ from core.location.event import EventLoop
from core.location.mobility import BasicRangeModel, MobilityManager
from core.nodes.base import CoreNetworkBase, CoreNode, CoreNodeBase, NodeBase
from core.nodes.docker import DockerNode
from core.nodes.interface import GreTap
from core.nodes.interface import CoreInterface, GreTap
from core.nodes.lxd import LxcNode
from core.nodes.network import (
CtrlNet,
@ -301,7 +301,7 @@ class Session:
interface_one: InterfaceData = None,
interface_two: InterfaceData = None,
link_options: LinkOptions = None,
) -> None:
) -> Tuple[CoreInterface, CoreInterface]:
"""
Add a link between nodes.
@ -313,7 +313,7 @@ class Session:
data, defaults to none
:param link_options: data for creating link,
defaults to no options
:return: nothing
:return: tuple of created core interfaces, depending on link
"""
if not link_options:
link_options = LinkOptions()
@ -328,6 +328,9 @@ class Session:
if node_two:
node_two.lock.acquire()
node_one_interface = None
node_two_interface = None
try:
# wireless link
if link_options.type == LinkTypes.WIRELESS:
@ -353,6 +356,7 @@ class Session:
net_one.name,
)
interface = create_interface(node_one, net_one, interface_one)
node_one_interface = interface
link_config(net_one, interface, link_options)
# network to node
@ -363,6 +367,7 @@ class Session:
net_one.name,
)
interface = create_interface(node_two, net_one, interface_two)
node_two_interface = interface
if not link_options.unidirectional:
link_config(net_one, interface, link_options)
@ -374,6 +379,7 @@ class Session:
net_two.name,
)
interface = net_one.linknet(net_two)
node_one_interface = interface
link_config(net_one, interface, link_options)
if not link_options.unidirectional:
@ -426,6 +432,8 @@ class Session:
if node_two:
node_two.lock.release()
return node_one_interface, node_two_interface
def delete_link(
self,
node_one_id: int,