Merge pull request #190 from jdef/consolidate_probe_rpcs

spec: consolidate xxxProbe calls into Identity.Probe

Author: saad-ali

csi.proto

@@ -12,6 +12,9 @@ service Identity {
 
   rpc GetPluginCapabilities(GetPluginCapabilitiesRequest)
     returns (GetPluginCapabilitiesResponse) {}
+
+  rpc Probe (ProbeRequest)
+    returns (ProbeResponse) {}
 }
 
 service Controller {
@@ -36,9 +39,6 @@ service Controller {
   rpc GetCapacity (GetCapacityRequest)
     returns (GetCapacityResponse) {}
 
-  rpc ControllerProbe (ControllerProbeRequest)
-    returns (ControllerProbeResponse) {}
-
   rpc ControllerGetCapabilities (ControllerGetCapabilitiesRequest)
     returns (ControllerGetCapabilitiesResponse) {}  
 }
@@ -59,9 +59,6 @@ service Node {
   rpc NodeGetId (NodeGetIdRequest)
     returns (NodeGetIdResponse) {}
 
-  rpc NodeProbe (NodeProbeRequest)
-    returns (NodeProbeResponse) {}
-
   rpc NodeGetCapabilities (NodeGetCapabilitiesRequest)
     returns (NodeGetCapabilitiesResponse) {}
 }
@@ -148,6 +145,16 @@ message PluginCapability {
 }
 ////////
 ////////
+message ProbeRequest {
+  // The API version assumed by the CO. This is a REQUIRED field.
+  Version version = 1;
+}
+
+message ProbeResponse {
+  // Intentionally empty.
+}
+////////
+////////
 message CreateVolumeRequest {
   // The API version assumed by the CO. This field is REQUIRED.
   Version version = 1;
@@ -511,14 +518,6 @@ message GetCapacityResponse {
 }
 ////////
 ////////
-message ControllerProbeRequest {
-  // The API version assumed by the CO. This is a REQUIRED field.
-  Version version = 1;
-}
-
-message ControllerProbeResponse {}
-////////
-////////
 message ControllerGetCapabilitiesRequest {
   // The API version assumed by the CO. This is a REQUIRED field.
   Version version = 1;
@@ -730,14 +729,6 @@ message NodeGetIdResponse {
 }
 ////////
 ////////
-message NodeProbeRequest {
-  // The API version assumed by the CO. This is a REQUIRED field.
-  Version version = 1;
-}
-
-message NodeProbeResponse {}
-////////
-////////
 message NodeGetCapabilitiesRequest {
   // The API version assumed by the CO. This is a REQUIRED field.
   Version version = 1;