adjustments to remove global emane configuration, platform configurations can now be configured per nem, retrieve emane specific core settings from session options

daemon/core/api/grpc/client.py

@@ -28,10 +28,8 @@ from core.api.grpc.configservices_pb2 import (
 from core.api.grpc.core_pb2 import ExecuteScriptRequest, GetConfigRequest
 from core.api.grpc.emane_pb2 import (
     EmaneLinkRequest,
-    GetEmaneConfigRequest,
     GetEmaneEventChannelRequest,
     GetEmaneModelConfigRequest,
-    SetEmaneConfigRequest,
     SetEmaneModelConfigRequest,
 )
 from core.api.grpc.mobility_pb2 import (
@@ -253,7 +251,6 @@ class CoreGrpcClient:
         if asymmetric_links:
             asymmetric_links = [x.to_proto() for x in asymmetric_links]
         hooks = [x.to_proto() for x in session.hooks.values()]
-        emane_config = {k: v.value for k, v in session.emane_config.items()}
         emane_model_configs = []
         mobility_configs = []
         wlan_configs = []
@@ -313,7 +310,6 @@ class CoreGrpcClient:
             links=links,
             location=session.location.to_proto(),
             hooks=hooks,
-            emane_config=emane_config,
             emane_model_configs=emane_model_configs,
             wlan_configs=wlan_configs,
             mobility_configs=mobility_configs,
@@ -917,31 +913,6 @@ class CoreGrpcClient:
         response = self.stub.SetWlanConfig(request)
         return response.result
 
-    def get_emane_config(self, session_id: int) -> Dict[str, wrappers.ConfigOption]:
-        """
-        Get session emane configuration.
-
-        :param session_id: session id
-        :return: response with a list of configuration groups
-        :raises grpc.RpcError: when session doesn't exist
-        """
-        request = GetEmaneConfigRequest(session_id=session_id)
-        response = self.stub.GetEmaneConfig(request)
-        return wrappers.ConfigOption.from_dict(response.config)
-
-    def set_emane_config(self, session_id: int, config: Dict[str, str]) -> bool:
-        """
-        Set session emane configuration.
-
-        :param session_id: session id
-        :param config: emane configuration
-        :return: True for success, False otherwise
-        :raises grpc.RpcError: when session doesn't exist
-        """
-        request = SetEmaneConfigRequest(session_id=session_id, config=config)
-        response = self.stub.SetEmaneConfig(request)
-        return response.result
-
     def get_emane_model_config(
         self, session_id: int, node_id: int, model: str, iface_id: int = -1
     ) -> Dict[str, wrappers.ConfigOption]:

daemon/core/api/grpc/grpcutils.py

@@ -630,10 +630,6 @@ def get_node_config_service_configs(session: Session) -> List[ConfigServiceConfi
     return configs
 
 
-def get_emane_config(session: Session) -> Dict[str, common_pb2.ConfigOption]:
-    return get_config_options(session.emane.config, session.emane.emane_config)
-
-
 def get_mobility_node(
     session: Session, node_id: int, context: ServicerContext
 ) -> Union[WlanNode, EmaneNet]:
@@ -663,7 +659,6 @@ def convert_session(session: Session) -> wrappers.Session:
         x=x, y=y, z=z, lat=lat, lon=lon, alt=alt, scale=session.location.refscale
     )
     hooks = get_hooks(session)
-    emane_config = get_emane_config(session)
     emane_model_configs = get_emane_model_configs(session)
     wlan_configs = get_wlan_configs(session)
     mobility_configs = get_mobility_configs(session)
@@ -685,7 +680,6 @@ def convert_session(session: Session) -> wrappers.Session:
         default_services=default_services,
         location=location,
         hooks=hooks,
-        emane_config=emane_config,
         emane_model_configs=emane_model_configs,
         wlan_configs=wlan_configs,
         service_configs=service_configs,

daemon/core/api/grpc/server.py

@@ -33,14 +33,10 @@ from core.api.grpc.emane_pb2 import (
     EmaneLinkResponse,
     EmanePathlossesRequest,
     EmanePathlossesResponse,
-    GetEmaneConfigRequest,
-    GetEmaneConfigResponse,
     GetEmaneEventChannelRequest,
     GetEmaneEventChannelResponse,
     GetEmaneModelConfigRequest,
     GetEmaneModelConfigResponse,
-    SetEmaneConfigRequest,
-    SetEmaneConfigResponse,
     SetEmaneModelConfigRequest,
     SetEmaneModelConfigResponse,
 )
@@ -266,7 +262,6 @@ class CoreGrpcServer(core_pb2_grpc.CoreApiServicer):
             return core_pb2.StartSessionResponse(result=False, exceptions=exceptions)
 
         # emane configs
-        session.emane.config.update(request.emane_config)
         for config in request.emane_model_configs:
             _id = utils.iface_config_id(config.node_id, config.iface_id)
             session.emane.set_config(_id, config.model, config.config)
@@ -1045,36 +1040,6 @@ class CoreGrpcServer(core_pb2_grpc.CoreApiServicer):
             node.updatemodel(config)
         return SetWlanConfigResponse(result=True)
 
-    def GetEmaneConfig(
-        self, request: GetEmaneConfigRequest, context: ServicerContext
-    ) -> GetEmaneConfigResponse:
-        """
-        Retrieve EMANE configuration of a session
-
-        :param request: get-EMANE-configuration request
-        :param context: context object
-        :return: get-EMANE-configuration response
-        """
-        logger.debug("get emane config: %s", request)
-        session = self.get_session(request.session_id, context)
-        config = grpcutils.get_emane_config(session)
-        return GetEmaneConfigResponse(config=config)
-
-    def SetEmaneConfig(
-        self, request: SetEmaneConfigRequest, context: ServicerContext
-    ) -> SetEmaneConfigResponse:
-        """
-        Set EMANE configuration of a session
-
-        :param request: set-EMANE-configuration request
-        :param context: context object
-        :return: set-EMANE-configuration response
-        """
-        logger.debug("set emane config: %s", request)
-        session = self.get_session(request.session_id, context)
-        session.emane.config.update(request.config)
-        return SetEmaneConfigResponse(result=True)
-
     def GetEmaneModelConfig(
         self, request: GetEmaneModelConfigRequest, context: ServicerContext
     ) -> GetEmaneModelConfigResponse:

daemon/core/api/grpc/wrappers.py

@@ -783,7 +783,6 @@ class Session:
         x=0.0, y=0.0, z=0.0, lat=47.57917, lon=-122.13232, alt=2.0, scale=150.0
     )
     hooks: Dict[str, Hook] = field(default_factory=dict)
-    emane_config: Dict[str, ConfigOption] = field(default_factory=dict)
     metadata: Dict[str, str] = field(default_factory=dict)
     file: Path = None
     options: Dict[str, ConfigOption] = field(default_factory=dict)
@@ -836,7 +835,6 @@ class Session:
             default_services=default_services,
             location=SessionLocation.from_proto(proto.location),
             hooks=hooks,
-            emane_config=ConfigOption.from_dict(proto.emane_config),
             metadata=dict(proto.metadata),
             file=file_path,
             options=options,
@@ -889,11 +887,6 @@ class Session:
         self.links.append(link)
         return link
 
-    def set_emane(self, config: Dict[str, str]) -> None:
-        for key, value in config.items():
-            option = ConfigOption(name=key, value=value)
-            self.emane_config[key] = option
-
     def set_options(self, config: Dict[str, str]) -> None:
         for key, value in config.items():
             option = ConfigOption(name=key, value=value)