Merge pull request #215 from qiangzii/master

add container conf id support for storageclass

Makefile

@@ -17,7 +17,7 @@
 .PHONY: all disk
 
 DISK_IMAGE_NAME=csiplugin/csi-qingcloud
-DISK_VERSION=v1.3.8
+DISK_VERSION=v1.3.9
 ROOT_PATH=$(pwd)
 PACKAGE_LIST=./cmd/... ./pkg/...
 

pkg/cloud/cloud_manager.go

@@ -39,7 +39,7 @@ type VolumeManager interface {
 	// Return:
 	//   volume id, nil: succeed to create volume and return volume id
 	//   nil, error: failed to create volume
-	CreateVolume(volName string, requestSize int, replicas int, volType int, zone string) (volId string, err error)
+	CreateVolume(volName string, requestSize int, replicas int, volType int, zone string, containerConfID string) (volId string, err error)
 	// DeleteVolume deletes volume by id.
 	// Return:
 	//   nil: succeed to delete volume

pkg/cloud/mock/mock_cloud_manager.go

@@ -18,11 +18,12 @@ package mock
 
 import (
 	"fmt"
+	"time"
+
 	"github.com/yunify/qingcloud-csi/pkg/cloud"
 	"github.com/yunify/qingcloud-csi/pkg/common"
 	qcconfig "github.com/yunify/qingcloud-sdk-go/config"
 	qcservice "github.com/yunify/qingcloud-sdk-go/service"
-	"time"
 )
 
 var _ cloud.CloudManager = &MockCloudManager{}
@@ -159,7 +160,7 @@ func (m *MockCloudManager) FindVolumeByName(volName string) (volInfo *qcservice.
 	return nil, nil
 }
 
-func (m *MockCloudManager) CreateVolume(volName string, requestSize int, replicas int, volType int, zone string) (
+func (m *MockCloudManager) CreateVolume(volName string, requestSize int, replicas int, volType int, zone string, containerConfID string) (
 	volId string, err error) {
 	exVol, err := m.FindVolumeByName(volName)
 	if err != nil {

pkg/cloud/qingcloud_manager.go

@@ -20,6 +20,7 @@ import (
 	"errors"
 	"fmt"
 
+	"github.com/yunify/qingcloud-csi/pkg/disk/driver"
 	qcclient "github.com/yunify/qingcloud-sdk-go/client"
 	qcconfig "github.com/yunify/qingcloud-sdk-go/config"
 	qcservice "github.com/yunify/qingcloud-sdk-go/service"
@@ -301,7 +302,7 @@ func (cm *qingCloudManager) FindVolumeByName(name string) (volume *qcservice.Vol
 // 1. format volume size
 // 2. create volume
 // 3. wait job
-func (qm *qingCloudManager) CreateVolume(volName string, requestSize int, replicas int, volType int, zone string) (
+func (qm *qingCloudManager) CreateVolume(volName string, requestSize int, replicas int, volType int, zone string, containerConfID string) (
 	newVolId string, err error) {
 	// 0. Set CreateVolume args
 	// create volume count
@@ -318,9 +319,16 @@ func (qm *qingCloudManager) CreateVolume(volName string, requestSize int, replic
 		VolumeType:   &volType,
 		Zone:         &zone,
 	}
+	if volType == int(driver.ThirdPartyStorageType) {
+		input.ContainerConfID = &containerConfID
+		klog.Infof("Call IaaS CreateVolume request name: %s, size: %d GB, type: %d, zone: %s, count: %d, replica: %s, replica_count: %d, container_conf_id: %s",
+			*input.VolumeName, *input.Size, *input.VolumeType, *input.Zone, *input.Count, *input.Repl, *input.ReplicaCount, *input.ContainerConfID)
+	} else {
+		klog.Infof("Call IaaS CreateVolume request name: %s, size: %d GB, type: %d, zone: %s, count: %d, replica: %s, replica_count: %d",
+			*input.VolumeName, *input.Size, *input.VolumeType, *input.Zone, *input.Count, *input.Repl, *input.ReplicaCount)
+	}
+
 	// 1. Create volume
-	klog.Infof("Call IaaS CreateVolume request name: %s, size: %d GB, type: %d, zone: %s, count: %d, replica: %s, replica_count: %d",
-		*input.VolumeName, *input.Size, *input.VolumeType, *input.Zone, *input.Count, *input.Repl, *input.ReplicaCount)
 	output, err := qm.volumeService.CreateVolumes(input)
 	if err != nil {
 		return "", err

pkg/cloud/qingcloud_manager_test.go

@@ -17,11 +17,12 @@ limitations under the License.
 package cloud
 
 import (
-	"github.com/yunify/qingcloud-csi/pkg/disk/driver"
-	"k8s.io/klog"
 	"os"
 	"path"
 	"testing"
+
+	"github.com/yunify/qingcloud-csi/pkg/disk/driver"
+	"k8s.io/klog"
 )
 
 const (
@@ -66,7 +67,7 @@ func TestQingCloudManager_CreateVolume(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		volId, err := cfg.CreateVolume(test.volName, test.volSize, test.volRepl, test.volType, test.volZone)
+		volId, err := cfg.CreateVolume(test.volName, test.volSize, test.volRepl, test.volType, test.volZone, "")
 		if err != nil {
 			if !test.isError {
 				t.Errorf("testcase %s: expect error %t, but actually error: %s", test.name, test.isError, err)

pkg/disk/driver/storageclass.go

@@ -27,23 +27,25 @@ import (
 )
 
 const (
-	StorageClassTypeName     = "type"
-	StorageClassMaxSizeName  = "maxSize"
-	StorageClassMinSizeName  = "minSize"
-	StorageClassStepSizeName = "stepSize"
-	StorageClassFsTypeName   = "fsType"
-	StorageClassReplicaName  = "replica"
-	StorageClassTagsName     = "tags"
+	StorageClassTypeName        = "type"
+	StorageClassMaxSizeName     = "maxSize"
+	StorageClassMinSizeName     = "minSize"
+	StorageClassStepSizeName    = "stepSize"
+	StorageClassFsTypeName      = "fsType"
+	StorageClassReplicaName     = "replica"
+	StorageClassTagsName        = "tags"
+	StorageClassContainerConfID = "containerConfID"
 )
 
 type QingStorageClass struct {
-	diskType VolumeType
-	maxSize  int
-	minSize  int
-	stepSize int
-	fsType   string
-	replica  int
-	tags     []string
+	diskType        VolumeType
+	maxSize         int
+	minSize         int
+	stepSize        int
+	fsType          string
+	replica         int
+	tags            []string
+	containerConfID string
 }
 
 // NewDefaultQingStorageClassFromType create default qingStorageClass by specified volume type
@@ -67,6 +69,7 @@ func NewQingStorageClassFromMap(opt map[string]string, topology *Topology) (*Qin
 	maxSize, minSize, stepSize := -1, -1, -1
 	fsType := ""
 	replica := -1
+	containerConfID := ""
 	var tags []string
 	for k, v := range opt {
 		switch strings.ToLower(k) {
@@ -113,6 +116,8 @@ func NewQingStorageClassFromMap(opt map[string]string, topology *Topology) (*Qin
 			if len(v) > 0 {
 				tags = strings.Split(strings.ReplaceAll(v, " ", ""), ",")
 			}
+		case strings.ToLower(StorageClassContainerConfID):
+			containerConfID = v
 		}
 	}
 
@@ -143,6 +148,7 @@ func NewQingStorageClassFromMap(opt map[string]string, topology *Topology) (*Qin
 	_ = sc.setFsType(fsType)
 	_ = sc.setReplica(replica)
 	sc.setTags(tags)
+	sc.setContainerConfID(containerConfID)
 	return sc, nil
 }
 
@@ -173,6 +179,10 @@ func (sc QingStorageClass) GetTags() []string {
 	return sc.tags
 }
 
+func (sc QingStorageClass) GetContainerConfID() string {
+	return sc.containerConfID
+}
+
 func (sc *QingStorageClass) setFsType(fs string) error {
 	if !IsValidFileSystemType(fs) {
 		return fmt.Errorf("unsupported filesystem type %s", fs)
@@ -205,6 +215,10 @@ func (sc *QingStorageClass) setTags(tagsStr []string) {
 	sc.tags = tagsStr
 }
 
+func (sc *QingStorageClass) setContainerConfID(containerConfID string) {
+	sc.containerConfID = containerConfID
+}
+
 // FormatVolumeSize transfer to proper volume size
 func (sc QingStorageClass) FormatVolumeSizeByte(sizeByte int64) int64 {
 	if sizeByte <= sc.GetMinSizeByte() {

pkg/disk/rpcserver/controllerserver.go

@@ -60,7 +60,8 @@ var _ csi.ControllerServer = &ControllerServer{}
 // 2. Restore volume from snapshot: CREATE_DELETE_VOLUME and CREATE_DELETE_SNAPSHOT
 // 3. Clone volume: CREATE_DELETE_VOLUME and CLONE_VOLUME
 // csi.CreateVolumeRequest: name 				+Required
-//							capability			+Required
+//
+//	capability			+Required
 func (cs *ControllerServer) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest) (*csi.CreateVolumeResponse,
 	error) {
 	funcName := "CreateVolume"
@@ -161,7 +162,7 @@ func (cs *ControllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
 		requiredSizeGib := common.ByteCeilToGib(requiredSizeByte)
 		klog.Infof("%s: Creating empty volume %s with %d Gib in zone %s...", hash, volName, requiredSizeGib,
 			top.GetZone())
-		newVolId, err := cs.cloud.CreateVolume(volName, requiredSizeGib, sc.GetReplica(), sc.GetDiskType().Int(), top.GetZone())
+		newVolId, err := cs.cloud.CreateVolume(volName, requiredSizeGib, sc.GetReplica(), sc.GetDiskType().Int(), top.GetZone(), sc.GetContainerConfID())
 		if err != nil {
 			klog.Errorf("%s: Failed to create volume %s, error: %v", hash, volName, err)
 			return nil, status.Error(codes.Internal, err.Error())
@@ -395,9 +396,10 @@ func (cs *ControllerServer) DeleteVolume(ctx context.Context, req *csi.DeleteVol
 }
 
 // csi.ControllerPublishVolumeRequest: 	volume id 			+ Required
-//										node id				+ Required
-//										volume capability 	+ Required
-//										readonly			+ Required (This field is NOT provided when requesting in Kubernetes)
+//
+//	node id				+ Required
+//	volume capability 	+ Required
+//	readonly			+ Required (This field is NOT provided when requesting in Kubernetes)
 func (cs *ControllerServer) ControllerPublishVolume(ctx context.Context, req *csi.ControllerPublishVolumeRequest) (*csi.
 	ControllerPublishVolumeResponse, error) {
 	funcName := "ControllerPublishVolume"
@@ -585,7 +587,8 @@ func (cs *ControllerServer) ControllerUnpublishVolume(ctx context.Context, req *
 
 // This operation MUST be idempotent
 // csi.ValidateVolumeCapabilitiesRequest: 	volume id 			+ Required
-// 											volume capability 	+ Required
+//
+//	volume capability 	+ Required
 func (cs *ControllerServer) ValidateVolumeCapabilities(ctx context.Context, req *csi.ValidateVolumeCapabilitiesRequest) (*csi.
 	ValidateVolumeCapabilitiesResponse, error) {
 	funcName := "ValidateVolumeCapabilities"