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

updated gui to display custom icons if set, updated grpc to send custon icon and image data when present

Browse source
This commit is contained in:
Blake Harnden 2019-12-13 08:48:40 -08:00
parent fb63d7e8b3
commit d343bd0655
3 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -393,15 +393,14 @@ class CoreGrpcServer(core_pb2_grpc.CoreApiServicer):
position = core_pb2.Position(
x=node.position.x, y=node.position.y, z=node.position.z
)
services = getattr(node, "services", [])
if services is None:
services = []
services = [x.name for x in services]
emane_model = None
if isinstance(node, EmaneNet):
emane_model = node.model.name
image = getattr(node, "image", None)
node_proto = core_pb2.Node(
id=node.id,
@ -411,6 +410,8 @@ class CoreGrpcServer(core_pb2_grpc.CoreApiServicer):
type=node_type.value,
position=position,
services=services,
icon=node.icon,
image=image,
)
if isinstance(node, (DockerNode, LxcNode)):
node_proto.image = node.image