Skip to content

Commit baf9bdc

Browse files
kavyashree-rkavyashree-r
committed
wcp test fix
1 parent 1d7c2a4 commit baf9bdc

14 files changed

+67
-107
lines changed

‎tests/e2e/config_change_test.go

-5
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,6 @@ var _ bool = ginkgo.Describe("[csi-supervisor] config-change-test", func() {
5151
clientIndex = 0
5252
})
5353

54-
ginkgo.AfterEach(func() {
55-
if supervisorCluster {
56-
deleteResourceQuota(client, namespace)
57-
}
58-
})
5954
/*
6055
Perform Password change and check if k8s resources can be modified after the password change
6156
Steps:

‎tests/e2e/csi_snapshot_negative.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,7 @@ var _ = ginkgo.Describe("[block-snapshot-negative] Volume Snapshot Fault-Injecti
134134
ginkgo.AfterEach(func() {
135135
ctx, cancel := context.WithCancel(context.Background())
136136
defer cancel()
137-
if supervisorCluster {
138-
deleteResourceQuota(client, namespace)
139-
}
137+
140138
if guestCluster {
141139
svcClient, svNamespace := getSvcClientAndNamespace()
142140
setResourceQuota(svcClient, svNamespace, rqLimit)

‎tests/e2e/csi_static_provisioning_basic.go

+1-13
Original file line numberDiff line numberDiff line change
@@ -1549,12 +1549,6 @@ var _ = ginkgo.Describe("Basic Static Provisioning", func() {
15491549
gomega.Expect(err).NotTo(gomega.HaveOccurred())
15501550
framework.Logf("storageclass Name :%s", storageclass.GetName())
15511551

1552-
defer func() {
1553-
framework.Logf("Delete storage class")
1554-
err = client.StorageV1().StorageClasses().Delete(ctx, storageclass.Name, metav1.DeleteOptions{})
1555-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
1556-
}()
1557-
15581552
ginkgo.By("Creating Resource quota")
15591553
setStoragePolicyQuota(ctx, restConfig, nonsharedDatastoreName, namespace, rqLimit)
15601554

@@ -2056,13 +2050,7 @@ var _ = ginkgo.Describe("Basic Static Provisioning", func() {
20562050
framework.Logf("pvc name :%s", pvcName)
20572051
namespace = getNamespaceToRunTests(f)
20582052

2059-
restConfig, storageclass, _ := staticProvisioningPreSetUpUtilForVMDKTests(ctx)
2060-
2061-
defer func() {
2062-
framework.Logf("Delete storage class")
2063-
err = client.StorageV1().StorageClasses().Delete(ctx, storageclass.Name, metav1.DeleteOptions{})
2064-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
2065-
}()
2053+
restConfig, _, _ := staticProvisioningPreSetUpUtilForVMDKTests(ctx)
20662054

20672055
vmdk := GetAndExpectStringEnvVar(envVmdkDiskURL)
20682056
framework.Logf("VMDK path : %s", vmdk)

‎tests/e2e/data_persistence.go

-2
Original file line numberDiff line numberDiff line change
@@ -572,8 +572,6 @@ var _ = ginkgo.Describe("Data Persistence", func() {
572572
framework.ExpectNoError(waitForCNSRegisterVolumeToGetDeleted(ctx,
573573
restConfig, namespace, cnsRegisterVolume, poll, supervisorClusterOperationsTimeout))
574574

575-
ginkgo.By("Delete Resource quota")
576-
deleteResourceQuota(client, namespace)
577575
})
578576
})
579577

‎tests/e2e/improved_csi_idempotency.go

-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ var _ = ginkgo.Describe("Improved CSI Idempotency Tests", func() {
157157
updateCSIDeploymentProvisionerTimeout(c, csiSystemNamespace, defaultProvisionerTimeInSec)
158158

159159
if supervisorCluster {
160-
deleteResourceQuota(client, namespace)
161160
dumpSvcNsEventsOnTestFailure(client, namespace)
162161
}
163162
if guestCluster {

‎tests/e2e/multi_master_k8s.go

-3
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,6 @@ var _ = ginkgo.Describe("[csi-multi-master-block-e2e]", func() {
8787
ctx, cancel := context.WithCancel(context.Background())
8888
defer cancel()
8989
ginkgo.By("Performing test cleanup")
90-
if supervisorCluster {
91-
deleteResourceQuota(client, namespace)
92-
}
9390

9491
if pvc != nil {
9592
err = fpv.DeletePersistentVolumeClaim(ctx, client, pvc.Name, namespace)

‎tests/e2e/operationstorm.go

-3
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,6 @@ var _ = ginkgo.Describe("[csi-block-vanilla] [csi-block-vanilla-parallelized] Vo
103103
ginkgo.AfterEach(func() {
104104
ctx, cancel := context.WithCancel(context.Background())
105105
defer cancel()
106-
if supervisorCluster {
107-
deleteResourceQuota(client, namespace)
108-
}
109106
ginkgo.By("Deleting all PVCs")
110107
for _, claim := range pvclaims {
111108
err := fpv.DeletePersistentVolumeClaim(ctx, client, claim.Name, namespace)

‎tests/e2e/scale.go

-4
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,6 @@ var _ = ginkgo.Describe("Scale Test", func() {
7272
ginkgo.AfterEach(func() {
7373
ctx, cancel := context.WithCancel(context.Background())
7474
defer cancel()
75-
if supervisorCluster {
76-
deleteResourceQuota(client, namespace)
77-
}
78-
7975
for _, pvc := range pvclaims {
8076
pvclaimToDelete, err := client.CoreV1().PersistentVolumeClaims(pvc.Namespace).Get(
8177
ctx, pvc.Name, metav1.GetOptions{})

‎tests/e2e/storagepolicy.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ var _ = ginkgo.Describe("[csi-block-vanilla] [csi-block-vanilla-parallelized] "+
8181
})
8282
ginkgo.AfterEach(func() {
8383
if supervisorCluster {
84-
deleteResourceQuota(client, namespace)
8584
dumpSvcNsEventsOnTestFailure(client, namespace)
8685
}
8786
if guestCluster {
@@ -148,8 +147,10 @@ var _ = ginkgo.Describe("[csi-block-vanilla] [csi-block-vanilla-parallelized] "+
148147
setStoragePolicyQuota(ctx, restClientConfig, storagePolicyNameForNonSharedDatastores, namespace, rqLimit)
149148

150149
pvcspec := getPersistentVolumeClaimSpecWithStorageClass(namespace, "", storageclass, nil, accessMode)
151-
_, err = fpv.CreatePVC(ctx, client, namespace, pvcspec)
152-
gomega.Expect(err).To(gomega.HaveOccurred())
150+
pvc, _ := fpv.CreatePVC(ctx, client, namespace, pvcspec)
151+
isFailureFound := checkEventsforError(client, namespace,
152+
metav1.ListOptions{FieldSelector: fmt.Sprintf("involvedObject.name=%s", pvc.Name)}, expectedErrorMsg)
153+
gomega.Expect(isFailureFound).To(gomega.BeTrue(), expectedErrorMsg)
153154

154155
} else {
155156
scParameters[svStorageClassName] = storagePolicyNameForNonSharedDatastores

‎tests/e2e/util.go

+61-50
Original file line numberDiff line numberDiff line change
@@ -2329,63 +2329,71 @@ func createResourceQuota(client clientset.Interface, namespace string, size stri
23292329
ctx, cancel := context.WithCancel(context.Background())
23302330
defer cancel()
23312331

2332-
var storagePolicyNameForSharedDatastores string
23332332
var storagePolicyNameForSvc1 string
23342333
var storagePolicyNameForSvc2 string
23352334

2336-
waitTime := 15
2337-
var executeCreateResourceQuota bool
2338-
executeCreateResourceQuota = true
2339-
if !multipleSvc {
2340-
// reading export variable from a single supervisor cluster
2341-
storagePolicyNameForSharedDatastores = GetAndExpectStringEnvVar(envStoragePolicyNameForSharedDatastores)
2342-
} else {
2335+
// waitTime := 15
2336+
// var executeCreateResourceQuota bool
2337+
// executeCreateResourceQuota = true
2338+
if multipleSvc {
23432339
// reading multiple export variables from a multi svc setup
23442340
storagePolicyNameForSvc1 = GetAndExpectStringEnvVar(envStoragePolicyNameForSharedDsSvc1)
23452341
storagePolicyNameForSvc2 = GetAndExpectStringEnvVar(envStoragePolicyNameForSharedDsSvc2)
23462342
}
23472343

2344+
// if supervisorCluster {
2345+
// _, err := client.CoreV1().ResourceQuotas(namespace).Get(ctx, namespace+"-storagequota", metav1.GetOptions{})
2346+
// if !multipleSvc {
2347+
// if err != nil || !(scName == storagePolicyNameForSharedDatastores) {
2348+
// executeCreateResourceQuota = true
2349+
// } else {
2350+
// executeCreateResourceQuota = false
2351+
// }
2352+
// } else {
2353+
// if err != nil || !(scName == storagePolicyNameForSvc1) || !(scName == storagePolicyNameForSvc2) {
2354+
// executeCreateResourceQuota = true
2355+
// } else {
2356+
// executeCreateResourceQuota = false
2357+
// }
2358+
// }
2359+
// }
2360+
23482361
if supervisorCluster {
2349-
_, err := client.CoreV1().ResourceQuotas(namespace).Get(ctx, namespace+"-storagequota", metav1.GetOptions{})
2350-
if !multipleSvc {
2351-
if err != nil || !(scName == storagePolicyNameForSharedDatastores) {
2352-
executeCreateResourceQuota = true
2353-
} else {
2354-
executeCreateResourceQuota = false
2355-
}
2356-
} else {
2357-
if err != nil || !(scName == storagePolicyNameForSvc1) || !(scName == storagePolicyNameForSvc2) {
2358-
executeCreateResourceQuota = true
2359-
} else {
2360-
executeCreateResourceQuota = false
2361-
}
2362-
}
2362+
setStoragePolicyQuota(ctx, restConfig, scName, namespace, rqLimit)
23632363
}
23642364

2365-
if executeCreateResourceQuota {
2366-
// deleteResourceQuota if already present.
2367-
deleteResourceQuota(client, namespace)
2368-
2369-
resourceQuota := newTestResourceQuota(quotaName, size, scName)
2370-
resourceQuota, err := client.CoreV1().ResourceQuotas(namespace).Create(ctx, resourceQuota, metav1.CreateOptions{})
2371-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
2372-
ginkgo.By(fmt.Sprintf("Create Resource quota: %+v", resourceQuota))
2373-
ginkgo.By(fmt.Sprintf("Waiting for %v seconds to allow resourceQuota to be claimed", waitTime))
2374-
time.Sleep(time.Duration(waitTime) * time.Second)
2365+
if multipleSvc {
2366+
setStoragePolicyQuota(ctx, restConfig, storagePolicyNameForSvc1, namespace, rqLimit)
2367+
setStoragePolicyQuota(ctx, restConfig, storagePolicyNameForSvc2, namespace, rqLimit)
23752368
}
2369+
2370+
// if executeCreateResourceQuota {
2371+
// // deleteResourceQuota if already present.
2372+
// deleteResourceQuota(client, namespace)
2373+
2374+
// resourceQuota := newTestResourceQuota(quotaName, size, scName)
2375+
// resourceQuota, err := client.CoreV1().ResourceQuotas(namespace).Create(ctx, resourceQuota, metav1.CreateOptions{})
2376+
// gomega.Expect(err).NotTo(gomega.HaveOccurred())
2377+
// ginkgo.By(fmt.Sprintf("Create Resource quota: %+v", resourceQuota))
2378+
// ginkgo.By(fmt.Sprintf("Waiting for %v seconds to allow resourceQuota to be claimed", waitTime))
2379+
// time.Sleep(time.Duration(waitTime) * time.Second)
2380+
// }
23762381
}
23772382

23782383
// deleteResourceQuota deletes resource quota for the specified namespace,
23792384
// if it exists.
23802385
func deleteResourceQuota(client clientset.Interface, namespace string) {
2381-
ctx, cancel := context.WithCancel(context.Background())
2382-
defer cancel()
2383-
_, err := client.CoreV1().ResourceQuotas(namespace).Get(ctx, quotaName, metav1.GetOptions{})
2384-
if err == nil {
2385-
err = client.CoreV1().ResourceQuotas(namespace).Delete(ctx, quotaName, *metav1.NewDeleteOptions(0))
2386-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
2387-
ginkgo.By(fmt.Sprintf("Deleted Resource quota: %+v", quotaName))
2386+
if !supervisorCluster {
2387+
ctx, cancel := context.WithCancel(context.Background())
2388+
defer cancel()
2389+
_, err := client.CoreV1().ResourceQuotas(namespace).Get(ctx, quotaName, metav1.GetOptions{})
2390+
if err == nil {
2391+
err = client.CoreV1().ResourceQuotas(namespace).Delete(ctx, quotaName, *metav1.NewDeleteOptions(0))
2392+
gomega.Expect(err).NotTo(gomega.HaveOccurred())
2393+
ginkgo.By(fmt.Sprintf("Deleted Resource quota: %+v", quotaName))
2394+
}
23882395
}
2396+
23892397
}
23902398

23912399
// checks if resource quota gets updated or not
@@ -2415,8 +2423,11 @@ func checkResourceQuota(client clientset.Interface, namespace string, name strin
24152423
func setResourceQuota(client clientset.Interface, namespace string, size string) {
24162424
ctx, cancel := context.WithCancel(context.Background())
24172425
defer cancel()
2418-
// deleteResourceQuota if already present.
2419-
deleteResourceQuota(client, namespace)
2426+
if !supervisorCluster {
2427+
// deleteResourceQuota if already present.
2428+
deleteResourceQuota(client, namespace)
2429+
}
2430+
24202431
existingResourceQuota, err := client.CoreV1().ResourceQuotas(namespace).Get(ctx, namespace, metav1.GetOptions{})
24212432
if !apierrors.IsNotFound(err) {
24222433
gomega.Expect(err).NotTo(gomega.HaveOccurred())
@@ -2433,15 +2444,15 @@ func setResourceQuota(client clientset.Interface, namespace string, size string)
24332444

24342445
// newTestResourceQuota returns a quota that enforces default constraints for
24352446
// testing.
2436-
func newTestResourceQuota(name string, size string, scName string) *v1.ResourceQuota {
2437-
hard := v1.ResourceList{}
2438-
// Test quota on discovered resource type.
2439-
hard[v1.ResourceName(scName+rqStorageType)] = resource.MustParse(size)
2440-
return &v1.ResourceQuota{
2441-
ObjectMeta: metav1.ObjectMeta{Name: name},
2442-
Spec: v1.ResourceQuotaSpec{Hard: hard},
2443-
}
2444-
}
2447+
// func newTestResourceQuota(name string, size string, scName string) *v1.ResourceQuota {
2448+
// hard := v1.ResourceList{}
2449+
// // Test quota on discovered resource type.
2450+
// hard[v1.ResourceName(scName+rqStorageType)] = resource.MustParse(size)
2451+
// return &v1.ResourceQuota{
2452+
// ObjectMeta: metav1.ObjectMeta{Name: name},
2453+
// Spec: v1.ResourceQuotaSpec{Hard: hard},
2454+
// }
2455+
// }
24452456

24462457
// updatedSpec4ExistingResourceQuota returns a quota that enforces default
24472458
// constraints for testing.

‎tests/e2e/vc_reboot_volume_lifecycle.go

-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ var _ bool = ginkgo.Describe("Verify volume life_cycle operations works fine aft
7171
ctx, cancel := context.WithCancel(context.Background())
7272
defer cancel()
7373
if supervisorCluster || guestCluster {
74-
deleteResourceQuota(client, namespace)
7574
dumpSvcNsEventsOnTestFailure(client, namespace)
7675
}
7776
if guestCluster {

‎tests/e2e/vsphere_shared_datastore.go

-4
Original file line numberDiff line numberDiff line change
@@ -190,10 +190,6 @@ var _ = ginkgo.Describe("[csi-block-vanilla] [csi-block-vanilla-parallelized] "+
190190
defer func() {
191191
err := fpv.DeletePersistentVolumeClaim(ctx, client, pvclaim.Name, namespace)
192192
gomega.Expect(err).NotTo(gomega.HaveOccurred())
193-
if supervisorCluster {
194-
ginkgo.By("Delete Resource quota")
195-
deleteResourceQuota(client, namespace)
196-
}
197193
}()
198194

199195
// Waiting for PVC to be bound

‎tests/e2e/vsphere_volume_disksize.go

-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ var _ = ginkgo.Describe("[csi-block-vanilla] [csi-file-vanilla] [csi-supervisor]
7575

7676
ginkgo.AfterEach(func() {
7777
if supervisorCluster {
78-
deleteResourceQuota(client, namespace)
7978
dumpSvcNsEventsOnTestFailure(client, namespace)
8079
}
8180
if guestCluster {

‎tests/e2e/vsphere_volume_expansion.go

-14
Original file line numberDiff line numberDiff line change
@@ -3053,10 +3053,6 @@ func invokeTestForVolumeExpansion(f *framework.Framework, client clientset.Inter
30533053
defer func() {
30543054
err := fpv.DeletePersistentVolumeClaim(ctx, client, pvclaim.Name, namespace)
30553055
gomega.Expect(err).NotTo(gomega.HaveOccurred())
3056-
if supervisorCluster {
3057-
ginkgo.By("Delete Resource quota")
3058-
deleteResourceQuota(client, namespace)
3059-
}
30603056
}()
30613057

30623058
// Waiting for PVC to be bound
@@ -3614,10 +3610,6 @@ func invokeTestForInvalidVolumeShrink(f *framework.Framework, client clientset.I
36143610
defer func() {
36153611
err := fpv.DeletePersistentVolumeClaim(ctx, client, pvclaim.Name, namespace)
36163612
gomega.Expect(err).NotTo(gomega.HaveOccurred())
3617-
if supervisorCluster {
3618-
ginkgo.By("Delete Resource quota")
3619-
deleteResourceQuota(client, namespace)
3620-
}
36213613
}()
36223614

36233615
// Waiting for PVC to be bound
@@ -3848,10 +3840,6 @@ func invokeTestForExpandVolumeMultipleTimes(f *framework.Framework, client clien
38483840
err := fpv.DeletePersistentVolumeClaim(ctx, client, pvclaim.Name, namespace)
38493841
gomega.Expect(err).NotTo(gomega.HaveOccurred())
38503842

3851-
if supervisorCluster {
3852-
ginkgo.By("Delete Resource quota")
3853-
deleteResourceQuota(client, namespace)
3854-
}
38553843
}()
38563844

38573845
// Waiting for PVC to be bound
@@ -4302,8 +4290,6 @@ func testCleanUpUtil(ctx context.Context, restClientConfig *restclient.Config, c
43024290
cnsRegistervolume, poll, supervisorClusterOperationsTimeout))
43034291
}
43044292

4305-
ginkgo.By("Delete Resource quota")
4306-
deleteResourceQuota(c, namespace)
43074293
}
43084294

43094295
func offlineVolumeExpansionOnSupervisorPVC(client clientset.Interface, f *framework.Framework, namespace string,

0 commit comments

Comments
 (0)