Skip to content

Commit 60673a9

Browse files
andyzhangxandyzhangx
committed
test: add parameter setting in e2e tests
1 parent 322a5b1 commit 60673a9

7 files changed

+29
-30
lines changed

‎test/e2e/driver/blobfuse_csi_driver.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,3 @@ func (d *blobFuseCSIDriver) GetPreProvisionStorageClass(parameters map[string]st
100100
generateName := fmt.Sprintf("%s-%s-pre-provisioned-sc-", namespace, provisioner)
101101
return getStorageClass(generateName, provisioner, parameters, mountOptions, reclaimPolicy, bindingMode, nil)
102102
}
103-
104-
func GetParameters() map[string]string {
105-
return map[string]string{
106-
"skuName": "Standard_LRS",
107-
}
108-
}

‎test/e2e/testsuites/dynamically_provisioned_cmd_volume_tester.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,14 @@ import (
2828
// Waiting for the PV provisioner to create a new PV
2929
// Testing if the Pod(s) Cmd is run with a 0 exit code
3030
type DynamicallyProvisionedCmdVolumeTest struct {
31-
CSIDriver driver.DynamicPVTestDriver
32-
Pods []PodDetails
31+
CSIDriver driver.DynamicPVTestDriver
32+
Pods []PodDetails
33+
StorageClassParameters map[string]string
3334
}
3435

3536
func (t *DynamicallyProvisionedCmdVolumeTest) Run(client clientset.Interface, namespace *v1.Namespace) {
3637
for _, pod := range t.Pods {
37-
tpod, cleanup := pod.SetupWithDynamicVolumes(client, namespace, t.CSIDriver)
38+
tpod, cleanup := pod.SetupWithDynamicVolumes(client, namespace, t.CSIDriver, t.StorageClassParameters)
3839
// defer must be called here for resources not get removed before using them
3940
for i := range cleanup {
4041
defer cleanup[i]()

‎test/e2e/testsuites/dynamically_provisioned_collocated_pod_tester.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,16 @@ import (
2828
// Waiting for the PV provisioner to create a new PV
2929
// Testing if multiple Pod(s) can write simultaneously
3030
type DynamicallyProvisionedCollocatedPodTest struct {
31-
CSIDriver driver.DynamicPVTestDriver
32-
Pods []PodDetails
33-
ColocatePods bool
31+
CSIDriver driver.DynamicPVTestDriver
32+
Pods []PodDetails
33+
ColocatePods bool
34+
StorageClassParameters map[string]string
3435
}
3536

3637
func (t *DynamicallyProvisionedCollocatedPodTest) Run(client clientset.Interface, namespace *v1.Namespace) {
3738
nodeName := ""
3839
for _, pod := range t.Pods {
39-
tpod, cleanup := pod.SetupWithDynamicVolumes(client, namespace, t.CSIDriver)
40+
tpod, cleanup := pod.SetupWithDynamicVolumes(client, namespace, t.CSIDriver, t.StorageClassParameters)
4041
if t.ColocatePods && nodeName != "" {
4142
tpod.SetNodeSelector(map[string]string{"name": nodeName})
4243
}

‎test/e2e/testsuites/dynamically_provisioned_delete_pod_tester.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@ import (
2828
// Testing if the Pod can write and read to mounted volumes
2929
// Deleting a pod, and again testing if the Pod can write and read to mounted volumes
3030
type DynamicallyProvisionedDeletePodTest struct {
31-
CSIDriver driver.DynamicPVTestDriver
32-
Pod PodDetails
33-
PodCheck *PodExecCheck
31+
CSIDriver driver.DynamicPVTestDriver
32+
Pod PodDetails
33+
PodCheck *PodExecCheck
34+
StorageClassParameters map[string]string
3435
}
3536

3637
type PodExecCheck struct {
@@ -39,7 +40,7 @@ type PodExecCheck struct {
3940
}
4041

4142
func (t *DynamicallyProvisionedDeletePodTest) Run(client clientset.Interface, namespace *v1.Namespace) {
42-
tDeployment, cleanup := t.Pod.SetupDeployment(client, namespace, t.CSIDriver)
43+
tDeployment, cleanup := t.Pod.SetupDeployment(client, namespace, t.CSIDriver, t.StorageClassParameters)
4344
// defer must be called here for resources not get removed before using them
4445
for i := range cleanup {
4546
defer cleanup[i]()

‎test/e2e/testsuites/dynamically_provisioned_read_only_volume_tester.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,14 @@ const expectedReadOnlyLog = "Read-only file system"
3434
// Waiting for the PV provisioner to create a new PV
3535
// Testing that the Pod(s) cannot write to the volume when mounted
3636
type DynamicallyProvisionedReadOnlyVolumeTest struct {
37-
CSIDriver driver.DynamicPVTestDriver
38-
Pods []PodDetails
37+
CSIDriver driver.DynamicPVTestDriver
38+
Pods []PodDetails
39+
StorageClassParameters map[string]string
3940
}
4041

4142
func (t *DynamicallyProvisionedReadOnlyVolumeTest) Run(client clientset.Interface, namespace *v1.Namespace) {
4243
for _, pod := range t.Pods {
43-
tpod, cleanup := pod.SetupWithDynamicVolumes(client, namespace, t.CSIDriver)
44+
tpod, cleanup := pod.SetupWithDynamicVolumes(client, namespace, t.CSIDriver, t.StorageClassParameters)
4445
// defer must be called here for resources not get removed before using them
4546
for i := range cleanup {
4647
defer cleanup[i]()

‎test/e2e/testsuites/dynamically_provisioned_reclaim_policy_tester.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,15 @@ import (
2727
// DynamicallyProvisionedReclaimPolicyTest will provision required PV(s) and PVC(s)
2828
// Testing the correct behavior for different reclaimPolicies
2929
type DynamicallyProvisionedReclaimPolicyTest struct {
30-
CSIDriver driver.DynamicPVTestDriver
31-
Volumes []VolumeDetails
32-
Blobfuse *blobfuse.Driver
30+
CSIDriver driver.DynamicPVTestDriver
31+
Volumes []VolumeDetails
32+
Blobfuse *blobfuse.Driver
33+
StorageClassParameters map[string]string
3334
}
3435

3536
func (t *DynamicallyProvisionedReclaimPolicyTest) Run(client clientset.Interface, namespace *v1.Namespace) {
3637
for _, volume := range t.Volumes {
37-
tpvc, _ := volume.SetupDynamicPersistentVolumeClaim(client, namespace, t.CSIDriver)
38+
tpvc, _ := volume.SetupDynamicPersistentVolumeClaim(client, namespace, t.CSIDriver, t.StorageClassParameters)
3839

3940
// will delete the PVC
4041
// will also wait for PV to be deleted when reclaimPolicy=Delete

‎test/e2e/testsuites/specs.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@ type DataSource struct {
8585
Name string
8686
}
8787

88-
func (pod *PodDetails) SetupWithDynamicVolumes(client clientset.Interface, namespace *v1.Namespace, csiDriver driver.DynamicPVTestDriver) (*TestPod, []func()) {
88+
func (pod *PodDetails) SetupWithDynamicVolumes(client clientset.Interface, namespace *v1.Namespace, csiDriver driver.DynamicPVTestDriver, storageClassParameters map[string]string) (*TestPod, []func()) {
8989
tpod := NewTestPod(client, namespace, pod.Cmd)
9090
cleanupFuncs := make([]func(), 0)
9191
for n, v := range pod.Volumes {
92-
tpvc, funcs := v.SetupDynamicPersistentVolumeClaim(client, namespace, csiDriver)
92+
tpvc, funcs := v.SetupDynamicPersistentVolumeClaim(client, namespace, csiDriver, storageClassParameters)
9393
cleanupFuncs = append(cleanupFuncs, funcs...)
9494
if v.VolumeMode == Block {
9595
tpod.SetupRawBlockVolume(tpvc.persistentVolumeClaim, fmt.Sprintf("%s%d", v.VolumeDevice.NameGenerate, n+1), v.VolumeDevice.DevicePath)
@@ -116,11 +116,11 @@ func (pod *PodDetails) SetupWithPreProvisionedVolumes(client clientset.Interface
116116
return tpod, cleanupFuncs
117117
}
118118

119-
func (pod *PodDetails) SetupDeployment(client clientset.Interface, namespace *v1.Namespace, csiDriver driver.DynamicPVTestDriver) (*TestDeployment, []func()) {
119+
func (pod *PodDetails) SetupDeployment(client clientset.Interface, namespace *v1.Namespace, csiDriver driver.DynamicPVTestDriver, storageClassParameters map[string]string) (*TestDeployment, []func()) {
120120
cleanupFuncs := make([]func(), 0)
121121
volume := pod.Volumes[0]
122122
ginkgo.By("setting up the StorageClass")
123-
storageClass := csiDriver.GetDynamicProvisionStorageClass(driver.GetParameters(), volume.MountOptions, volume.ReclaimPolicy, volume.VolumeBindingMode, volume.AllowedTopologyValues, namespace.Name)
123+
storageClass := csiDriver.GetDynamicProvisionStorageClass(storageClassParameters, volume.MountOptions, volume.ReclaimPolicy, volume.VolumeBindingMode, volume.AllowedTopologyValues, namespace.Name)
124124
tsc := NewTestStorageClass(client, namespace, storageClass)
125125
createdStorageClass := tsc.Create()
126126
cleanupFuncs = append(cleanupFuncs, tsc.Cleanup)
@@ -137,10 +137,10 @@ func (pod *PodDetails) SetupDeployment(client clientset.Interface, namespace *v1
137137
return tDeployment, cleanupFuncs
138138
}
139139

140-
func (volume *VolumeDetails) SetupDynamicPersistentVolumeClaim(client clientset.Interface, namespace *v1.Namespace, csiDriver driver.DynamicPVTestDriver) (*TestPersistentVolumeClaim, []func()) {
140+
func (volume *VolumeDetails) SetupDynamicPersistentVolumeClaim(client clientset.Interface, namespace *v1.Namespace, csiDriver driver.DynamicPVTestDriver, storageClassParameters map[string]string) (*TestPersistentVolumeClaim, []func()) {
141141
cleanupFuncs := make([]func(), 0)
142142
ginkgo.By("setting up the StorageClass")
143-
storageClass := csiDriver.GetDynamicProvisionStorageClass(driver.GetParameters(), volume.MountOptions, volume.ReclaimPolicy, volume.VolumeBindingMode, volume.AllowedTopologyValues, namespace.Name)
143+
storageClass := csiDriver.GetDynamicProvisionStorageClass(storageClassParameters, volume.MountOptions, volume.ReclaimPolicy, volume.VolumeBindingMode, volume.AllowedTopologyValues, namespace.Name)
144144
tsc := NewTestStorageClass(client, namespace, storageClass)
145145
createdStorageClass := tsc.Create()
146146
cleanupFuncs = append(cleanupFuncs, tsc.Cleanup)

0 commit comments

Comments
 (0)