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

daemon: fixed sdt icons due to legacy gui removal, updated node.type to node.model to avoid variables with the same names with different meanings

Browse source
This commit is contained in:
Blake Harnden 2022-04-05 13:39:57 -07:00
parent ea751727b4
commit 5ee561b210
15 changed files with 73 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -748,9 +748,9 @@ class CoreGrpcClient:
:raises grpc.RpcError: when session doesn't exist
"""
defaults = []
for node_type in service_defaults:
services = service_defaults[node_type]
default = ServiceDefaults(node_type=node_type, services=services)
for model in service_defaults:
services = service_defaults[model]
default = ServiceDefaults(model=model, services=services)
defaults.append(default)
request = SetServiceDefaultsRequest(session_id=session_id, defaults=defaults)
response = self.stub.SetServiceDefaults(request)

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

@ -33,7 +33,7 @@ def handle_node_event(node_data: NodeData) -> core_pb2.Event:
node_proto = core_pb2.Node(
id=node.id,
name=node.name,
model=node.type,
model=node.model,
icon=node.icon,
position=position,
geo=geo,

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

@ -286,7 +286,6 @@ def get_node_proto(
lat=node.position.lat, lon=node.position.lon, alt=node.position.alt
)
services = [x.name for x in node.services]
model = node.type
node_dir = None
config_services = []
if isinstance(node, CoreNodeBase):
@ -341,7 +340,7 @@ def get_node_proto(
id=node.id,
name=node.name,
emane=emane_model,
model=model,
model=node.model,
type=node_type.value,
position=position,
geo=geo,
@ -729,8 +728,8 @@ def get_default_services(session: Session) -> List[ServiceDefaults]:
:return: list of default service sets
"""
default_services = []
for name, services in session.services.default_services.items():
default_service = ServiceDefaults(node_type=name, services=services)
for model, services in session.services.default_services.items():
default_service = ServiceDefaults(model=model, services=services)
default_services.append(default_service)
return default_services

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

@ -920,7 +920,7 @@ class CoreGrpcServer(core_pb2_grpc.CoreApiServicer):
session.services.default_services.clear()
for service_defaults in request.defaults:
session.services.default_services[
service_defaults.node_type
service_defaults.model
] = service_defaults.services
return SetServiceDefaultsResponse(result=True)

12
daemon/core/api/grpc/wrappers.py
View file

@ -210,12 +210,12 @@ class Service:
@dataclass
class ServiceDefault:
node_type: str
model: str
services: List[str]
@classmethod
def from_proto(cls, proto: services_pb2.ServiceDefaults) -> "ServiceDefault":
return ServiceDefault(node_type=proto.node_type, services=list(proto.services))
return ServiceDefault(model=proto.model, services=list(proto.services))
@dataclass
@ -884,9 +884,7 @@ class Session:
def from_proto(cls, proto: core_pb2.Session) -> "Session":
nodes: Dict[int, Node] = {x.id: Node.from_proto(x) for x in proto.nodes}
links = [Link.from_proto(x) for x in proto.links]
default_services = {
x.node_type: set(x.services) for x in proto.default_services
}
default_services = {x.model: set(x.services) for x in proto.default_services}
hooks = {x.file: Hook.from_proto(x) for x in proto.hooks}
file_path = Path(proto.file) if proto.file else None
options = ConfigOption.from_dict(proto.options)
@ -914,9 +912,9 @@ class Session:
options = {k: v.to_proto() for k, v in self.options.items()}
servers = [x.to_proto() for x in self.servers]
default_services = []
for node_type, services in self.default_services.items():
for model, services in self.default_services.items():
default_service = services_pb2.ServiceDefaults(
node_type=node_type, services=services
model=model, services=services
)
default_services.append(default_service)
file = str(self.file) if self.file else None