Merge pull request oracle#87 in OKE/oci-cloud-controller-manager from OKE-11885 to internal

* commit 'de479f26c13840ed8fe53a1798bcfebee8e2a321':
  JIRA: OKE-11885 - Fix CSI E2E test for static csi provisioning.

Author: mrunalpagnis

manifests/container-storage-interface/oci-csi-node-driver.yaml

@@ -81,4 +81,4 @@ spec:
             type: Directory
         - name: device-dir
           hostPath:
-            path: /dev
+            path: /dev

test/e2e/cloud-provider-oci/csi_volume_creation.go

@@ -57,7 +57,12 @@ var _ = Describe("CSI Volume Creation", func() {
 
 			pvcJig.CheckVolumeCapacity("100Gi", pvc.Name, f.Namespace.Name)
 		})
+	})
+})
 
+var _ = Describe("CSI Static Volume Creation", func() {
+	f := framework.NewBackupFramework("csi-static")
+	Context("[cloudprovider][storage][csi]", func() {
 		It("Static Provisioning CSI", func() {
 			pvcJig := framework.NewPVCTestJig(f.ClientSet, "csi-provisioner-e2e-tests-pvc-with-static")
 
@@ -73,7 +78,7 @@ var _ = Describe("CSI Volume Creation", func() {
 			} else {
 				framework.Failf("Compartment Id undefined.")
 			}
-			pvc := pvcJig.CreateAndAwaitStaticPVCOrFailCSI(f.Namespace.Name, framework.MinVolumeBlock, scName, setupF.AdLocation, compartmentId, nil)
+			pvc := pvcJig.CreateAndAwaitStaticPVCOrFailCSI(f.BlockStorageClient, f.Namespace.Name, framework.MinVolumeBlock, scName, setupF.AdLocation, compartmentId, nil)
 
 			pvcJig.NewPODForCSI("app4", f.Namespace.Name, pvc.Name, setupF.AdLabel)
 

test/e2e/framework/pvc_util.go

@@ -16,7 +16,6 @@ package framework
 
 import (
 	"fmt"
-	"github.com/oracle/oci-go-sdk/common"
 	"go.uber.org/zap"
 	"golang.org/x/net/context"
 	"time"
@@ -235,9 +234,9 @@ func (j *PVCTestJig) CreateAndAwaitPVCOrFailCSI(namespace string, volumeSize str
 // jig's defaults, waits for it to become ready, and then sanity checks it and
 // its dependant resources. Callers can provide a function to tweak the
 // PVC object before it is created.
-func (j *PVCTestJig) CreateAndAwaitStaticPVCOrFailCSI(namespace string, volumeSize string, scName string, adLabel string, compartmentId string, tweak func(pvc *v1.PersistentVolumeClaim)) *v1.PersistentVolumeClaim {
+func (j *PVCTestJig) CreateAndAwaitStaticPVCOrFailCSI(bs ocicore.BlockstorageClient, namespace string, volumeSize string, scName string, adLabel string, compartmentId string, tweak func(pvc *v1.PersistentVolumeClaim)) *v1.PersistentVolumeClaim {
 
-	volumeOcid := j.CreateVolume(adLabel, compartmentId, "test-volume")
+	volumeOcid := j.CreateVolume(bs, adLabel, compartmentId, "test-volume")
 
 	pv := j.CreatePVorFailCSI(namespace, scName, *volumeOcid)
 	pv = j.waitForConditionOrFailForPV(pv.Name, DefaultTimeout, "to be dynamically provisioned", func(pvc *v1.PersistentVolume) bool {
@@ -263,9 +262,8 @@ func (j *PVCTestJig) CreateAndAwaitStaticPVCOrFailCSI(namespace string, volumeSi
 }
 
 // CreateVolume is a function to create the block volume
-func (j *PVCTestJig) CreateVolume(adLabel string, compartmentId string, volName string) *string {
+func (j *PVCTestJig) CreateVolume(bs ocicore.BlockstorageClient, adLabel string, compartmentId string, volName string) *string {
 	var size int64 =50
-	//var compartmentId = "ocid1.compartment.oc1..aaaaaaaai6jt6asobfmkm5geioeod3zh6nxzjiplu722opjuoxxrndxjos6q"
 	request := ocicore.CreateVolumeRequest{
 		CreateVolumeDetails: ocicore.CreateVolumeDetails {
 			AvailabilityDomain: &adLabel,
@@ -275,10 +273,6 @@ func (j *PVCTestJig) CreateVolume(adLabel string, compartmentId string, volName
 		},
 	}
 
-	bs, err := ocicore.NewBlockstorageClientWithConfigurationProvider(common.DefaultConfigProvider())
-	if err != nil {
-		Failf("Failed to create Block Storage Client: %v", err)
-	}
 	newVolume, err := bs.CreateVolume(context.Background(), request)
 	if err != nil {
 		Failf("Volume %q creation API error: %v", volName, err)