Merge pull request #55 from ZeroMagic/pre_provisioned_reclaim_policy

test: add e2e test "pre_provisioned_reclaim_policy"

Author: andyzhangx

test/e2e/pre_provisioning.go

@@ -0,0 +1,127 @@
+/*
+Copyright 2019 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package e2e
+
+import (
+	"context"
+	"fmt"
+	"os"
+
+	"github.com/container-storage-interface/spec/lib/go/csi"
+	"github.com/csi-driver/blobfuse-csi-driver/pkg/blobfuse"
+	"github.com/csi-driver/blobfuse-csi-driver/test/e2e/driver"
+	"github.com/csi-driver/blobfuse-csi-driver/test/e2e/testsuites"
+	. "github.com/onsi/ginkgo"
+
+	v1 "k8s.io/api/core/v1"
+	clientset "k8s.io/client-go/kubernetes"
+	"k8s.io/kubernetes/test/e2e/framework"
+)
+
+const (
+	defaultVolumeSize = 10
+)
+
+var (
+	defaultVolumeSizeBytes int64 = defaultVolumeSize * 1024 * 1024 * 1024
+)
+
+var _ = Describe("[blobfuse-csi-e2e] [single-az] Pre-Provisioned", func() {
+	f := framework.NewDefaultFramework("blobfuse")
+
+	var (
+		cs         clientset.Interface
+		ns         *v1.Namespace
+		testDriver driver.PreProvisionedVolumeTestDriver
+		volumeID   string
+		// Set to true if the volume should be deleted automatically after test
+		skipManuallyDeletingVolume bool
+	)
+	nodeid := os.Getenv("nodeid")
+	blobfuseDriver := blobfuse.NewDriver(nodeid)
+	endpoint := "unix:///tmp/csi.sock"
+
+	go func() {
+		blobfuseDriver.Run(endpoint)
+	}()
+
+	BeforeEach(func() {
+		cs = f.ClientSet
+		ns = f.Namespace
+		testDriver = driver.InitBlobFuseCSIDriver()
+	})
+
+	AfterEach(func() {
+		if !skipManuallyDeletingVolume {
+			req := &csi.DeleteVolumeRequest{
+				VolumeId: volumeID,
+			}
+			_, err := blobfuseDriver.DeleteVolume(context.Background(), req)
+			if err != nil {
+				Fail(fmt.Sprintf("create volume %q error: %v", volumeID, err))
+			}
+		}
+	})
+
+	It(fmt.Sprintf("[env] should use a pre-provisioned volume and retain PV with reclaimPolicy %q", v1.PersistentVolumeReclaimRetain), func() {
+		req := makeCreateVolumeReq("pre-provisioned-retain-reclaimPolicy")
+		resp, err := blobfuseDriver.CreateVolume(context.Background(), req)
+		if err != nil {
+			Fail(fmt.Sprintf("create volume error: %v", err))
+		}
+		volumeID = resp.Volume.VolumeId
+		By(fmt.Sprintf("Successfully provisioned BlobFuse volume: %q\n", volumeID))
+
+		volumeSize := fmt.Sprintf("%dGi", defaultVolumeSize)
+		reclaimPolicy := v1.PersistentVolumeReclaimRetain
+		volumes := []testsuites.VolumeDetails{
+			{
+				VolumeID:      volumeID,
+				FSType:        "ext4",
+				ClaimSize:     volumeSize,
+				ReclaimPolicy: &reclaimPolicy,
+			},
+		}
+		test := testsuites.PreProvisionedReclaimPolicyTest{
+			CSIDriver: testDriver,
+			Volumes:   volumes,
+		}
+		test.Run(cs, ns)
+	})
+})
+
+func makeCreateVolumeReq(volumeName string) *csi.CreateVolumeRequest {
+	req := &csi.CreateVolumeRequest{
+		Name: volumeName,
+		VolumeCapabilities: []*csi.VolumeCapability{
+			{
+				AccessType: &csi.VolumeCapability_Mount{
+					Mount: &csi.VolumeCapability_MountVolume{},
+				},
+				AccessMode: &csi.VolumeCapability_AccessMode{
+					Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
+				},
+			},
+		},
+		CapacityRange: &csi.CapacityRange{
+			RequiredBytes: defaultVolumeSizeBytes,
+			LimitBytes:    defaultVolumeSizeBytes,
+		},
+	}
+
+	return req
+}

test/e2e/testsuites/pre_provisioned_reclaim_policy_tester.go

@@ -0,0 +1,46 @@
+/*
+Copyright 2019 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package testsuites
+
+import (
+	"github.com/csi-driver/blobfuse-csi-driver/test/e2e/driver"
+
+	"k8s.io/api/core/v1"
+	clientset "k8s.io/client-go/kubernetes"
+)
+
+// PreProvisionedReclaimPolicyTest will provision required PV(s) and PVC(s)
+// Testing the correct behavior for different reclaimPolicies
+type PreProvisionedReclaimPolicyTest struct {
+	CSIDriver driver.PreProvisionedVolumeTestDriver
+	Volumes   []VolumeDetails
+}
+
+func (t *PreProvisionedReclaimPolicyTest) Run(client clientset.Interface, namespace *v1.Namespace) {
+	for _, volume := range t.Volumes {
+		tpvc, _ := volume.SetupPreProvisionedPersistentVolumeClaim(client, namespace, t.CSIDriver)
+
+		// will delete the PVC
+		// will also wait for PV to be deleted when reclaimPolicy=Delete
+		tpvc.Cleanup()
+		// first check PV stills exists, then manually delete it
+		if tpvc.ReclaimPolicy() == v1.PersistentVolumeReclaimRetain {
+			tpvc.WaitForPersistentVolumePhase(v1.VolumeReleased)
+			tpvc.DeleteBoundPersistentVolume()
+		}
+	}
+}

test/e2e/testsuites/testsuites.go

@@ -366,7 +366,7 @@ type TestDeployment struct {
 }
 
 func NewTestDeployment(c clientset.Interface, ns *v1.Namespace, command string, pvc *v1.PersistentVolumeClaim, volumeName, mountPath string, readOnly bool) *TestDeployment {
-	generateName := "ebs-volume-tester-"
+	generateName := "blobfuse-volume-tester-"
 	selectorValue := fmt.Sprintf("%s%d", generateName, rand.Int())
 	replicas := int32(1)
 	return &TestDeployment{