NodeStageVolume modifications: added publish_volume_info to response.…

… Changed credential naming. Added credentials to unstage.

csi.proto

@@ -337,7 +337,7 @@ message ControllerPublishVolumeRequest {
 
 message ControllerPublishVolumeResponse {
   // The SP specific information that will be passed to the Plugin in
-  // the subsequent `NodeStageVolume` and `NodePublishVolume` calls
+  // the subsequent `NodeStageVolume` or `NodePublishVolume` calls
   // for the given volume.
   // This information is opaque to the CO. This field is OPTIONAL.
   map<string, string> publish_info = 1;
@@ -536,26 +536,32 @@ message NodeStageVolumeRequest {
   // This is a REQUIRED field.
   VolumeCapability volume_capability = 5;
 
-  // End user credentials used to authenticate/authorize node
-  // publish request.
+  // Credentials used by Node plugin to authenticate/authorize node
+  // stage request.
   // This field contains credential data, for example username and
   // password. Each key must consist of alphanumeric characters, '-',
   // '_' or '.'. Each value MUST contain a valid string. An SP MAY
   // choose to accept binary (non-string) data by using a binary-to-text
   // encoding scheme, like base64. An SP SHALL advertise the
   // requirements for credentials in documentation. COs SHALL permit
-  // users to pass through the required credentials. This information is
+  // passing through the required credentials. This information is
   // sensitive and MUST be treated as such (not logged, etc.) by the CO.
   // This field is OPTIONAL.
-  map<string, string> user_credentials = 6;
+  map<string, string> node_stage_credentials = 6;
 
   // Attributes of the volume to publish. This field is OPTIONAL and
   // MUST match the attributes of the VolumeInfo identified by
   // `volume_id`.
   map<string,string> volume_attributes = 7;
 }
 
-message NodeStageVolumeResponse {}
+message NodeStageVolumeResponse {
+  // The SP specific information that will be passed to the Plugin in
+  // the subsequent `NodePublishVolume` calls
+  // for the given volume.
+  // This information is opaque to the CO. This field is OPTIONAL.
+  map<string, string> publish_volume_info = 1;
+}
 ////////
 ////////
 message NodeUnstageVolumeRequest {
@@ -569,6 +575,19 @@ message NodeUnstageVolumeRequest {
   // path in the root filesystem of the process serving this request.
   // This is a REQUIRED field.
   string staging_target_path = 3;
+
+  // Credentials used by Node plugin to authenticate/authorize node
+  // unstage request.
+  // This field contains credential data, for example username and
+  // password. Each key must consist of alphanumeric characters, '-',
+  // '_' or '.'. Each value MUST contain a valid string. An SP MAY
+  // choose to accept binary (non-string) data by using a binary-to-text
+  // encoding scheme, like base64. An SP SHALL advertise the
+  // requirements for credentials in documentation. COs SHALL permit
+  // passing through the required credentials. This information is
+  // sensitive and MUST be treated as such (not logged, etc.) by the CO.
+  // This field is OPTIONAL.
+  map<string, string> node_unstage_credentials = 4;
 }
 
 message NodeUnstageVolumeResponse {}