Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit f882878

Browse files
author
Aishwarya-Hebbar
committedJan 21, 2025·
CNS UnRegisterVolume testcase automation
1 parent f666450 commit f882878

16 files changed

+4315
-2241
lines changed
 

‎tests/e2e/cns_unregister_volume_api.go

+1,176
Large diffs are not rendered by default.

‎tests/e2e/csi_snapshot_basic.go

+1,409-1,769
Large diffs are not rendered by default.

‎tests/e2e/gc_rwx_basic.go

+1,147-276
Large diffs are not rendered by default.

‎tests/e2e/multi_vc.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -937,7 +937,7 @@ var _ = ginkgo.Describe("[multivc-positive] MultiVc-Topology-Positive", func() {
937937
ginkgo.By("Verify PV node affinity and that the PODS are running on appropriate node")
938938
for i := 0; i < len(podList); i++ {
939939
err = verifyPVnodeAffinityAndPODnodedetailsForStandalonePodLevel5(ctx, client, podList[i],
940-
allowedTopologies)
940+
namespace, allowedTopologies)
941941
gomega.Expect(err).NotTo(gomega.HaveOccurred())
942942
}
943943

@@ -1373,7 +1373,7 @@ var _ = ginkgo.Describe("[multivc-positive] MultiVc-Topology-Positive", func() {
13731373
ginkgo.By("Verify PV node affinity and that the PODS are running " +
13741374
"on appropriate node as specified in the allowed topologies of SC")
13751375
err = verifyPVnodeAffinityAndPODnodedetailsForStandalonePodLevel5(ctx, client, pod,
1376-
allowedTopologies)
1376+
namespace, allowedTopologies)
13771377
gomega.Expect(err).NotTo(gomega.HaveOccurred())
13781378
})
13791379

@@ -1983,7 +1983,7 @@ var _ = ginkgo.Describe("[multivc-positive] MultiVc-Topology-Positive", func() {
19831983

19841984
ginkgo.By("Verify pv and pod node affinity")
19851985
err = verifyPVnodeAffinityAndPODnodedetailsForStandalonePodLevel5(ctx, client, pod,
1986-
allowedTopologies)
1986+
namespace, allowedTopologies)
19871987
gomega.Expect(err).NotTo(gomega.HaveOccurred())
19881988
})
19891989

‎tests/e2e/multi_vc_preferential_topology.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,7 @@ var _ = ginkgo.Describe("[multivc-preferential] MultiVc-Preferential", func() {
630630
ginkgo.By("Verify PV node affinity and that the PODS are running on " +
631631
"appropriate node as specified in the allowed topologies of SC")
632632
err = verifyPVnodeAffinityAndPODnodedetailsForStandalonePodLevel5(ctx, client, pod,
633-
allowedTopologies)
633+
namespace, allowedTopologies)
634634
gomega.Expect(err).NotTo(gomega.HaveOccurred())
635635
})
636636

‎tests/e2e/preferential_topology.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ var _ = ginkgo.Describe("[preferential-positive] Preferential-Topology-Positive"
375375
ginkgo.By("Verify PV node affinity and that the PODS are running on appropriate " +
376376
"node as specified in the allowed topologies of SC")
377377
err = verifyPVnodeAffinityAndPODnodedetailsForStandalonePodLevel5(ctx, client, pod,
378-
allowedTopologyForRack1)
378+
namespace, allowedTopologyForRack1)
379379
gomega.Expect(err).NotTo(gomega.HaveOccurred())
380380
})
381381

@@ -1174,7 +1174,7 @@ var _ = ginkgo.Describe("[preferential-positive] Preferential-Topology-Positive"
11741174
ginkgo.By("Verify PV node affinity and that the PODS are running on appropriate " +
11751175
"node as specified in the allowed topologies of SC")
11761176
err = verifyPVnodeAffinityAndPODnodedetailsForStandalonePodLevel5(ctx, client, pod,
1177-
allowedTopologyForRack1)
1177+
namespace, allowedTopologyForRack1)
11781178
gomega.Expect(err).NotTo(gomega.HaveOccurred())
11791179

