Rename VOLUME_HEALTH TO VOLUME_CONDITION to be consistent

container-storage-interface · Apr 1, 2020 · 22dcabc · 22dcabc
1 parent b8fd289
commit 22dcabc
Show file tree

Hide file tree

Showing 3 changed files with 296 additions and 282 deletions.
diff --git a/csi.proto b/csi.proto
@@ -857,7 +857,7 @@ message ListVolumesResponse {
 
     // volume_condition shows error conditions reported by the SP.
     // This field MUST be specified if the
-    // LIST_VOLUMES_VOLUME_HEALTH controller capability is supported.
+    // LIST_VOLUMES_VOLUME_CONDITION controller capability is supported.
     // This field is OPTIONAL.
     VolumeCondition volume_condition = 2 [(alpha_field) = true];
   }
@@ -897,26 +897,26 @@ message GetVolumeResponse {
     // A list of all `node_id` of nodes that the volume in this entry
     // is controller published on.
     // This field is OPTIONAL. If it is not specified and the SP has
-    // the LIST_VOLUMES_PUBLISHED_NODES controller capability, the CO
+    // the GET_VOLUME_PUBLISHED_NODES controller capability, the CO
     // MAY assume the volume is not controller published to any nodes.
     // If the field is not specified and the SP does not have the
-    // LIST_VOLUMES_PUBLISHED_NODES controller capability, the CO MUST
+    // GET_VOLUME_PUBLISHED_NODES controller capability, the CO MUST
     // not interpret this field.
     // published_node_ids MAY include nodes not published to or
     // reported by the SP. The CO MUST be resilient to that.
     repeated string published_node_ids = 1;
 
     // volume_condition shows error conditions reported by the SP.
     // This field MUST be specified if the
-    // VOLUME_HEALTH controller capability is supported.
+    // VOLUME_CONDITION controller capability is supported.
     VolumeCondition volume_condition = 2;
   }
 
   // This field is REQUIRED
   Volume volume = 1;
 
   // This field is OPTIONAL. This field MUST be specified if the
-  // VOLUME_HEALTH controller capability is supported.
+  // VOLUME_CONDITION controller capability is supported.
   VolumeStatus status = 2;
 }
 message GetCapacityRequest {
@@ -995,15 +995,19 @@ message ControllerServiceCapability {
       LIST_VOLUMES_PUBLISHED_NODES = 10;
 
       // Indicates the SP supports the
-      // ListVolumesResponse.entry.volume_health field
-      LIST_VOLUMES_VOLUME_HEALTH = 11 [(alpha_enum_value) = true];
+      // ListVolumesResponse.entry.volume_condition field
+      LIST_VOLUMES_VOLUME_CONDITION = 11 [(alpha_enum_value) = true];
 
       // Indicates the SP supports the GetVolume RPC
       GET_VOLUME = 12 [(alpha_enum_value) = true];
 
       // Indicates the SP supports the
-      // GetVolumeResponse.volume_health field
-      VOLUME_HEALTH = 13 [(alpha_enum_value) = true];
+      // GetVolumeResponse.volume_condition field
+      VOLUME_CONDITION = 13 [(alpha_enum_value) = true];
+
+      // Indicates the SP supports the
+      // GetVolumesResponse.published_node_ids field
+      GET_VOLUME_PUBLISHED_NODES = 14;
     }
 
     Type type = 1;
@@ -1393,10 +1397,10 @@ message NodeServiceCapability {
       GET_VOLUME_STATS = 2;
       // See VolumeExpansion for details.
       EXPAND_VOLUME = 3;
-      // If Plugin implements VOLUME_HEALTH capability
+      // If Plugin implements VOLUME_CONDITION capability
       // then it MUST implement NodeGetVolumeStats RPC
       // call for fetching volume health information.
-      VOLUME_HEALTH = 4 [(alpha_enum_value) = true];
+      VOLUME_CONDITION = 4 [(alpha_enum_value) = true];
     }
 
     Type type = 1;