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

refactored NodeData and NodeOptions to use server instead of emulation_server

Browse source
This commit is contained in:
bharnden 2019-10-22 20:50:01 -07:00
parent ab0abd65aa
commit cb81095b64
12 changed files with 23 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -775,7 +775,7 @@ class CoreGrpcServer(core_pb2_grpc.CoreApiServicer):
options.image = node_proto.image
options.services = node_proto.services
if node_proto.server:
options.emulation_server = node_proto.server
options.server = node_proto.server
position = node_proto.position
options.set_position(position.x, position.y)

2
daemon/core/api/tlv/corehandlers.py
View file

@ -722,7 +722,7 @@ class CoreHandler(socketserver.BaseRequestHandler):
options.icon = message.get_tlv(NodeTlvs.ICON.value)
options.canvas = message.get_tlv(NodeTlvs.CANVAS.value)
options.opaque = message.get_tlv(NodeTlvs.OPAQUE.value)
options.emulation_server = message.get_tlv(NodeTlvs.EMULATION_SERVER.value)
options.server = message.get_tlv(NodeTlvs.EMULATION_SERVER.value)
services = message.get_tlv(NodeTlvs.SERVICES.value)
if services:

2
daemon/core/api/tlv/dataconversion.py
View file

@ -24,7 +24,7 @@ def convert_node(node_data):
(NodeTlvs.IP6_ADDRESS, node_data.ip6_address),
(NodeTlvs.MODEL, node_data.model),
(NodeTlvs.EMULATION_ID, node_data.emulation_id),
(NodeTlvs.EMULATION_SERVER, node_data.emulation_server),
(NodeTlvs.EMULATION_SERVER, node_data.server),
(NodeTlvs.SESSION, node_data.session),
(NodeTlvs.X_POSITION, node_data.x_position),
(NodeTlvs.Y_POSITION, node_data.y_position),