11801180
})
@@ -1349,7 +1349,7 @@ var _ = ginkgo.Describe("[preferential-positive] Preferential-Topology-Positive"
13491349
ginkgo.By("Verify PV node affinity and that the PODS are running on appropriate " +
13501350
"node as specified in the allowed topologies of SC")
13511351
err = verifyPVnodeAffinityAndPODnodedetailsForStandalonePodLevel5(ctx, client, pod,
1352-
allowedTopologyForRack3)
1352+
namespace, allowedTopologyForRack3)
13531353
gomega.Expect(err).NotTo(gomega.HaveOccurred())
13541354

13551355
// perform statefulset scaleup

‎tests/e2e/preferential_topology_disruptive.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ var _ = ginkgo.Describe("[preferential-disruptive] Preferential-Topology-Disrupt
635635
ginkgo.By("Verify PV node affinity and that the PODS are running on appropriate " +
636636
"node as specified in the allowed topologies of SC")
637637
err = verifyPVnodeAffinityAndPODnodedetailsForStandalonePodLevel5(ctx, client, pod,
638-
allowedTopologyForRack2)
638+
namespace, allowedTopologyForRack2)
639639
gomega.Expect(err).NotTo(gomega.HaveOccurred())
640640

641641
// perform statefulset scaleup
@@ -868,7 +868,7 @@ var _ = ginkgo.Describe("[preferential-disruptive] Preferential-Topology-Disrupt
868868
ginkgo.By("Verify PV node affinity and that the PODS are running on appropriate " +
869869
"node as specified in the allowed topologies of SC")
870870
err = verifyPVnodeAffinityAndPODnodedetailsForStandalonePodLevel5(ctx, client, pod,
871-
allowedTopologyForRack1)
871+
namespace, allowedTopologyForRack1)
872872
gomega.Expect(err).NotTo(gomega.HaveOccurred())
873873

874874
// perform statefulset scaleup
@@ -1099,7 +1099,7 @@ var _ = ginkgo.Describe("[preferential-disruptive] Preferential-Topology-Disrupt
10991099
ginkgo.By("Verify PV node affinity and that the PODS are running on appropriate " +
11001100
"node as specified in the allowed topologies of SC")
11011101
err = verifyPVnodeAffinityAndPODnodedetailsForStandalonePodLevel5(ctx, client, pod,
1102-
allowedTopologyForRack2)
1102+
namespace, allowedTopologyForRack2)
11031103
gomega.Expect(err).NotTo(gomega.HaveOccurred())
11041104

11051105
// perform statefulset scaleup

‎tests/e2e/preferential_topology_snapshot.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ var _ = ginkgo.Describe("[preferential-snapshot] Preferential-Topology-Snapshot"
340340
ginkgo.By("Verify PV node affinity and that the PODS are running on " +
341341
"appropriate node as specified in the allowed topologies of SC")
342342
err = verifyPVnodeAffinityAndPODnodedetailsForStandalonePodLevel5(ctx, client, pod,
343-
allowedTopologyForRack1)
343+
namespace, allowedTopologyForRack1)
344344
gomega.Expect(err).NotTo(gomega.HaveOccurred())
345345
})
346346

@@ -687,7 +687,7 @@ var _ = ginkgo.Describe("[preferential-snapshot] Preferential-Topology-Snapshot"
687687
"appropriate node as specified in the allowed topologies of SC")
688688
for i := 0; i < len(podList); i++ {
689689
err = verifyPVnodeAffinityAndPODnodedetailsForStandalonePodLevel5(ctx, client, podList[i],
690-
allowedTopologies)
690+
namespace, allowedTopologies)
691691
gomega.Expect(err).NotTo(gomega.HaveOccurred())
692692
}
693693

