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

modified session.add_node parameter node_options, to just be options

Browse source
This commit is contained in:
Blake Harnden 2019-10-22 15:31:50 -07:00
parent ce411a07d7
commit ab0abd65aa
21 changed files with 100 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -769,18 +769,18 @@ class CoreGrpcServer(core_pb2_grpc.CoreApiServicer):
node_type = NodeTypes.DEFAULT.value
node_type = NodeTypes(node_type)
node_options = NodeOptions(name=node_proto.name, model=node_proto.model)
node_options.icon = node_proto.icon
node_options.opaque = node_proto.opaque
node_options.image = node_proto.image
node_options.services = node_proto.services
options = NodeOptions(name=node_proto.name, model=node_proto.model)
options.icon = node_proto.icon
options.opaque = node_proto.opaque
options.image = node_proto.image
options.services = node_proto.services
if node_proto.server:
node_options.emulation_server = node_proto.server
options.emulation_server = node_proto.server
position = node_proto.position
node_options.set_position(position.x, position.y)
node_options.set_location(position.lat, position.lon, position.alt)
node = session.add_node(_type=node_type, _id=node_id, node_options=node_options)
options.set_position(position.x, position.y)
options.set_location(position.lat, position.lon, position.alt)
node = session.add_node(_type=node_type, _id=node_id, options=options)
# configure emane if provided
emane_model = node_proto.emane
@ -856,18 +856,18 @@ class CoreGrpcServer(core_pb2_grpc.CoreApiServicer):
logging.debug("edit node: %s", request)
session = self.get_session(request.session_id, context)
node = self.get_node(session, request.node_id, context)
node_options = NodeOptions()
node_options.icon = request.icon
options = NodeOptions()
options.icon = request.icon
x = request.position.x
y = request.position.y
node_options.set_position(x, y)
options.set_position(x, y)
lat = request.position.lat
lon = request.position.lon
alt = request.position.alt
node_options.set_location(lat, lon, alt)
options.set_location(lat, lon, alt)
result = True
try:
session.update_node(node.id, node_options)
session.update_node(node.id, options)
node_data = node.data(0)
session.broadcast_node(node_data)
except CoreError:

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

@ -698,12 +698,12 @@ class CoreHandler(socketserver.BaseRequestHandler):
node_id = message.get_tlv(NodeTlvs.NUMBER.value)
node_options = NodeOptions(
options = NodeOptions(
name=message.get_tlv(NodeTlvs.NAME.value),
model=message.get_tlv(NodeTlvs.MODEL.value),
)
node_options.set_position(
options.set_position(
x=message.get_tlv(NodeTlvs.X_POSITION.value),
y=message.get_tlv(NodeTlvs.Y_POSITION.value),
)
@ -717,19 +717,19 @@ class CoreHandler(socketserver.BaseRequestHandler):
alt = message.get_tlv(NodeTlvs.ALTITUDE.value)
if alt is not None:
alt = float(alt)
node_options.set_location(lat=lat, lon=lon, alt=alt)
options.set_location(lat=lat, lon=lon, alt=alt)
node_options.icon = message.get_tlv(NodeTlvs.ICON.value)
node_options.canvas = message.get_tlv(NodeTlvs.CANVAS.value)
node_options.opaque = message.get_tlv(NodeTlvs.OPAQUE.value)
node_options.emulation_server = message.get_tlv(NodeTlvs.EMULATION_SERVER.value)
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)
services = message.get_tlv(NodeTlvs.SERVICES.value)
if services:
node_options.services = services.split("|")
options.services = services.split("|")
if message.flags & MessageFlags.ADD.value:
node = self.session.add_node(node_type, node_id, node_options)
node = self.session.add_node(node_type, node_id, options)
if node:
if message.flags & MessageFlags.STRING.value:
self.node_status_request[node.id] = True
@ -748,7 +748,7 @@ class CoreHandler(socketserver.BaseRequestHandler):
replies.append(coreapi.CoreNodeMessage.pack(flags, tlvdata))
# node update
else:
self.session.update_node(node_id, node_options)
self.session.update_node(node_id, options)
return replies