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

revert logging back to info, removed Rj45Models enum as it was not being used, updated linktypes enum to be used directly

Browse source
This commit is contained in:
Blake Harnden 2020-03-10 22:48:05 -07:00
parent 1e8d1ecd9f
commit f277e96c9a
13 changed files with 12 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -80,7 +80,7 @@ def handle_link_event(event: LinkData) -> core_pb2.LinkEvent:
unidirectional=event.unidirectional,
)
link = core_pb2.Link(
type=event.link_type,
type=event.link_type.value,
node_one_id=event.node1_id,
node_two_id=event.node2_id,
interface_one=interface_one,

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

@ -325,7 +325,7 @@ def convert_link(session: Session, link_data: LinkData) -> core_pb2.Link:
)
return core_pb2.Link(
type=link_data.link_type,
type=link_data.link_type.value,
node_one_id=link_data.node1_id,
node_two_id=link_data.node2_id,
interface_one=interface_one,

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

@ -1501,7 +1501,7 @@ class CoreGrpcServer(core_pb2_grpc.CoreApiServicer):
flag = MessageFlags.DELETE.value
link = LinkData(
message_type=flag,
link_type=LinkTypes.WIRELESS.value,
link_type=LinkTypes.WIRELESS,
node1_id=node_one.id,
node2_id=node_two.id,
network_id=emane_one.id,

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

@ -356,7 +356,7 @@ class CoreHandler(socketserver.BaseRequestHandler):
(LinkTlvs.BURST, link_data.burst),
(LinkTlvs.SESSION, link_data.session),
(LinkTlvs.MBURST, link_data.mburst),
(LinkTlvs.TYPE, link_data.link_type),
(LinkTlvs.TYPE, link_data.link_type.value),
(LinkTlvs.GUI_ATTRIBUTES, link_data.gui_attributes),
(LinkTlvs.UNIDIRECTIONAL, link_data.unidirectional),
(LinkTlvs.EMULATION_ID, link_data.emulation_id),