@@ -747,7 +747,7 @@ var _ = ginkgo.Describe("[preferential-snapshot] Preferential-Topology-Snapshot"
747747
ginkgo.By("Verify PV node affinity and that the PODS are running on " +
748748
"appropriate node as specified in the allowed topologies of SC")
749749
err = verifyPVnodeAffinityAndPODnodedetailsForStandalonePodLevel5(ctx, client, pod3,
750-
allowedTopologies)
750+
namespace, allowedTopologies)
751751
gomega.Expect(err).NotTo(gomega.HaveOccurred())
752752

753753
ginkgo.By("Remove preferred datastore tag chosen for volume provisioning")
@@ -842,7 +842,7 @@ var _ = ginkgo.Describe("[preferential-snapshot] Preferential-Topology-Snapshot"
842842
ginkgo.By("Verify PV node affinity and that the PODS are running on " +
843843
"appropriate node as specified in the allowed topologies of SC")
844844
err = verifyPVnodeAffinityAndPODnodedetailsForStandalonePodLevel5(ctx, client, pod4,
845-
allowedTopologies)
845+
namespace, allowedTopologies)
846846
gomega.Expect(err).NotTo(gomega.HaveOccurred())
847847

848848
volumeSnapshot2, volumeSnapshotClass2, snapshotId2 := createSnapshotClassAndVolSnapshot(ctx, snapc, namespace,
@@ -895,7 +895,7 @@ var _ = ginkgo.Describe("[preferential-snapshot] Preferential-Topology-Snapshot"
895895
ginkgo.By("Verify PV node affinity and that the PODS are running on " +
896896
"appropriate node as specified in the allowed topologies of SC")
897897
err = verifyPVnodeAffinityAndPODnodedetailsForStandalonePodLevel5(ctx, client, pod5,
898-
allowedTopologies)
898+
namespace, allowedTopologies)
899899
gomega.Expect(err).NotTo(gomega.HaveOccurred())
900900
})
901901

