Merge pull request logrhythm#79 from Robert-Weber/diskDiscovery

Disk discovery
harper-carroll · Oct 18, 2013 · b1f156e · b1f156e
2 parents a7feba4 + 147d4cf
commit b1f156e
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 0 deletions.
diff --git a/protofiles/CommandRequest.proto b/protofiles/CommandRequest.proto
@@ -11,6 +11,7 @@ message CommandRequest {
      NETWORK_CONFIG = 3;
      NTP_CONFIG = 4;
      SHUTDOWN = 5;
+     DRIVEINFO = 6;
   }
   required CommandType type = 1; 
   optional string stringArgOne = 2;

diff --git a/protofiles/DriveInfo.proto b/protofiles/DriveInfo.proto
@@ -0,0 +1,28 @@
+package protoMsg;
+
+option java_package = "com.logrhythm.nm.message";
+option java_outer_classname = "DriveInfoMsg";
+
+message DrivesInfo {
+   message DriveInfo {
+
+      message Partition {
+         optional uint32 number = 1 [default = 0];
+         optional uint64 startInB = 2 [default = 0];
+         optional uint64 endInB = 3 [default = 0];
+         optional uint64 sizeInB = 4 [default = 0];
+         optional string type = 5;
+         optional string fileSystem = 6;
+         optional string flags = 7;
+      }
+      optional string model = 1;
+      optional string device = 2;
+      optional uint64 capacityInB = 3 [default = 0];
+      repeated Partition partitions = 4;
+      optional string table = 5;
+
+   }
+
+   repeated DriveInfo drives = 1;
+
+}
diff --git a/scripts/buildProtoFiles.sh b/scripts/buildProtoFiles.sh
@@ -63,6 +63,7 @@ cd "$cppSrcDir"
 "$protoc" -I="$protoFileDir" --cpp_out=libcommand  "$protoFileDir"/CommandReply.proto
 "$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
 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
@@ -81,6 +82,7 @@ mv  libcommand/CommandRequest.pb.cc  libcommand/CommandRequest.pb.cpp
 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
 cd "$startDir"
 
 mkdir -p "$phpSrcDir"