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

modified grpc set node service and node service file to use messages for their config, updated start session to leverage these messages to set them when starting a session

Browse source
This commit is contained in:
Blake Harnden 2019-11-11 10:19:30 -08:00
parent b88abd0f74
commit 18c9904d58
5 changed files with 90 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -144,6 +144,8 @@ message StartSessionRequest {
repeated WlanConfig wlan_configs = 7;
repeated EmaneModelConfig emane_model_configs = 8;
repeated MobilityConfig mobility_configs = 9;
repeated ServiceConfig service_configs = 10;
repeated ServiceFileConfig service_file_configs = 11;
}
message StartSessionResponse {
@ -554,11 +556,7 @@ message GetNodeServiceFileResponse {
message SetNodeServiceRequest {
int32 session_id = 1;
int32 node_id = 2;
string service = 3;
repeated string startup = 4;
repeated string validate = 5;
repeated string shutdown = 6;
ServiceConfig config = 2;
}
message SetNodeServiceResponse {
@ -567,10 +565,7 @@ message SetNodeServiceResponse {
message SetNodeServiceFileRequest {
int32 session_id = 1;
int32 node_id = 2;
string service = 3;
string file = 4;
string data = 5;
ServiceFileConfig config = 2;
}
message SetNodeServiceFileResponse {
@ -718,6 +713,21 @@ message EmaneModelConfig {
map<string, string> config = 4;
}
message ServiceConfig {
int32 node_id = 1;
string service = 2;
repeated string startup = 3;
repeated string validate = 4;
repeated string shutdown = 5;
}
message ServiceFileConfig {
int32 node_id = 1;
string service = 2;
string file = 3;
string data = 4;
}
message MessageType {
enum Enum {
NONE = 0;