‎tests/e2e/snapshot_stretched_supervisor.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ var _ = ginkgo.Describe("Stretched-Supervisor-Snapshot", func() {
282282
gomega.Expect(err).NotTo(gomega.HaveOccurred())
283283

284284
ginkgo.By("Verify pv and node affinity")
285-
err = verifyPVnodeAffinityAndPODnodedetailsForStandalonePodLevel5(ctx, client, pod, allowedTopologies)
285+
err = verifyPVnodeAffinityAndPODnodedetailsForStandalonePodLevel5(ctx, client, pod, namespace, allowedTopologies)
286286

287287
ginkgo.By("Restore snapshot to create a new volume")
288288
pvclaim2, pvs2, pod2 := verifyVolumeRestoreOperation(ctx, client, namespace, storageclass,
@@ -304,7 +304,7 @@ var _ = ginkgo.Describe("Stretched-Supervisor-Snapshot", func() {
304304
gomega.Expect(err).NotTo(gomega.HaveOccurred())
305305

306306
ginkgo.By("Verify pv and node affinity for newly created workload")
307-
err = verifyPVnodeAffinityAndPODnodedetailsForStandalonePodLevel5(ctx, client, pod2, allowedTopologies)
307+
err = verifyPVnodeAffinityAndPODnodedetailsForStandalonePodLevel5(ctx, client, pod2, namespace, allowedTopologies)
308308
gomega.Expect(err).NotTo(gomega.HaveOccurred())
309309

310310
ginkgo.By("Delete volume snapshot")
@@ -428,7 +428,7 @@ var _ = ginkgo.Describe("Stretched-Supervisor-Snapshot", func() {
428428
gomega.Expect(err).NotTo(gomega.HaveOccurred())
429429

430430
ginkgo.By("Verify pv and node affinity")
431-
err = verifyPVnodeAffinityAndPODnodedetailsForStandalonePodLevel5(ctx, client, pod, allowedTopologies)
431+
err = verifyPVnodeAffinityAndPODnodedetailsForStandalonePodLevel5(ctx, client, pod, namespace, allowedTopologies)
432432
gomega.Expect(err).NotTo(gomega.HaveOccurred())
433433

434434
ginkgo.By("Delete dynamic volume snapshot")
@@ -734,7 +734,7 @@ var _ = ginkgo.Describe("Stretched-Supervisor-Snapshot", func() {
734734
gomega.Expect(err).NotTo(gomega.HaveOccurred())
735735

736736
ginkgo.By("Verify pv and node affinity")
737-
err = verifyPVnodeAffinityAndPODnodedetailsForStandalonePodLevel5(ctx, client, pod, allowedTopologies)
737+
err = verifyPVnodeAffinityAndPODnodedetailsForStandalonePodLevel5(ctx, client, pod, namespace, allowedTopologies)
738738
gomega.Expect(err).NotTo(gomega.HaveOccurred())
739739

740740
ginkgo.By("Expanding current pvc before deleting volume snapshot")
@@ -917,7 +917,7 @@ var _ = ginkgo.Describe("Stretched-Supervisor-Snapshot", func() {
917917
gomega.Expect(err).NotTo(gomega.HaveOccurred())
918918

919919
ginkgo.By("Verify pv and node affinity")
920-
err = verifyPVnodeAffinityAndPODnodedetailsForStandalonePodLevel5(ctx, client, pod, allowedTopologies)
920+
err = verifyPVnodeAffinityAndPODnodedetailsForStandalonePodLevel5(ctx, client, pod, namespace, allowedTopologies)
921921
gomega.Expect(err).NotTo(gomega.HaveOccurred())
922922

923923
ginkgo.By("Create volume snapshot class")

‎tests/e2e/staging_env_basic.go

+93-1
Original file line numberDiff line numberDiff line change
@@ -1190,7 +1190,7 @@ var _ = ginkgo.Describe("[csi-supervisor-staging] Tests for WCP env with minimal
11901190
ginkgo.By("Verify filesystem size for mount point /mnt/volume1")
11911191
fsSize, err = getFSSizeMbWithoutF(namespace, pod)
11921192
gomega.Expect(err).NotTo(gomega.HaveOccurred())
1193-
framework.Logf("File system size after expansion : %d", fsSize)
1193+
framework.Logf("File system size after expansion : %s", fsSize)
11941194
// Filesystem size may be smaller than the size of the block volume
11951195
// so here we are checking if the new filesystem size is greater than
11961196
// the original volume size as the filesystem is formatted for the
@@ -1200,6 +1200,98 @@ var _ = ginkgo.Describe("[csi-supervisor-staging] Tests for WCP env with minimal
12001200
ginkgo.By("File system resize finished successfully")
12011201
})
12021202

1203+
/*
1204+
CNS Unregister volume API
1205+
1206+
*/
1207+
ginkgo.It("Staging verify cns unregister volume API", func() {
1208+
ginkgo.By("Staging verify cns unregister volume API")
1209+
ctx, cancel := context.WithCancel(context.Background())
1210+
defer cancel()
1211+
var pvclaim *v1.PersistentVolumeClaim
1212+
var pv *v1.PersistentVolume
1213+
var err error
1214+
1215+
ginkgo.By("Creating a PVC")
1216+
storageclass, err := client.StorageV1().StorageClasses().Get(ctx, storagePolicyName, metav1.GetOptions{})
1217+
gomega.Expect(err).NotTo(gomega.HaveOccurred())
1218+
1219+
pvclaim, err = fpv.CreatePVC(ctx, client, namespace,
1220+
getPersistentVolumeClaimSpecWithStorageClass(namespace, diskSize, storageclass, nil, v1.ReadWriteOnce))
1221+
gomega.Expect(err).NotTo(gomega.HaveOccurred())
1222+
1223+
ginkgo.By("Expect claim to provision volume successfully")
1224+
persistentvolumes, err := fpv.WaitForPVClaimBoundPhase(ctx, client,
1225+
[]*v1.PersistentVolumeClaim{pvclaim}, framework.ClaimProvisionTimeout)
1226+
gomega.Expect(err).NotTo(gomega.HaveOccurred(), "Failed to provision volume")
1227+
volHandle := persistentvolumes[0].Spec.CSI.VolumeHandle
1228+
gomega.Expect(volHandle).NotTo(gomega.BeEmpty())
1229+
pv = persistentvolumes[0]
1230+
1231+
defer func() {
1232+
err = fpv.DeletePersistentVolumeClaim(ctx, client, pvclaim.Name, pvclaim.Namespace)
1233+
gomega.Expect(err).NotTo(gomega.HaveOccurred())
1234+
err = e2eVSphere.waitForCNSVolumeToBeDeleted(volHandle)
1235+
gomega.Expect(err).NotTo(gomega.HaveOccurred())
1236+
}()
1237+
1238+
ginkgo.By("Create Pod using the above PVC")
1239+
pod, vmUUID := createPODandVerifyVolumeMountWithoutF(ctx, client, namespace, pvclaim, volHandle)
1240+
1241+
defer func() {
1242+
// Delete POD
1243+
ginkgo.By(fmt.Sprintf("Deleting the pod %s in namespace %s", pod.Name, namespace))
1244+
err := fpod.DeletePodWithWait(ctx, client, pod)
1245+
gomega.Expect(err).NotTo(gomega.HaveOccurred())
1246+
1247+
ginkgo.By(fmt.Sprintf("Verify volume: %s is detached from PodVM with vmUUID: %s",
1248+
pv.Spec.CSI.VolumeHandle, vmUUID))
1249+
_, err = e2eVSphere.getVMByUUIDWithWait(ctx, vmUUID, supervisorClusterOperationsTimeout)
1250+
gomega.Expect(err).To(gomega.HaveOccurred(),
1251+
fmt.Sprintf("PodVM with vmUUID: %s still exists. So volume: %s is not detached from the PodVM",
1252+
vmUUID, pv.Spec.CSI.VolumeHandle))
1253+
1254+
}()
1255+
1256+
// Get a config to talk to the apiserver
1257+
restConfig := getRestConfigClient()
1258+
1259+
// Get supvervisor cluster client.
1260+
_, svNamespace := getSvcClientAndNamespace()
1261+
1262+
ginkgo.By("Create CNS register volume with above created FCD")
1263+
cnsRegisterVolume := getCNSRegisterVolumeSpec(ctx, svNamespace, volHandle, "", "hello", v1.ReadWriteOnce)
1264+
err = createCNSRegisterVolume(ctx, restConfig, cnsRegisterVolume)
1265+
gomega.Expect(err).NotTo(gomega.HaveOccurred())
1266+
framework.ExpectNoError(waitForCNSRegisterVolumeToGetCreated(ctx,
1267+
restConfig, namespace, cnsRegisterVolume, poll, supervisorClusterOperationsTimeout))
1268+
cnsRegisterVolumeName := cnsRegisterVolume.GetName()
1269+
framework.Logf("CNS register volume name : %s", cnsRegisterVolumeName)
1270+
1271+
ginkgo.By("Create CNS unregister volume with above created FCD " + volHandle)
1272+
1273+
cnsUnRegisterVolume := getCNSUnregisterVolumeSpec(namespace, volHandle)
1274+
1275+
cnsUnRegisterVolumeName := cnsUnRegisterVolume.GetName()
1276+
1277+
framework.Logf("CNS unregister volume name : %s", cnsUnRegisterVolumeName)
1278+
1279+
err = createCNSUnRegisterVolume(ctx, restConfig, cnsUnRegisterVolume)
1280+
gomega.Expect(err).NotTo(gomega.HaveOccurred())
1281+
1282+
defer func() {
1283+
ginkgo.By("Delete CNS unregister volume CR by name " + cnsUnRegisterVolumeName)
1284+
err = deleteCNSUnRegisterVolume(ctx, restConfig, cnsUnRegisterVolume)
1285+
gomega.Expect(err).NotTo(gomega.HaveOccurred())
1286+
}()
1287+
1288+
ginkgo.By("Waiting for CNS unregister volume to be unregistered")
1289+
gomega.Expect(waitForCNSUnRegisterVolumeToGetUnregistered(ctx,
1290+
restConfig, cnsUnRegisterVolume, poll,
1291+
supervisorClusterOperationsTimeout)).To(gomega.HaveOccurred())
1292+
1293+
})
1294+
12031295
// Test for valid disk size of 2Gi
12041296
ginkgo.It("Verify dynamic provisioning of pv using storageclass with a valid disk size passes", func() {
12051297
ctx, cancel := context.WithCancel(context.Background())

‎tests/e2e/tkgs_ha_site_down.go

+11-9
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ var _ = ginkgo.Describe("[csi-tkgs-ha] Tkgs-HA-SiteDownTests", func() {
9292
svcClient, svNamespace := getSvcClientAndNamespace()
9393
setResourceQuota(svcClient, svNamespace, rqLimit)
9494
}
95+
9596
readVcEsxIpsViaTestbedInfoJson(GetAndExpectStringEnvVar(envTestbedInfoJsonPath))
9697

9798
})
@@ -157,7 +158,8 @@ var _ = ginkgo.Describe("[csi-tkgs-ha] Tkgs-HA-SiteDownTests", func() {
157158
// Get Cluster details
158159
clusterComputeResource, _, err := getClusterName(ctx, &e2eVSphere)
159160
gomega.Expect(err).NotTo(gomega.HaveOccurred())
160-
svcMasterIp := getApiServerIpOfZone(ctx, "zone-2")
161+
//svcMasterIp := getApiServerIpOfZone(ctx, "zone-2")
162+
svcMasterIp := "10.43.214.217"
161163

162164
clusterName := getClusterNameFromZone(ctx, "zone-1")
163165
for i := 0; i < stsCount; i++ {
@@ -773,15 +775,15 @@ var _ = ginkgo.Describe("[csi-tkgs-ha] Tkgs-HA-SiteDownTests", func() {
773775

774776
ginkgo.By("Put 2 ESX hosts of AZ3 into MM - ensureObjectAccessibilty")
775777
hostsInCluster := getHostsByClusterName(ctx, clusterComputeResource, clusterName)
776-
for i := 0; i < len(hostsInCluster)-1; i++ {
778+
for i := 1; i < len(hostsInCluster)-1; i++ {
777779
enterHostIntoMM(ctx, hostsInCluster[i], ensureAccessibilityMModeType, timeout, false)
778780
}
779-
defer func() {
780-
framework.Logf("Exit the hosts from MM before terminating the test")
781-
for i := 0; i < len(hostsInCluster)-1; i++ {
782-
exitHostMM(ctx, hostsInCluster[i], timeout)
783-
}
784-
}()
781+
// defer func() {
782+
// framework.Logf("Exit the hosts from MM before terminating the test")
783+
// for i := 1; i < len(hostsInCluster)-1; i++ {
784+
// exitHostMM(ctx, hostsInCluster[i], timeout)
785+
// }
786+
// }()
785787

786788
ginkgo.By("Verify SVC PVC annotations and node affinities on GC and SVC PVs")
787789
for _, statefulset := range stsList {
@@ -790,7 +792,7 @@ var _ = ginkgo.Describe("[csi-tkgs-ha] Tkgs-HA-SiteDownTests", func() {
790792
}
791793

792794
ginkgo.By("Exit the hosts from MM")
793-
for i := 0; i < len(hostsInCluster)-1; i++ {
795+
for i := 1; i < len(hostsInCluster)-1; i++ {
794796
exitHostMM(ctx, hostsInCluster[i], timeout)
795797
}
796798

‎tests/e2e/topology_multi_replica.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -957,7 +957,7 @@ var _ = ginkgo.Describe("[topology-multireplica] Topology-MultiReplica",
957957
ginkgo.By("Verify PV node affinity and that the PODS are running on appropriate node")
958958
for i := 0; i < len(podList); i++ {
959959
err = verifyPVnodeAffinityAndPODnodedetailsForStandalonePodLevel5(ctx, client, podList[i],
960-
allowedTopologies)
960+
namespace, allowedTopologies)
961961
gomega.Expect(err).NotTo(gomega.HaveOccurred())
962962
}
963963
})
@@ -1165,7 +1165,7 @@ var _ = ginkgo.Describe("[topology-multireplica] Topology-MultiReplica",
11651165
ginkgo.By("Verify PV node affinity and that the PODS are running on appropriate node")
11661166
for i := 0; i < len(podList); i++ {
11671167
err = verifyPVnodeAffinityAndPODnodedetailsForStandalonePodLevel5(ctx, client, podList[i],
1168-
allowedTopologies)
1168+
namespace, allowedTopologies)
11691169
gomega.Expect(err).NotTo(gomega.HaveOccurred())
11701170
}
11711171
})
@@ -1674,7 +1674,7 @@ var _ = ginkgo.Describe("[topology-multireplica] Topology-MultiReplica",
16741674
ginkgo.By("Verify PV node affinity and that the PODS are running on appropriate node")
16751675
for i := 0; i < len(podList); i++ {
16761676
err = verifyPVnodeAffinityAndPODnodedetailsForStandalonePodLevel5(ctx, client, podList[i],
1677-
allowedTopologies)
1677+
namespace, allowedTopologies)
16781678
gomega.Expect(err).NotTo(gomega.HaveOccurred())
16791679
}
16801680
})
@@ -1915,7 +1915,7 @@ var _ = ginkgo.Describe("[topology-multireplica] Topology-MultiReplica",
19151915
for each StatefulSet pod */
19161916
ginkgo.By("Verify PV node affinity and that the PODS are running on appropriate node")
19171917
for i := 0; i < len(podList); i++ {
1918-
err = verifyPVnodeAffinityAndPODnodedetailsForStandalonePodLevel5(ctx, client, podList[i], allowedTopologies)
1918+
err = verifyPVnodeAffinityAndPODnodedetailsForStandalonePodLevel5(ctx, client, podList[i], namespace, allowedTopologies)
19191919
gomega.Expect(err).NotTo(gomega.HaveOccurred())
19201920
}
19211921
})
@@ -2083,7 +2083,7 @@ var _ = ginkgo.Describe("[topology-multireplica] Topology-MultiReplica",
20832083
ginkgo.By("Verify PV node affinity and that the PODS are running on " +
20842084
"appropriate node as specified in the allowed topologies of SC")
20852085
for i := 0; i < len(podList); i++ {
2086-
err = verifyPVnodeAffinityAndPODnodedetailsForStandalonePodLevel5(ctx, client, podList[i], allowedTopologies)
2086+
err = verifyPVnodeAffinityAndPODnodedetailsForStandalonePodLevel5(ctx, client, podList[i], namespace, allowedTopologies)
20872087
gomega.Expect(err).NotTo(gomega.HaveOccurred())
20882088
}
20892089

‎tests/e2e/topology_snapshot.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ var _ = ginkgo.Describe("[topology-snapshot] Topology-Snapshot", func() {
273273
ginkgo.By("Verify PV node affinity and that the PODS are running on " +
274274
"appropriate node as specified in the allowed topologies of SC")
275275
err = verifyPVnodeAffinityAndPODnodedetailsForStandalonePodLevel5(ctx, client, pod,
276-
allowedTopologies)
276+
namespace, allowedTopologies)
277277
gomega.Expect(err).NotTo(gomega.HaveOccurred())
278278

279279
defer func() {

0 commit comments

Comments
 (0)