Merge pull request logrhythm#89 from kjell-hedstrom/MaxPCapUsageComma…

…nd_v2.0 Max p cap usage command v2.0
harper-carroll · Dec 12, 2013 · 90182d2 · 90182d2
2 parents bbf59a1 + 2551623
commit 90182d2
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 0 deletions.
diff --git a/protofiles/CommandRequest.proto b/protofiles/CommandRequest.proto
@@ -14,6 +14,7 @@ message CommandRequest {
      DRIVEINFO = 6;
      TEST = 7;
      COMMAND_STATUS = 8;
+     CONFIG_REQUEST = 9;
   }
   required CommandType type = 1; 
   optional string stringArgOne = 2;

diff --git a/protofiles/ConfigDefaults.proto b/protofiles/ConfigDefaults.proto
@@ -0,0 +1,19 @@
+package protoMsg;
+import "ConfTypeMsg.proto";
+
+option java_package = "com.logrhythm.nm.message";
+option java_outer_classname = "ConfigDefaultsMsg";
+
+message ConfigDefaults {
+   message DefaultValues {
+      optional ConfType.Type type = 1; 
+      optional string configName = 2;
+      optional string defaultU64 = 3;
+      optional string maxU64 = 4;
+      optional string minU64 = 5;
+
+   }
+
+   repeated DefaultValues values = 1;
+
+}
diff --git a/protofiles/ConfigDefaultsRequest.proto b/protofiles/ConfigDefaultsRequest.proto
@@ -0,0 +1,14 @@
+package protoMsg;
+import "ConfTypeMsg.proto";
+
+option java_package = "com.logrhythm.nm.message";
+option java_outer_classname = "ConfigDefaultsRequestMsg";
+
+// See also ConfigDefaults.proto
+// For the ConfType request config parameters
+// The CommandReply will contain the ConfigDefaults.proto with
+// parameter name, default value, max, min
+message ConfigDefaultsRequest {
+   optional ConfType.Type type = 1; 
+   repeated string requestedConfigParams = 2;
+}
diff --git a/scripts/buildProtoFiles.sh b/scripts/buildProtoFiles.sh
@@ -64,6 +64,8 @@ cd "$cppSrcDir"
 "$protoc" -I="$protoFileDir" --cpp_out=libprocess  "$protoFileDir"/ProcessRequest.proto
 "$protoc" -I="$protoFileDir" --cpp_out=libprocess  "$protoFileDir"/ProcessReply.proto
 "$protoc" -I="$protoFileDir" --cpp_out=libcommand  "$protoFileDir"/DriveInfo.proto
+"$protoc" -I="$protoFileDir" --cpp_out=libcommand  "$protoFileDir"/ConfigDefaults.proto
+"$protoc" -I="$protoFileDir" --cpp_out=libcommand  "$protoFileDir"/ConfigDefaultsRequest.proto
 mv  liblrdpi/DpiMsgLRproto.pb.cc liblrdpi/DpiMsgLRproto.pb.cpp
 mv  liblrdpi/Applications.pb.cc liblrdpi/Applications.pb.cpp
 mv  libstats/StatsMsg.pb.cc  libstats/StatsMsg.pb.cpp
@@ -83,6 +85,8 @@ mv  libcommand/CommandReply.pb.cc  libcommand/CommandReply.pb.cpp
 mv  libprocess/ProcessRequest.pb.cc  libprocess/ProcessRequest.pb.cpp
 mv  libprocess/ProcessReply.pb.cc  libprocess/ProcessReply.pb.cpp
 mv  libcommand/DriveInfo.pb.cc  libcommand/DriveInfo.pb.cpp
+mv  libcommand/ConfigDefaults.pb.cc  libcommand/ConfigDefaults.pb.cpp
+mv  libcommand/ConfigDefaultsRequest.pb.cc  libcommand/ConfigDefaultsRequest.pb.cpp
 cd "$startDir"
 
 mkdir -p "$phpSrcDir"