From 4245952c9432021bee60cac25b5e1880d85b3c4c Mon Sep 17 00:00:00 2001 From: Najmudheen <45681499+NajmudheenCT@users.noreply.github.com> Date: Thu, 12 Dec 2019 20:49:42 +0530 Subject: [PATCH 1/2] Replace underscore in host name (#315) --- .../vmware/ngc/adapters/opensds/RestClient.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/vmware/ngc/NGC-AdapterManager/src/main/java/org/opensds/vmware/ngc/adapters/opensds/RestClient.java b/vmware/ngc/NGC-AdapterManager/src/main/java/org/opensds/vmware/ngc/adapters/opensds/RestClient.java index 72c083d9c..cd63a55d9 100644 --- a/vmware/ngc/NGC-AdapterManager/src/main/java/org/opensds/vmware/ngc/adapters/opensds/RestClient.java +++ b/vmware/ngc/NGC-AdapterManager/src/main/java/org/opensds/vmware/ngc/adapters/opensds/RestClient.java @@ -330,13 +330,15 @@ JSONObject getStoragePool(String poolId) throws Exception { JSONObject getHost(String hostName) throws Exception { logger.info(String.format("----------OpenSDS Getting Host %s----------", hostName)); - JSONArray response = (JSONArray)request.get(String.format("/host/hosts?hostName=%s", hostName)); - logger.debug(String.format("OpenSDS Getting Host %s Response: %s", hostName, + // replace all "_" to "-" from hostName as OpenSDS does not support. + String osdsHostName = hostName.replaceAll("_","-"); + JSONArray response = (JSONArray)request.get(String.format("/host/hosts?hostName=%s", osdsHostName)); + logger.debug(String.format("OpenSDS Getting Host %s Response: %s", osdsHostName, response)); if (response.isEmpty()) { String msg = String.format("No Host Found"); - logger.info(String.format("OpenSDS Get Host for %s Error: %s", hostName, msg)); + logger.info(String.format("OpenSDS Get Host for %s Error: %s", osdsHostName, msg)); return new JSONObject(); } @@ -345,8 +347,10 @@ JSONObject getHost(String hostName) throws Exception { } JSONObject createHost(ConnectMO connect) throws Exception { - JSONObject requestData = new JSONObject(); - requestData.put("hostName", connect.name); + // replace all "_" to "-" from hostName as OpenSDS does not support. + String hostName = connect.name.replaceAll("_","-"); + JSONObject requestData = new JSONObject(); + requestData.put("hostName", hostName); requestData.put("ip", connect.initiatorIp); requestData.put("osType", connect.osType.toString().toLowerCase()); requestData.put("accessMode", OPENSDS_HOST_ACCESSMODE.getValue()); @@ -373,7 +377,7 @@ JSONObject createHost(ConnectMO connect) throws Exception { if (isFailed(response)) { String msg = String.format("Create Host %s Error %d: %s", - connect.name, getErrorCode(response), getErrorMessage(response)); + hostName, getErrorCode(response), getErrorMessage(response)); logger.error(msg); throw new Exception(msg); } From d2ea4873a6109b9a4424b4176fd63a5dae057649 Mon Sep 17 00:00:00 2001 From: sushanthakumar Date: Thu, 19 Dec 2019 12:16:15 +0530 Subject: [PATCH 2/2] Access capability fix for fileshare flow --- csi/plugins/file/fileshare.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/csi/plugins/file/fileshare.go b/csi/plugins/file/fileshare.go index 79fcca1c6..9acfa03f6 100755 --- a/csi/plugins/file/fileshare.go +++ b/csi/plugins/file/fileshare.go @@ -23,14 +23,18 @@ import ( csi "github.com/container-storage-interface/spec/lib/go/csi" "github.com/golang/glog" "github.com/opensds/nbp/csi/util" + nbputil "github.com/opensds/nbp/util" "github.com/opensds/opensds/client" - nbputil "github.com/opensds/nbp/util" "github.com/opensds/opensds/contrib/connector" "github.com/opensds/opensds/pkg/model" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) +const ( + DefaultAttachMode = "Read,Write" +) + type FileShare struct { Client *client.Client } @@ -46,7 +50,7 @@ func (f *FileShare) CreateFileShare(req *csi.CreateVolumeRequest) (*csi.CreateVo // fileshare name name = strings.Replace(req.GetName(), "-", "_", -1) - var attachMode = "read,write" + var attachMode = DefaultAttachMode for k, v := range req.GetParameters() { switch k { case common.ParamProfile: @@ -60,7 +64,7 @@ func (f *FileShare) CreateFileShare(req *csi.CreateVolumeRequest) (*csi.CreateVo case common.PublishAttachMode: if strings.ToLower(v) == "read" { // attach mode - attachMode = "read" + attachMode = "Read" } else { glog.Infof("use default attach mode: %s", attachMode) }