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

daemon: refactoring to load emane models one time during startup, updates to account for this change

Browse source
This commit is contained in:
Blake Harnden 2021-05-07 10:40:18 -07:00
parent 1ddb7b7b24
commit 50e3aadc6b
32 changed files with 271 additions and 332 deletions
Download patch file Download diff file Expand all files Collapse all files

23
daemon/proto/core/api/grpc/core.proto
View file

@ -123,8 +123,6 @@ service CoreApi {
}
// globals
rpc GetEmaneModels (emane.GetEmaneModelsRequest) returns (emane.GetEmaneModelsResponse) {
}
rpc GetConfig (GetConfigRequest) returns (GetConfigResponse) {
}
}
@ -584,17 +582,16 @@ message Session {
repeated services.ServiceDefaults default_services = 7;
SessionLocation location = 8;
repeated Hook hooks = 9;
repeated string emane_models = 10;
map<string, common.ConfigOption> emane_config = 11;
repeated emane.GetEmaneModelConfig emane_model_configs = 12;
map<int32, common.MappedConfig> wlan_configs = 13;
repeated services.NodeServiceConfig service_configs = 14;
repeated configservices.ConfigServiceConfig config_service_configs = 15;
map<int32, common.MappedConfig> mobility_configs = 16;
map<string, string> metadata = 17;
string file = 18;
map<string, common.ConfigOption> options = 19;
repeated Server servers = 20;
map<string, common.ConfigOption> emane_config = 10;
repeated emane.GetEmaneModelConfig emane_model_configs = 11;
map<int32, common.MappedConfig> wlan_configs = 12;
repeated services.NodeServiceConfig service_configs = 13;
repeated configservices.ConfigServiceConfig config_service_configs = 14;
map<int32, common.MappedConfig> mobility_configs = 15;
map<string, string> metadata = 16;
string file = 17;
map<string, common.ConfigOption> options = 18;
repeated Server servers = 19;
}
message SessionSummary {

8
daemon/proto/core/api/grpc/emane.proto
View file

@ -21,14 +21,6 @@ message SetEmaneConfigResponse {
bool result = 1;
}
message GetEmaneModelsRequest {
int32 session_id = 1;
}
message GetEmaneModelsResponse {
repeated string models = 1;
}
message GetEmaneModelConfigRequest {
int32 session_id = 1;
int32 node_id = 2;