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

grpc: removed get model configs, can be achieved with get session

Browse source
This commit is contained in:
Blake Harnden 2021-05-04 13:51:17 -07:00
parent 639b29a134
commit 618d89b8db
5 changed files with 0 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -35,7 +35,6 @@ from core.api.grpc.emane_pb2 import (
GetEmaneConfigRequest,
GetEmaneEventChannelRequest,
GetEmaneModelConfigRequest,
GetEmaneModelConfigsRequest,
GetEmaneModelsRequest,
SetEmaneConfigRequest,
SetEmaneModelConfigRequest,
@ -1106,24 +1105,6 @@ class CoreGrpcClient:
response = self.stub.SetEmaneModelConfig(request)
return response.result
def get_emane_model_configs(
self, session_id: int
) -> List[wrappers.EmaneModelConfig]:
"""
Get all EMANE model configurations for a session.
:param session_id: session to get emane model configs
:return: list of emane model configs
:raises grpc.RpcError: when session doesn't exist
"""
request = GetEmaneModelConfigsRequest(session_id=session_id)
response = self.stub.GetEmaneModelConfigs(request)
configs = []
for config_proto in response.configs:
config = wrappers.EmaneModelConfig.from_proto(config_proto)
configs.append(config)
return configs
def save_xml(self, session_id: int, file_path: str) -> None:
"""
Save the current scenario to an XML file.

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

@ -47,8 +47,6 @@ from core.api.grpc.emane_pb2 import (
GetEmaneEventChannelResponse,
GetEmaneModelConfigRequest,
GetEmaneModelConfigResponse,
GetEmaneModelConfigsRequest,
GetEmaneModelConfigsResponse,
GetEmaneModelsRequest,
GetEmaneModelsResponse,
SetEmaneConfigRequest,
@ -1292,23 +1290,6 @@ class CoreGrpcServer(core_pb2_grpc.CoreApiServicer):
session.emane.set_model_config(_id, model_config.model, model_config.config)
return SetEmaneModelConfigResponse(result=True)
def GetEmaneModelConfigs(
self, request: GetEmaneModelConfigsRequest, context: ServicerContext
) -> GetEmaneModelConfigsResponse:
"""
Retrieve all EMANE model configurations of a session
:param request:
get-EMANE-model-configurations request
:param context: context object
:return: get-EMANE-model-configurations response that has all the EMANE
configurations
"""
logger.debug("get emane model configs: %s", request)
session = self.get_session(request.session_id, context)
configs = grpcutils.get_emane_model_configs(session)
return GetEmaneModelConfigsResponse(configs=configs)
def SaveXml(
self, request: core_pb2.SaveXmlRequest, context: ServicerContext
) -> core_pb2.SaveXmlResponse: