Skip to content

Commit ad6c398

Browse files
authored
WCP tests for PQ and EF (#3587)
1 parent d8354a0 commit ad6c398

16 files changed

+101
-101
lines changed

tests/e2e/config_change_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ var _ bool = ginkgo.Describe("[csi-supervisor] config-change-test", func() {
6868
7. Revert the password change
6969
8. Delete Storage class
7070
*/
71-
ginkgo.It("verify PVC deletion after VC password change", ginkgo.Label(p1, block, wcp, vc80), func() {
71+
ginkgo.It("[pq-wcp]verify PVC deletion after VC password change", ginkgo.Label(p1, block, wcp, vc80), func() {
7272
ginkgo.By("Invoking password change test")
7373
profileID := e2eVSphere.GetSpbmPolicyID(storagePolicyName)
7474
scParameters[scParamStoragePolicyID] = profileID

tests/e2e/crypto.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ import (
4444
"sigs.k8s.io/vsphere-csi-driver/v3/pkg/csi/service/logger"
4545
)
4646

47-
var _ = ginkgo.Describe("[csi-supervisor] [encryption] Block volume encryption", func() {
47+
var _ = ginkgo.Describe("[ef-encryption][csi-supervisor] [encryption] Block volume encryption", func() {
4848
f := framework.NewDefaultFramework("encryption")
4949
f.NamespacePodSecurityEnforceLevel = admissionapi.LevelPrivileged
5050

tests/e2e/crypto_snapshot.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ import (
4545
"sigs.k8s.io/vsphere-csi-driver/v3/pkg/csi/service/logger"
4646
)
4747

48-
var _ = ginkgo.Describe("[csi-supervisor] [encryption] Block volume snapshot encryption", func() {
48+
var _ = ginkgo.Describe("[ef-encryption][csi-supervisor] [encryption] Block volume snapshot encryption", func() {
4949
f := framework.NewDefaultFramework("encryption")
5050
f.NamespacePodSecurityEnforceLevel = admissionapi.LevelPrivileged
5151

tests/e2e/csi_static_provisioning_basic.go

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -761,7 +761,7 @@ var _ = ginkgo.Describe("Basic Static Provisioning", func() {
761761
// 9. Verify PV is deleted automatically.
762762
// 10. Verify Volume id deleted automatically.
763763
// 11. Verify CRD deleted automatically.
764-
ginkgo.It("[csi-supervisor] Verify static provisioning workflow on SVC - import "+
764+
ginkgo.It("[ef-wcp][csi-supervisor] Verify static provisioning workflow on SVC - import "+
765765
"CNS volume", ginkgo.Label(p0, block, wcp, vc70), func() {
766766
var err error
767767
ctx, cancel := context.WithCancel(context.Background())
@@ -846,8 +846,8 @@ var _ = ginkgo.Describe("Basic Static Provisioning", func() {
846846
// 9. Verify PV is deleted automatically.
847847
// 10. Verify Volume id deleted automatically.
848848
// 11. Verify CRD deleted automatically.
849-
ginkgo.It("[cf-wcp] [csi-supervisor] [stretched-svc] Verify static provisioning workflow on SVC import "+
850-
"FCD", ginkgo.Label(p0, block, wcp, vc70), func() {
849+
ginkgo.It("[cf-wcp][ef-stretched-svc][csi-supervisor] [stretched-svc] Verify static provisioning workflow on "+
850+
"SVC import FCD", ginkgo.Label(p0, block, wcp, vc70), func() {
851851
var err error
852852
var totalQuotaUsedBefore, storagePolicyQuotaBefore, storagePolicyUsageBefore *resource.Quantity
853853
ctx, cancel := context.WithCancel(context.Background())
@@ -963,7 +963,7 @@ var _ = ginkgo.Describe("Basic Static Provisioning", func() {
963963
// 12. Verify PV is deleted automatically.
964964
// 13. Verify Volume id deleted automatically.
965965
// 14. Verify CRD deleted automatically.
966-
ginkgo.It("[csi-supervisor] Verify static provisioning workflow on svc - when there is no "+
966+
ginkgo.It("[ef-wcp][csi-supervisor] Verify static provisioning workflow on svc - when there is no "+
967967
"resourcequota available", ginkgo.Label(p1, block, wcp, vc70, vc80), func() {
968968
var err error
969969
ctx, cancel := context.WithCancel(context.Background())
@@ -1078,7 +1078,7 @@ var _ = ginkgo.Describe("Basic Static Provisioning", func() {
10781078
// 5. Create CNS register volume with above created FCD, AccessMode as "ReadOnlyMany".
10791079
// 6. verify the error message.
10801080
// 7. Delete Resource quota.
1081-
ginkgo.It("[csi-supervisor] Verify static provisioning when AccessMode is ReadWriteMany or "+
1081+
ginkgo.It("[ef-wcp][csi-supervisor] Verify static provisioning when AccessMode is ReadWriteMany or "+
10821082
"ReadOnlyMany", ginkgo.Label(p1, block, wcp, vc70), func() {
10831083
var err error
10841084
ctx, cancel := context.WithCancel(context.Background())
@@ -1137,7 +1137,7 @@ var _ = ginkgo.Describe("Basic Static Provisioning", func() {
11371137
// 8. Verify PV is deleted automatically.
11381138
// 9. Verify Volume id deleted automatically.
11391139
// 10. Verify CRD deleted automatically.
1140-
ginkgo.It("[csi-supervisor] Verify static provisioning workflow - when "+
1140+
ginkgo.It("[ef-wcp][csi-supervisor] Verify static provisioning workflow - when "+
11411141
"DuplicateFCD is used", ginkgo.Label(p2, block, wcp, vc70), func() {
11421142

11431143
var err error
@@ -1241,7 +1241,7 @@ var _ = ginkgo.Describe("Basic Static Provisioning", func() {
12411241
// 10. Verify PV is deleted automatically.
12421242
// 11. Verify Volume id deleted automatically.
12431243
// 12. Verify CRD deleted automatically.
1244-
ginkgo.It("[csi-supervisor] Verify static provisioning workflow - when "+
1244+
ginkgo.It("[ef-wcp][csi-supervisor] Verify static provisioning workflow - when "+
12451245
"DuplicatePVC name is used", ginkgo.Label(p2, block, wcp, vc70), func() {
12461246

12471247
var err error
@@ -1341,7 +1341,7 @@ var _ = ginkgo.Describe("Basic Static Provisioning", func() {
13411341
// 8. Delete PVC.
13421342
// 9. PV and CRD gets auto deleted.
13431343
// 10. Delete Resource quota.
1344-
ginkgo.It("[csi-supervisor] Verifies static provisioning workflow on supervisor cluster - "+
1344+
ginkgo.It("[pq-wcp][csi-supervisor] Verifies static provisioning workflow on supervisor cluster - "+
13451345
"When vsanhealthService is down", ginkgo.Label(p2, block, wcp, negative, vc70), func() {
13461346

13471347
var err error
@@ -1422,7 +1422,7 @@ var _ = ginkgo.Describe("Basic Static Provisioning", func() {
14221422
// 8. Delete PVC.
14231423
// 9. PV and CRD gets auto deleted.
14241424
// 10. Delete Resource quota.
1425-
ginkgo.It("[csi-supervisor] Verifies static provisioning workflow on SVC - When "+
1425+
ginkgo.It("[pq-wcp][csi-supervisor] Verifies static provisioning workflow on SVC - When "+
14261426
"SPS service is down", ginkgo.Label(p2, block, wcp, negative, vc70), func() {
14271427

14281428
var err error
@@ -1496,7 +1496,7 @@ var _ = ginkgo.Describe("Basic Static Provisioning", func() {
14961496
// 3. Create CNS register volume with above created FCD.
14971497
// 4. Verify the error message.
14981498
// 5. Delete Resource quota.
1499-
ginkgo.It("[csi-supervisor] Verify static provisioning workflow SVC - On "+
1499+
ginkgo.It("[ef-wcp][csi-supervisor] Verify static provisioning workflow SVC - On "+
15001500
"non shared datastore", ginkgo.Label(p2, block, wcp, vc70), func() {
15011501
var err error
15021502
ctx, cancel := context.WithCancel(context.Background())
@@ -1554,7 +1554,7 @@ var _ = ginkgo.Describe("Basic Static Provisioning", func() {
15541554
// 2. Create Resource quota.
15551555
// 3. Create CNS register volume with above created FCD.
15561556
// 4. Verify the error message.
1557-
ginkgo.It("[csi-supervisor] Verify creating static provisioning workflow when FCD "+
1557+
ginkgo.It("[ef-wcp][csi-supervisor] Verify creating static provisioning workflow when FCD "+
15581558
"with no storage policy", ginkgo.Label(p2, block, wcp, negative, vc70), func() {
15591559
var err error
15601560
ctx, cancel := context.WithCancel(context.Background())
@@ -1614,9 +1614,8 @@ var _ = ginkgo.Describe("Basic Static Provisioning", func() {
16141614
// 2. Create a storage policy.
16151615
// 3. Create FCD with the above created storage policy.
16161616
// 4. Import the volume created in step 3 to namespace created in step 1.
1617-
ginkgo.It("[csi-supervisor] static provisioning workflow - "+
1618-
"when tried to import volume with a storage policy that "+
1619-
"doesn't belong to the namespace", ginkgo.Label(p2, block, wcp, negative, vc70), func() {
1617+
ginkgo.It("[ef-wcp][csi-supervisor] static provisioning workflow - when tried to import volume with a storage "+
1618+
"policy that doesn't belong to the namespace", ginkgo.Label(p2, block, wcp, negative, vc70), func() {
16201619

16211620
var err error
16221621
ctx, cancel := context.WithCancel(context.Background())
@@ -1900,7 +1899,7 @@ var _ = ginkgo.Describe("Basic Static Provisioning", func() {
19001899
// 7. Delete Namespace.
19011900
// 8. Verify that PV's got deleted (This ensures that all PVC, CNS register
19021901
// volumes and POD's are deleted).
1903-
ginkgo.It("[csi-supervisor] Perform static and dynamic provisioning together, "+
1902+
ginkgo.It("[ef-wcp][csi-supervisor] Perform static and dynamic provisioning together, "+
19041903
"Create Pod and delete Namespace", ginkgo.Label(p1, block, wcp, vc70), func() {
19051904
var err error
19061905
ctx, cancel := context.WithCancel(context.Background())
@@ -1996,8 +1995,8 @@ var _ = ginkgo.Describe("Basic Static Provisioning", func() {
19961995
// 2. Create Resource quota.
19971996
// 3. Create CNS register volume with above created VMDK.
19981997
// 4. verify PV, PVC got created , check the bidirectional reference.
1999-
ginkgo.It("[csi-supervisor] Verify static provisioning - import "+
2000-
"VMDK", ginkgo.Label(p1, block, wcp, vc70), func() {
1998+
ginkgo.It("[pq-wcp][csi-supervisor] Verify static provisioning - import VMDK", ginkgo.Label(p1,
1999+
block, wcp, vc70), func() {
20012000
var err error
20022001
ctx, cancel := context.WithCancel(context.Background())
20032002
defer cancel()
@@ -2077,7 +2076,7 @@ var _ = ginkgo.Describe("Basic Static Provisioning", func() {
20772076
// 3. Create CNS register volume with above created VMDK and FCDID.
20782077
// 4. Verify the error message "VolumeID and DiskURLPath cannot be specified
20792078
// together".
2080-
ginkgo.It("[csi-supervisor] Specify VolumeID and DiskURL together and "+
2079+
ginkgo.It("[pq-wcp]csi-supervisor] Specify VolumeID and DiskURL together and "+
20812080
"verify the error message", ginkgo.Label(p2, block, wcp, negative, vc70), func() {
20822081

20832082
var err error
@@ -2149,7 +2148,7 @@ var _ = ginkgo.Describe("Basic Static Provisioning", func() {
21492148
7.Verify Volume is deleted.
21502149
8.Delete FCD.
21512150
*/
2152-
ginkgo.It("[csi-block-vanilla] [csi-supervisor] Full sync to deregister/delete "+
2151+
ginkgo.It("[ef-wcp][csi-block-vanilla] [csi-supervisor] Full sync to deregister/delete "+
21532152
"volume", ginkgo.Label(p0, block, wcp, vanilla, core, vc70), func() {
21542153
var err error
21552154
ctx, cancel := context.WithCancel(context.Background())
@@ -2303,7 +2302,7 @@ var _ = ginkgo.Describe("Basic Static Provisioning", func() {
23032302
5.Wait for volume to be deleted from K8s.
23042303
6.Wait for Volume to be deleted on CNS
23052304
*/
2306-
ginkgo.It("[csi-block-vanilla] [csi-supervisor] VMDK is deleted from datastore "+
2305+
ginkgo.It("[ef-wcp][csi-block-vanilla] [csi-supervisor] VMDK is deleted from datastore "+
23072306
"but CNS volume is still present", ginkgo.Label(p1, block, wcp, vanilla, core, vc70), func() {
23082307
var err error
23092308
ctx, cancel := context.WithCancel(context.Background())

tests/e2e/data_persistence.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ var _ = ginkgo.Describe("Data Persistence", func() {
118118
}
119119
})
120120

121-
ginkgo.It("[csi-block-vanilla][cf-vanilla-block][ef-vks][csi-supervisor] [csi-guest] "+
121+
ginkgo.It("[ef-wcp][csi-block-vanilla][cf-vanilla-block][ef-vks][csi-supervisor][csi-guest]"+
122122
"[csi-block-vanilla-parallelized] Should create and delete pod with the same volume"+
123123
" source and data", ginkgo.Label(p0, block, vanilla, wcp, tkg, core, vc70), func() {
124124
ctx, cancel := context.WithCancel(context.Background())
@@ -437,7 +437,7 @@ var _ = ginkgo.Describe("Data Persistence", func() {
437437
// 14. Verify Volume id deleted automatically.
438438
// 15. Verify CRD deleted automatically.
439439
// 16. Delete resource quota.
440-
ginkgo.It("[csi-supervisor] Data Persistence in case of Static Volume Provisioning on "+
440+
ginkgo.It("[ef-wcp][csi-supervisor] Data Persistence in case of Static Volume Provisioning on "+
441441
"SVC", ginkgo.Label(p0, block, wcp, vc70), func() {
442442
var pvc *v1.PersistentVolumeClaim
443443
var err error

tests/e2e/fullsync_test_for_block_volume.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,9 @@ var _ bool = ginkgo.Describe("full-sync-test", func() {
209209

210210
})
211211

212-
ginkgo.It("[csi-supervisor] [csi-block-vanilla] [csi-block-vanilla-serialized] Verify labels are created in "+
213-
"CNS after updating pvc and/or pv with new labels", ginkgo.Label(p0, block, vanilla, wcp, core, vc70), func() {
212+
ginkgo.It("[ef-wcp][csi-supervisor] [csi-block-vanilla] [csi-block-vanilla-serialized] Verify labels are created "+
213+
"in CNS after updating pvc and/or pv with new labels", ginkgo.Label(p0, block, vanilla, wcp, core,
214+
vc70), func() {
214215
ginkgo.By("Invoking test to verify labels creation")
215216
var sc *storagev1.StorageClass
216217
var pvc *v1.PersistentVolumeClaim
@@ -297,7 +298,7 @@ var _ bool = ginkgo.Describe("full-sync-test", func() {
297298

298299
})
299300

300-
ginkgo.It("[csi-supervisor] [csi-block-vanilla] [csi-block-vanilla-serialized] Verify CNS volume is "+
301+
ginkgo.It("[ef-wcp][csi-supervisor] [csi-block-vanilla] [csi-block-vanilla-serialized] Verify CNS volume is "+
301302
"deleted after full sync when pv entry is delete", ginkgo.Label(p0, block, vanilla, wcp, core, vc70), func() {
302303
ginkgo.By("Invoking test to verify CNS volume creation")
303304
ctx, cancel := context.WithCancel(context.Background())
@@ -778,9 +779,9 @@ var _ bool = ginkgo.Describe("full-sync-test", func() {
778779
8. delete pod2
779780
9. delete pvc1
780781
*/
781-
ginkgo.It("[csi-block-vanilla] [csi-supervisor] [csi-guest] [csi-block-vanilla-serialized] Attach volume "+
782-
"to a new pod when CNS is down and verify volume metadata in CNS post full "+
783-
"sync", ginkgo.Label(p1, negative, block, vanilla, wcp, tkg, core, vc70), func() {
782+
ginkgo.It("[ef-wcp][csi-block-vanilla][csi-supervisor][csi-guest][csi-block-vanilla-serialized] Attach volume "+
783+
"to a new pod when CNS is down and verify volume metadata in CNS post full sync", ginkgo.Label(p1, negative,
784+
block, vanilla, wcp, tkg, core, vc70), func() {
784785
ctx, cancel := context.WithCancel(context.Background())
785786
defer cancel()
786787
var err error

tests/e2e/snapshot_vmservice_vm.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2846,7 +2846,7 @@ var _ bool = ginkgo.Describe("[snapshot-vmsvc] Snapshot VM Service VM", func() {
28462846
Cleanup: Execute and verify the steps mentioned in the Delete snapshot mandatory checks
28472847
*/
28482848

2849-
ginkgo.It("[stretched-svc] Taking snapshot of a vm service vm in a stretched supervisor "+
2849+
ginkgo.It("[ef-stretched-svc][stretched-svc] Taking snapshot of a vm service vm in a stretched supervisor "+
28502850
"cluster", ginkgo.Label(p0, block, stretchedSvc, vmServiceVm, snapshot, vc80), func() {
28512851

28522852
ctx, cancel := context.WithCancel(context.Background())
@@ -3068,8 +3068,8 @@ var _ bool = ginkgo.Describe("[snapshot-vmsvc] Snapshot VM Service VM", func() {
30683068
25. Cleanup: Execute and verify the steps mentioned in the Delete snapshot mandatory checks
30693069
*/
30703070

3071-
ginkgo.It("[stretched-svc] Restoring snapshots and attaching it to a new vm service vms in a stretched supervisor "+
3072-
"env", ginkgo.Label(p0, block, stretchedSvc, snapshot, vc80), func() {
3071+
ginkgo.It("[ef-stretched-svc][stretched-svc] Restoring snapshots and attaching it to a new vm service vms in a "+
3072+
"stretched supervisor env", ginkgo.Label(p0, block, stretchedSvc, snapshot, vc80), func() {
30733073

30743074
ctx, cancel := context.WithCancel(context.Background())
30753075
defer cancel()

tests/e2e/statefulsets.go

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@ var _ = ginkgo.Describe("statefulset", func() {
170170
7. clean up the statefulset
171171
*/
172172

173-
ginkgo.It("[cf-wcp] [csi-block-vanilla] [csi-supervisor] [csi-block-vanilla-parallelized] [stretched-svc] "+
174-
"Statefulset testing with default podManagementPolicy", ginkgo.Label(p0, vanilla, block, wcp,
173+
ginkgo.It("[ef-stretched-svc][cf-wcp] [csi-block-vanilla] [csi-supervisor] [csi-block-vanilla-parallelized] "+
174+
"[stretched-svc] Statefulset testing with default podManagementPolicy", ginkgo.Label(p0, vanilla, block, wcp,
175175
core, vc70), func() {
176176
ctx, cancel := context.WithCancel(context.Background())
177177

@@ -417,7 +417,7 @@ var _ = ginkgo.Describe("statefulset", func() {
417417
8. Delete all PVCs from the tests namespace.
418418
9. Delete the storage class.
419419
*/
420-
ginkgo.It("[csi-block-vanilla] [csi-supervisor] [csi-block-vanilla-parallelized] Statefulset "+
420+
ginkgo.It("[ef-wcp][csi-block-vanilla] [csi-supervisor] [csi-block-vanilla-parallelized] Statefulset "+
421421
"testing with parallel podManagementPolicy", ginkgo.Label(p0, vanilla, block, wcp, core, vc70), func() {
422422
ctx, cancel := context.WithCancel(context.Background())
423423
defer cancel()
@@ -616,7 +616,7 @@ var _ = ginkgo.Describe("statefulset", func() {
616616
10. scale down statefulset to 0
617617
11. delete statefulset and all PVC's and SC's
618618
*/
619-
ginkgo.It("[csi-block-vanilla] [csi-supervisor] [csi-block-vanilla-parallelized] [csi-vcp-mig] Verify "+
619+
ginkgo.It("[ef-wcp][csi-block-vanilla] [csi-supervisor] [csi-block-vanilla-parallelized] [csi-vcp-mig] Verify "+
620620
"online volume expansion on statefulset", ginkgo.Label(p1, vanilla, block, wcp, vcptocsiTest,
621621
vc70), func() {
622622
ctx, cancel := context.WithCancel(context.Background())
@@ -827,7 +827,7 @@ var _ = ginkgo.Describe("statefulset", func() {
827827
12. Inncrease the CSI driver replica to 3
828828
829829
*/
830-
ginkgo.It("[csi-block-vanilla] [csi-supervisor] ListVolumeResponse "+
830+
ginkgo.It("[ef-wcp][csi-block-vanilla] [csi-supervisor] ListVolumeResponse "+
831831
"Validation", ginkgo.Label(p1, listVolume, block, vanilla, wcp, vc70), func() {
832832
ctx, cancel := context.WithCancel(context.Background())
833833
defer cancel()
@@ -1009,7 +1009,7 @@ var _ = ginkgo.Describe("statefulset", func() {
10091009
5. Scale up replica to 5.
10101010
6. Exit MM and clean up all pods and PVs.
10111011
*/
1012-
ginkgo.It("[csi-supervisor] Test MM workflow on statefulset", ginkgo.Label(p1, block, wcp,
1012+
ginkgo.It("[ef-wcp][csi-supervisor] Test MM workflow on statefulset", ginkgo.Label(p1, block, wcp,
10131013
disruptive, vc70), func() {
10141014
ctx, cancel := context.WithCancel(context.Background())
10151015
defer cancel()
@@ -1117,7 +1117,7 @@ var _ = ginkgo.Describe("statefulset", func() {
11171117
7. clean up the data
11181118
*/
11191119

1120-
ginkgo.It("[stretched-svc] Statefulset-parallel-podManagementPolicy-wffc",
1120+
ginkgo.It("[ef-stretched-svc][stretched-svc] Statefulset-parallel-podManagementPolicy-wffc",
11211121
ginkgo.Label(p0, block, stretchedSvc, vc70), func() {
11221122
ctx, cancel := context.WithCancel(context.Background())
11231123
defer cancel()
@@ -1191,7 +1191,8 @@ var _ = ginkgo.Describe("statefulset", func() {
11911191
7. clean up the data
11921192
*/
11931193

1194-
ginkgo.It("[stretched-svc] statefulset-nodeAffinity", ginkgo.Label(p0, block, stretchedSvc, vc70), func() {
1194+
ginkgo.It("[ef-stretched-svc][stretched-svc] statefulset-nodeAffinity", ginkgo.Label(p0, block, stretchedSvc,
1195+
vc70), func() {
11951196
ctx, cancel := context.WithCancel(context.Background())
11961197
defer cancel()
11971198
ginkgo.By("Creating StorageClass for Statefulset")
@@ -1263,7 +1264,8 @@ var _ = ginkgo.Describe("statefulset", func() {
12631264
4. Verify allowed topology details on PV
12641265
6. clean up the data
12651266
*/
1266-
ginkgo.It("[stretched-svc] statefulset-pod-Affinity", ginkgo.Label(p0, block, stretchedSvc, vc80), func() {
1267+
ginkgo.It("[ef-stretched-svc][stretched-svc] statefulset-pod-Affinity", ginkgo.Label(p0, block, stretchedSvc,
1268+
vc80), func() {
12671269
ctx, cancel := context.WithCancel(context.Background())
12681270
defer cancel()
12691271
ginkgo.By("Creating StorageClass for Statefulset")

0 commit comments

Comments
 (0)