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

daemon: fixed naming issues with wireless/emane model attributes, fixed issue with emane controlnet updown script

Browse source
This commit is contained in:
Blake Harnden 2022-05-09 21:11:14 -07:00
parent 2e4d0e0cea
commit 8ba169c758
10 changed files with 64 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

2
daemon/core/api/grpc/grpcutils.py
View file

@ -297,7 +297,7 @@ def get_node_proto(
channel = str(node.ctrlchnlname)
emane_model = None
if isinstance(node, EmaneNet):
emane_model = node.model.name
emane_model = node.wireless_model.name
image = None
if isinstance(node, (DockerNode, LxcNode)):
image = node.image

6
daemon/core/api/grpc/server.py
View file

@ -1310,7 +1310,7 @@ class CoreGrpcServer(core_pb2_grpc.CoreApiServicer):
) -> WlanLinkResponse:
session = self.get_session(request.session_id, context)
wlan = self.get_node(session, request.wlan, context, WlanNode)
if not isinstance(wlan.model, BasicRangeModel):
if not isinstance(wlan.wireless_model, BasicRangeModel):
context.abort(
grpc.StatusCode.NOT_FOUND,
f"wlan node {request.wlan} is not using BasicRangeModel",
@ -1332,7 +1332,9 @@ class CoreGrpcServer(core_pb2_grpc.CoreApiServicer):
wlan.link(node1_iface, node2_iface)
else:
wlan.unlink(node1_iface, node2_iface)
wlan.model.sendlinkmsg(node1_iface, node2_iface, unlink=not request.linked)
wlan.wireless_model.sendlinkmsg(
node1_iface, node2_iface, unlink=not request.linked
)
result = True
return WlanLinkResponse(result=result)