Merge development branch into master for v0.10.2 release (#358)

* Adding First set of Unit Test files for VRO * ReadMe and Configuration file for VRO test Automation * format test files, correct spacing * NGC Automation for OpenSDS adapter * hostpath type change for iscsi dir (#10) * vendor changes update * Fix for list snapshot issue * add only snapshots whose status is available to the list * Fix for 341 342 309 * [CSI] Update version of k8s csi container images (#333) * Update version of k8s csi image (#7) * csi image version update for file plugin deployment Co-authored-by: Erik <[email protected]> Co-authored-by: Ashit Kumar <[email protected]> * [CSI] Support for multiple initiator infos (#335) * Initiator fix * Update vendor Co-authored-by: Erik <[email protected]> Co-authored-by: Ashit Kumar <[email protected]> * [CSI] Removal of host devices during volume detach (#336) * remove host device while unstage * Fix sg_scan not found issue (#6) Co-authored-by: liuqing <[email protected]> * Update csi/plugins/block/volume.go Co-Authored-By: Ashit Kumar <[email protected]> Co-authored-by: zengyingzhe <[email protected]> Co-authored-by: Erik <[email protected]> Co-authored-by: liuqing <[email protected]> Co-authored-by: Ashit Kumar <[email protected]> * Declaring constants for unit tests * DatastoreServiceImpl create method Unit testing (#350) * modified: pom.xml new file: src/test/java/service/impl/DatastoreTest.java * renamed: src/test/java/service/impl/DatastoreTest.java -> src/test/java/org/opensds/vmware/ngc/service/impl/DatastoreTest.java * modified: src/test/java/org/opensds/vmware/ngc/service/impl/DatastoreTest.java Co-authored-by: Ashit Kumar <[email protected]> * Delete Gopkg.lock * Revert "Delete Gopkg.lock" This reverts commit e2d8d3e. * syncing with dec * updating default test config values * updating default test config values * Conflict resolution * vendor update based on v0.10.0 (#364) Co-authored-by: Najmudheen <[email protected]> Co-authored-by: Najmudheen <[email protected]> Co-authored-by: Ashit Kumar <[email protected]> Co-authored-by: Erik <[email protected]> Co-authored-by: zengyingzhe <[email protected]> Co-authored-by: liuqing <[email protected]> Co-authored-by: soumiksgithub <[email protected]> Co-authored-by: Sanil Kumar <[email protected]>
sodafoundation · Feb 28, 2020 · 4299903 · 4299903
1 parent ca42166
commit 4299903
Show file tree

Hide file tree

Showing 43 changed files with 498 additions and 108 deletions.
diff --git a/cindercompatibleapi/converter/volume.go b/cindercompatibleapi/converter/volume.go
@@ -447,18 +447,19 @@ func InitializeConnectionReq(initializeConnectionReq *InitializeConnectionReqSpe
 				continue
 			}
 
-			portName, err := volDriver.GetInitiatorInfo()
+			portNameList, err := volDriver.GetInitiatorInfo()
 			if err != nil {
 				glog.Errorf("cannot get initiator for driver volume type %s, err: %v", volDriverType, err)
 				continue
 			}
 
-			initiator := &model.Initiator{
-				PortName: portName,
-				Protocol: volDriverType,
+			for _, portName := range portNameList {
+				initiator := &model.Initiator{
+					PortName: portName,
+					Protocol: volDriverType,
+				}
+				initiators = append(initiators, initiator)
 			}
-
-			initiators = append(initiators, initiator)
 		}
 
 		if len(initiators) == 0 {

diff --git a/csi/cmd/block/Dockerfile b/csi/cmd/block/Dockerfile
@@ -12,6 +12,7 @@ COPY nvme-cli-1.8.1  /nvme-cli-1.8.1
 RUN apt-get update && \
     apt-get -y install open-iscsi \
     sysfsutils \
+    sg3-utils \
     kmod \
     ceph-common \
     nfs-common \

diff --git a/csi/common/node.go b/csi/common/node.go
@@ -137,18 +137,22 @@ func NodeGetInfo(
 				continue
 			}
 
-			portName, err := volDriver.GetInitiatorInfo()
+			portNameList, err := volDriver.GetInitiatorInfo()
 			if err != nil {
 				glog.Errorf("cannot get initiator for driver volume type %s, err: %v", volDriverType, err)
 				continue
 			}
 
-			initiator := &model.Initiator{
-				PortName: portName,
-				Protocol: volDriverType,
-			}
+			for _, portName := range portNameList {
+				if portName != " " {
+					initiator := &model.Initiator{
+						PortName: portName,
+						Protocol: volDriverType,
+					}
 
-			initiators = append(initiators, initiator)
+					initiators = append(initiators, initiator)
+				}
+			}
 		}
 
 		if len(initiators) == 0 {

diff --git a/csi/deploy/kubernetes/block/csi-attacher-opensdsplugin.yaml b/csi/deploy/kubernetes/block/csi-attacher-opensdsplugin.yaml
@@ -33,7 +33,7 @@ spec:
       serviceAccount: csi-attacher-block
       containers:
         - name: csi-attacher
-          image: quay.io/k8scsi/csi-attacher:v1.1.1
+          image: quay.io/k8scsi/csi-attacher:v1.2.1
           args:
             - "--v=5"
             - "--csi-address=$(ADDRESS)"
@@ -144,7 +144,7 @@ spec:
         - name: iscsi-dir
           hostPath:
             path: /etc/iscsi/
-            type: Directory
+            type: DirectoryOrCreate
         - name: ceph-dir
           hostPath:
             path: /etc/ceph/

diff --git a/csi/deploy/kubernetes/block/csi-nodeplugin-opensdsplugin.yaml b/csi/deploy/kubernetes/block/csi-nodeplugin-opensdsplugin.yaml
@@ -21,7 +21,7 @@ spec:
       hostNetwork: true
       containers:
         - name: node-driver-registrar
-          image: quay.io/k8scsi/csi-node-driver-registrar:v1.1.0
+          image: quay.io/k8scsi/csi-node-driver-registrar:v1.2.0
           args:
             - "--v=5"
             - "--csi-address=/csi/csi.sock"
@@ -155,7 +155,7 @@ spec:
         - name: iscsi-dir
           hostPath:
             path: /etc/iscsi/
-            type: Directory
+            type: DirectoryOrCreate
         - name: ceph-dir
           hostPath:
             path: /etc/ceph/
@@ -171,4 +171,4 @@ spec:
         - name: hosts
           hostPath:
              path: /etc
-             type: Directory
+             type: Directory
diff --git a/csi/deploy/kubernetes/block/csi-provisioner-opensdsplugin.yaml b/csi/deploy/kubernetes/block/csi-provisioner-opensdsplugin.yaml
@@ -33,7 +33,7 @@ spec:
       serviceAccount: csi-provisioner-block
       containers:
         - name: csi-provisioner
-          image: quay.io/k8scsi/csi-provisioner:v1.1.0
+          image: quay.io/k8scsi/csi-provisioner:v1.4.0
           args:
             - "--provisioner=csi-opensdsplugin-block"
             - "--csi-address=$(ADDRESS)"
@@ -123,4 +123,4 @@ spec:
         - name: certificate-path
           hostPath:
             path: /opt/opensds-security
-            type: DirectoryOrCreate
+            type: DirectoryOrCreate
diff --git a/csi/deploy/kubernetes/block/csi-snapshotter-opensdsplugin.yaml b/csi/deploy/kubernetes/block/csi-snapshotter-opensdsplugin.yaml
@@ -33,7 +33,7 @@ spec:
       serviceAccount: csi-snapshotter-block
       containers:
         - name: csi-snapshotter
-          image: quay.io/k8scsi/csi-snapshotter:v1.1.0
+          image: quay.io/k8scsi/csi-snapshotter:v1.2.2
           args:
             - "--snapshotter=csi-opensdsplugin-block"
             - "--csi-address=$(ADDRESS)"

diff --git a/csi/deploy/kubernetes/file/csi-attacher-opensdsplugin.yaml b/csi/deploy/kubernetes/file/csi-attacher-opensdsplugin.yaml
@@ -33,7 +33,7 @@ spec:
       serviceAccount: csi-attacher-file
       containers:
         - name: csi-attacher
-          image: quay.io/k8scsi/csi-attacher:v1.1.1
+          image: quay.io/k8scsi/csi-attacher:v1.2.1
           args:
             - "--v=5"
             - "--csi-address=$(ADDRESS)"
@@ -144,7 +144,7 @@ spec:
         - name: iscsi-dir
           hostPath:
             path: /etc/iscsi/
-            type: Directory
+            type: DirectoryOrCreate
         - name: ceph-dir
           hostPath:
             path: /etc/ceph/

diff --git a/csi/deploy/kubernetes/file/csi-nodeplugin-opensdsplugin.yaml b/csi/deploy/kubernetes/file/csi-nodeplugin-opensdsplugin.yaml
@@ -21,7 +21,7 @@ spec:
       hostNetwork: true
       containers:
         - name: node-driver-registrar
-          image: quay.io/k8scsi/csi-node-driver-registrar:v1.1.0
+          image: quay.io/k8scsi/csi-node-driver-registrar:v1.2.0
           args:
             - "--v=5"
             - "--csi-address=/csi/csi.sock"
@@ -155,7 +155,7 @@ spec:
         - name: iscsi-dir
           hostPath:
             path: /etc/iscsi/
-            type: Directory
+            type: DirectoryOrCreate
         - name: ceph-dir
           hostPath:
             path: /etc/ceph/
@@ -171,4 +171,4 @@ spec:
         - name: hosts
           hostPath:
              path: /etc
-             type: Directory
+             type: Directory
diff --git a/csi/deploy/kubernetes/file/csi-provisioner-opensdsplugin.yaml b/csi/deploy/kubernetes/file/csi-provisioner-opensdsplugin.yaml
@@ -33,7 +33,7 @@ spec:
       serviceAccount: csi-provisioner-file
       containers:
         - name: csi-provisioner
-          image: quay.io/k8scsi/csi-provisioner:v1.1.0
+          image: quay.io/k8scsi/csi-provisioner:v1.4.0
           args:
             - "--provisioner=csi-opensdsplugin-file"
             - "--csi-address=$(ADDRESS)"
@@ -123,4 +123,4 @@ spec:
         - name: certificate-path
           hostPath:
             path: /opt/opensds-security
-            type: DirectoryOrCreate
+            type: DirectoryOrCreate
diff --git a/csi/deploy/kubernetes/file/csi-snapshotter-opensdsplugin.yaml b/csi/deploy/kubernetes/file/csi-snapshotter-opensdsplugin.yaml
@@ -33,7 +33,7 @@ spec:
       serviceAccount: csi-snapshotter-file
       containers:
         - name: csi-snapshotter
-          image: quay.io/k8scsi/csi-snapshotter:v1.1.0
+          image: quay.io/k8scsi/csi-snapshotter:v1.2.2
           args:
             - "--snapshotter=csi-opensdsplugin-file"
             - "--csi-address=$(ADDRESS)"

diff --git a/csi/plugins/block/volume.go b/csi/plugins/block/volume.go
@@ -24,8 +24,8 @@ import (
 	"github.com/golang/glog"
 	"github.com/opensds/nbp/csi/common"
 	"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"
@@ -263,9 +263,9 @@ func (v *Volume) ControllerPublishVolume(req *csi.ControllerPublishVolumeRequest
 
 	var protocol = strings.ToLower(pool.Extras.IOConnectivity.AccessProtocol)
 	attachReq := &model.VolumeAttachmentSpec{
-		VolumeId:       req.VolumeId,
-		HostId:         req.NodeId,
-		AttachMode:     attachMode,
+		VolumeId:   req.VolumeId,
+		HostId:     req.NodeId,
+		AttachMode: attachMode,
 		ConnectionInfo: model.ConnectionInfo{
 			DriverVolumeType: protocol,
 		},
@@ -591,8 +591,7 @@ func (v *Volume) NodeStageVolume(req *csi.NodeStageVolumeRequest) (*csi.NodeStag
 
 // NodeUnstageVolume implementation
 func (v *Volume) NodeUnstageVolume(req *csi.NodeUnstageVolumeRequest) (*csi.NodeUnstageVolumeResponse, error) {
-
-	vol, _, err := v.getVolumeAndAttachmentByVolumeId(req.VolumeId)
+	vol, attachment, err := v.getVolumeAndAttachmentByVolumeId(req.VolumeId)
 	if err != nil {
 		return nil, status.Error(codes.NotFound, err.Error())
 	}
@@ -619,6 +618,20 @@ func (v *Volume) NodeUnstageVolume(req *csi.NodeUnstageVolumeRequest) (*csi.Node
 			glog.Error(msg)
 			return nil, status.Error(codes.FailedPrecondition, msg)
 		}
+
+		volConnector := connector.NewConnector(attachment.DriverVolumeType)
+		if volConnector == nil {
+			msg := fmt.Sprintf("unsupported driver volume type: %s", attachment.DriverVolumeType)
+			glog.Error(msg)
+			return nil, status.Error(codes.FailedPrecondition, msg)
+		}
+
+		err = volConnector.Detach(attachment.ConnectionData)
+		if err != nil {
+			msg := fmt.Sprintf("failed to detach device: %v", err)
+			glog.Error(msg)
+			return nil, status.Error(codes.FailedPrecondition, msg)
+		}
 	}
 
 	if CSIBlock == vol.Metadata[CSIVolumeMode] {

diff --git a/flexvolume/cmd/flex-plugin/main.go b/flexvolume/cmd/flex-plugin/main.go
@@ -141,7 +141,7 @@ func (plugin *OpenSDSPlugin) Attach(opts interface{}) Result {
 	}
 
 	//create attachment to indicate the volume is been processed.
-	localIqn, _ := connector.NewConnector("iscsi").GetInitiatorInfo()
+	localIqnList, _ := connector.NewConnector("iscsi").GetInitiatorInfo()
 
 	attachReq := &model.VolumeAttachmentSpec{
 		VolumeId: volID,
@@ -150,7 +150,7 @@ func (plugin *OpenSDSPlugin) Attach(opts interface{}) Result {
 			OsType:    runtime.GOOS,
 			Ip:        connector.GetHostIP(),
 			Host:      hostname,
-			Initiator: localIqn,
+			Initiator: localIqnList[0],
 		},
 		Status:   VOLUME_STATUS_ATTACHING,
 		Metadata: vol.Metadata,

diff --git a/vendor/github.com/opensds/opensds/contrib/connector/common.go b/vendor/github.com/opensds/opensds/contrib/connector/common.go
diff --git a/vendor/github.com/opensds/opensds/contrib/connector/connector.go b/vendor/github.com/opensds/opensds/contrib/connector/connector.go
diff --git a/vendor/github.com/opensds/opensds/contrib/connector/fc/fc.go b/vendor/github.com/opensds/opensds/contrib/connector/fc/fc.go
diff --git a/vendor/github.com/opensds/opensds/contrib/connector/fc/fibreChannel.go b/vendor/github.com/opensds/opensds/contrib/connector/fc/fibreChannel.go
diff --git a/vendor/github.com/opensds/opensds/contrib/connector/iscsi/helper.go b/vendor/github.com/opensds/opensds/contrib/connector/iscsi/helper.go
diff --git a/vendor/github.com/opensds/opensds/contrib/connector/iscsi/iscsi.go b/vendor/github.com/opensds/opensds/contrib/connector/iscsi/iscsi.go
diff --git a/vendor/github.com/opensds/opensds/contrib/connector/nfs/helper.go b/vendor/github.com/opensds/opensds/contrib/connector/nfs/helper.go
diff --git a/vendor/github.com/opensds/opensds/contrib/connector/nfs/nfs.go b/vendor/github.com/opensds/opensds/contrib/connector/nfs/nfs.go