From d64255d7bd23bd5a54b770144c50e8d6350adcbe Mon Sep 17 00:00:00 2001 From: Ben Swartzlander Date: Wed, 21 Jul 2021 13:05:36 -0400 Subject: [PATCH] Change required capability for published_node_ids in GetVolume Instead of PUBLISH_UNPUBLISH_VOLUME, use the LIST_VOLUMES_PUBLISHED_NODES capability to control the published_node_ids field in ControllerGetVolume. This change is to be more consistent with the existing behavior. It is a backwards-incompatible change, but the API is alpha. Also clarify the LIST_VOLUMES_PUBLISHED_NODES docs. --- csi.proto | 6 ++++-- spec.md | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/csi.proto b/csi.proto index f2ba8b97..485b8400 100644 --- a/csi.proto +++ b/csi.proto @@ -922,7 +922,7 @@ message ControllerGetVolumeResponse { // A list of all the `node_id` of nodes that this volume is // controller published on. // This field is OPTIONAL. - // This field MUST be specified if the PUBLISH_UNPUBLISH_VOLUME + // This field MUST be specified if the LIST_VOLUMES_PUBLISHED_NODES // controller capability is supported. // published_node_ids MAY include nodes not published to or // reported by the SP. The CO MUST be resilient to that. @@ -1049,7 +1049,9 @@ message ControllerServiceCapability { EXPAND_VOLUME = 9; // Indicates the SP supports the - // ListVolumesResponse.entry.published_nodes field + // ListVolumesResponse.entry.published_node_ids field and the + // ControllerGetVolumeResponse.published_node_ids field. + // The SP MUST also support PUBLISH_UNPUBLISH_VOLUME. LIST_VOLUMES_PUBLISHED_NODES = 10; // Indicates that the Controller service can report volume diff --git a/spec.md b/spec.md index c9568985..5c9c4e54 100644 --- a/spec.md +++ b/spec.md @@ -1553,7 +1553,7 @@ message ControllerGetVolumeResponse { // A list of all the `node_id` of nodes that this volume is // controller published on. // This field is OPTIONAL. - // This field MUST be specified if the PUBLISH_UNPUBLISH_VOLUME + // This field MUST be specified if the LIST_VOLUMES_PUBLISHED_NODES // controller capability is supported. // published_node_ids MAY include nodes not published to or // reported by the SP. The CO MUST be resilient to that. @@ -1709,7 +1709,9 @@ message ControllerServiceCapability { EXPAND_VOLUME = 9; // Indicates the SP supports the - // ListVolumesResponse.entry.published_nodes field + // ListVolumesResponse.entry.published_node_ids field and the + // ControllerGetVolumeResponse.published_node_ids field. + // The SP MUST also support PUBLISH_UNPUBLISH_VOLUME. LIST_VOLUMES_PUBLISHED_NODES = 10; // Indicates that the Controller service can report volume