[WIP] Fixes in test case code to enable parallel execution of the topology regression suite.

hack/run-e2e-test.sh

@@ -20,7 +20,7 @@ set -o pipefail
 
 # Fetching ginkgo for running the test
 export GO111MODULE=on
-export ACK_GINKGO_DEPRECATIONS=2.11.0
+export ACK_GINKGO_DEPRECATIONS=2.19.0
 if ! (go mod vendor && go install github.com/onsi/ginkgo/v2/[email protected])
 then
     echo "go mod vendor or go install ginkgo error"

tests/e2e/binding_modes_with_topology.go

@@ -82,8 +82,8 @@ var _ = ginkgo.Describe("[csi-topology-vanilla] Topology-Aware-Provisioning-With
 			framework.ExpectNoError(e2eVSphere.waitForCNSVolumeToBeDeleted(pv.Spec.CSI.VolumeHandle))
 		}
 	})
-	verifyTopologyAwareProvisioning := func(f *framework.Framework, client clientset.Interface, namespace string,
-		scParameters map[string]string, allowedTopologies []v1.TopologySelectorLabelRequirement) {
+	verifyTopologyAwareProvisioning := func(client clientset.Interface, namespace string,
+		allowedTopologies []v1.TopologySelectorLabelRequirement) {
 		var cancel context.CancelFunc
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
@@ -103,7 +103,7 @@ var _ = ginkgo.Describe("[csi-topology-vanilla] Topology-Aware-Provisioning-With
 
 		ginkgo.By("Expect claim status to be in Pending state")
 		err = fpv.WaitForPersistentVolumeClaimPhase(ctx, v1.ClaimPending, client,
-			pvclaim.Namespace, pvclaim.Name, framework.Poll, time.Minute)
+			pvclaim.Namespace, pvclaim.Name, framework.Poll, framework.ClaimProvisionTimeout)
 		gomega.Expect(err).NotTo(gomega.HaveOccurred(),
 			fmt.Sprintf("Failed to find the volume in pending state with err: %v", err))
 
@@ -113,7 +113,7 @@ var _ = ginkgo.Describe("[csi-topology-vanilla] Topology-Aware-Provisioning-With
 
 		ginkgo.By("Expect claim to be in Bound state and provisioning volume passes")
 		err = fpv.WaitForPersistentVolumeClaimPhase(ctx, v1.ClaimBound, client,
-			pvclaim.Namespace, pvclaim.Name, framework.Poll, time.Minute)
+			pvclaim.Namespace, pvclaim.Name, framework.Poll, framework.ClaimProvisionTimeout)
 		gomega.Expect(err).NotTo(gomega.HaveOccurred(), fmt.Sprintf("Failed to provision volume with err: %v", err))
 
 		pv = getPvFromClaim(client, pvclaim.Namespace, pvclaim.Name)
@@ -177,7 +177,7 @@ var _ = ginkgo.Describe("[csi-topology-vanilla] Topology-Aware-Provisioning-With
 	// 9. Delete SC.
 	ginkgo.It("Verify provisioning succeeds with VolumeBindingMode set to "+
 		"WaitForFirstConsumer and without AllowedTopologies in the storage class ", func() {
-		verifyTopologyAwareProvisioning(f, client, namespace, nil, nil)
+		verifyTopologyAwareProvisioning(client, namespace, nil)
 	})
 
 	// Test to verify provisioning with "VolumeBindingMode = WaitForFirstConsumer"
@@ -197,7 +197,7 @@ var _ = ginkgo.Describe("[csi-topology-vanilla] Topology-Aware-Provisioning-With
 		// Preparing allowedTopologies using topologies with shared datastores.
 		regionZoneValue := GetAndExpectStringEnvVar(envRegionZoneWithSharedDS)
 		regionValues, zoneValues, allowedTopologies = topologyParameterForStorageClass(regionZoneValue)
-		verifyTopologyAwareProvisioning(f, client, namespace, nil, allowedTopologies)
+		verifyTopologyAwareProvisioning(client, namespace, allowedTopologies)
 	})
 
 })

tests/e2e/config_change_test.go

@@ -25,6 +25,7 @@ var _ bool = ginkgo.Describe("[csi-supervisor] config-change-test", func() {
 		cancel               context.CancelFunc
 		nimbusGeneratedVcPwd string
 		clientIndex          int
+		vcAddress            string
 	)
 	const (
 		configSecret = "vsphere-config-secret"
@@ -100,7 +101,8 @@ var _ bool = ginkgo.Describe("[csi-supervisor] config-change-test", func() {
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 
 		ginkgo.By(fmt.Sprintln("Changing password on the vCenter host"))
-		vcAddress := e2eVSphere.Config.Global.VCenterHostname + ":" + sshdPort
+		vcAddress, _, err = readVcAddress()
+		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 		username := vsphereCfg.Global.User
 		currentPassword := vsphereCfg.Global.Password
 		newPassword := e2eTestPassword

tests/e2e/config_secret.go

@@ -337,7 +337,7 @@ var _ = ginkgo.Describe("Config-Secret", func() {
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 		ginkgo.By("Expect claim status to be in Pending state")
 		err = fpv.WaitForPersistentVolumeClaimPhase(ctx, v1.ClaimPending, client,
-			pvclaim3.Namespace, pvclaim3.Name, framework.Poll, time.Minute)
+			pvclaim3.Namespace, pvclaim3.Name, framework.Poll, framework.ClaimProvisionTimeout)
 		gomega.Expect(err).NotTo(gomega.HaveOccurred(),
 			fmt.Sprintf("Failed to find the volume in pending state with err: %v", err))
 		defer func() {
@@ -692,7 +692,7 @@ var _ = ginkgo.Describe("Config-Secret", func() {
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 		ginkgo.By("Expect claim status to be in Pending state")
 		err = fpv.WaitForPersistentVolumeClaimPhase(ctx, v1.ClaimPending, client,
-			pvclaim2.Namespace, pvclaim2.Name, framework.Poll, time.Minute)
+			pvclaim2.Namespace, pvclaim2.Name, framework.Poll, framework.ClaimProvisionTimeout)
 		gomega.Expect(err).NotTo(gomega.HaveOccurred(),
 			fmt.Sprintf("Failed to find the volume in pending state with err: %v", err))
 		defer func() {
@@ -813,7 +813,7 @@ var _ = ginkgo.Describe("Config-Secret", func() {
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 		ginkgo.By("Expect claim status to be in Pending state")
 		err = fpv.WaitForPersistentVolumeClaimPhase(ctx, v1.ClaimPending, client,
-			pvclaim2.Namespace, pvclaim2.Name, framework.Poll, time.Minute)
+			pvclaim2.Namespace, pvclaim2.Name, framework.Poll, framework.ClaimProvisionTimeout)
 		gomega.Expect(err).NotTo(gomega.HaveOccurred(),
 			fmt.Sprintf("Failed to find the volume in pending state with err: %v", err))
 		defer func() {
@@ -931,7 +931,7 @@ var _ = ginkgo.Describe("Config-Secret", func() {
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 		ginkgo.By("Expect claim status to be in Pending state")
 		err = fpv.WaitForPersistentVolumeClaimPhase(ctx, v1.ClaimPending, client,
-			pvclaim1.Namespace, pvclaim1.Name, framework.Poll, time.Minute)
+			pvclaim1.Namespace, pvclaim1.Name, framework.Poll, framework.ClaimProvisionTimeout)
 		gomega.Expect(err).NotTo(gomega.HaveOccurred(),
 			fmt.Sprintf("Failed to find the volume in pending state with err: %v", err))
 		defer func() {
@@ -1049,7 +1049,7 @@ var _ = ginkgo.Describe("Config-Secret", func() {
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 		ginkgo.By("Expect claim status to be in Pending state")
 		err = fpv.WaitForPersistentVolumeClaimPhase(ctx, v1.ClaimPending, client,
-			pvclaim2.Namespace, pvclaim2.Name, framework.Poll, time.Minute)
+			pvclaim2.Namespace, pvclaim2.Name, framework.Poll, framework.ClaimProvisionTimeout)
 		gomega.Expect(err).NotTo(gomega.HaveOccurred(),
 			fmt.Sprintf("Failed to find the volume in pending state with err: %v", err))
 		defer func() {
@@ -1158,7 +1158,7 @@ var _ = ginkgo.Describe("Config-Secret", func() {
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 		ginkgo.By("Expect claim status to be in Pending state")
 		err = fpv.WaitForPersistentVolumeClaimPhase(ctx, v1.ClaimPending, client,
-			pvclaim1.Namespace, pvclaim1.Name, framework.Poll, time.Minute)
+			pvclaim1.Namespace, pvclaim1.Name, framework.Poll, framework.ClaimProvisionTimeout)
 		gomega.Expect(err).NotTo(gomega.HaveOccurred(),
 			fmt.Sprintf("Failed to find the volume in pending state with err: %v", err))
 		var pvclaims1 []*v1.PersistentVolumeClaim
@@ -1301,7 +1301,7 @@ var _ = ginkgo.Describe("Config-Secret", func() {
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 		ginkgo.By("Expect claim status to be in Pending state")
 		err = fpv.WaitForPersistentVolumeClaimPhase(ctx, v1.ClaimPending, client,
-			pvclaim2.Namespace, pvclaim2.Name, framework.Poll, time.Minute)
+			pvclaim2.Namespace, pvclaim2.Name, framework.Poll, framework.ClaimProvisionTimeout)
 		gomega.Expect(err).NotTo(gomega.HaveOccurred(),
 			fmt.Sprintf("Failed to find the volume in pending state with err: %v", err))
 		defer func() {

tests/e2e/config_secret_utils.go

@@ -39,10 +39,10 @@ import (
 
 // createTestUser util method is used for creating test users
 func createTestUser(masterIp string, sshClientConfig *ssh.ClientConfig, testUser string,
-	testUserPassword string) error {
+	testUserPassword string, sshdPortNum string) error {
 	createUser := govcLoginCmd() + "govc sso.user.create -p " + testUserPassword + " " + testUser
 	framework.Logf("Create testuser: %s ", createUser)
-	result, err := sshExec(sshClientConfig, masterIp, createUser)
+	result, err := sshExec(sshClientConfig, masterIp, createUser, sshdPortNum)
 	if err != nil && result.Code != 0 {
 		fssh.LogResult(result)
 		return fmt.Errorf("couldn't execute command: %s on host: %v , error: %s",
@@ -73,8 +73,8 @@ func deleteUsersRolesAndPermissions(masterIp string, sshClientConfig *ssh.Client
 // deleteUserPermissions method is used to delete permissions of a test user
 func deleteUserPermissions(masterIp string, sshClientConfig *ssh.ClientConfig,
 	testUser string, dataCenter []*object.Datacenter, clusters []string,
-	hosts []string, vms []string, datastores []string) {
-	err := deleteDataCenterPermissions(masterIp, sshClientConfig, testUser, dataCenter)
+	hosts []string, vms []string, datastores []string, sshdPortNum string) {
+	err := deleteDataCenterPermissions(masterIp, sshClientConfig, testUser, dataCenter, sshdPortNum)
 	if err != nil {
 		if strings.Contains(err.Error(), "The object or item referred to could not be found") {
 			framework.Logf("No datacenter level permissions exist for a testuser")
@@ -138,12 +138,12 @@ func deleteUserPermissions(masterIp string, sshClientConfig *ssh.ClientConfig,
 
 // deleteDataCenterPermissions method is used to delete DataCenter Permissions from a test user
 func deleteDataCenterPermissions(masterIp string, sshClientConfig *ssh.ClientConfig,
-	testUser string, dataCenter []*object.Datacenter) error {
+	testUser string, dataCenter []*object.Datacenter, sshdPortNum string) error {
 	for i := 0; i < len(dataCenter); i++ {
 		deleteDataCenterPermissions := govcLoginCmd() +
 			"govc permissions.remove -principal " + testUser + " " + dataCenter[i].InventoryPath
 		framework.Logf("delete datacenter level permissions %s", deleteDataCenterPermissions)
-		result, err := sshExec(sshClientConfig, masterIp, deleteDataCenterPermissions)
+		result, err := sshExec(sshClientConfig, masterIp, deleteDataCenterPermissions, sshdPortNum)
 		if err != nil && result.Code != 0 {
 			fssh.LogResult(result)
 			return fmt.Errorf("couldn't execute command: %s on host: %v , error: %s",

tests/e2e/crypto.go

@@ -59,6 +59,8 @@ var _ = ginkgo.Describe("[csi-supervisor] [encryption] Block volume encryption",
 		encryptedStorageClass      *storagev1.StorageClass
 		keyProviderID              string
 		isVsanHealthServiceStopped bool
+		vcAddress                  string
+		err                        error
 	)
 
 	ginkgo.BeforeEach(func() {
@@ -152,7 +154,8 @@ var _ = ginkgo.Describe("[csi-supervisor] [encryption] Block volume encryption",
 
 		if isVsanHealthServiceStopped {
 			ginkgo.By(fmt.Sprintln("Starting vsan-health on the vCenter host"))
-			vcAddress := e2eVSphere.Config.Global.VCenterHostname + ":" + sshdPort
+			vcAddress, _, err = readVcAddress()
+			gomega.Expect(err).NotTo(gomega.HaveOccurred())
 			err := invokeVCenterServiceControl(ctx, startOperation, vsanhealthServiceName, vcAddress)
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
 			ginkgo.By(fmt.Sprintf("Sleeping for %v seconds to allow vsan-health to come up again", vsanHealthServiceWaitTime))
@@ -604,7 +607,6 @@ var _ = ginkgo.Describe("[csi-supervisor] [encryption] Block volume encryption",
 		validateVolumeToBeEncryptedWithKey(ctx, pvc.Spec.VolumeName, keyProviderID, keyID1)
 
 		ginkgo.By("7. Stop Vsan-health service")
-		vcAddress := e2eVSphere.Config.Global.VCenterHostname + ":" + sshdPort
 		ginkgo.By(fmt.Sprintln("Stopping vsan-health on the vCenter host"))
 		isVsanHealthServiceStopped = true
 		err := invokeVCenterServiceControl(ctx, stopOperation, vsanhealthServiceName, vcAddress)

tests/e2e/csi_cns_telemetry_vc_reboot.go

@@ -62,7 +62,13 @@ var _ bool = ginkgo.Describe("[csi-block-vanilla] [csi-file-vanilla] "+
 			// Reset the cluster distribution value to default value "CSI-Vanilla".
 			setClusterDistribution(ctx, client, vanillaClusterDistribution)
 		}
-		vcAddress = e2eVSphere.Config.Global.VCenterHostname + ":" + sshdPort
+
+		if vcAddress == "" {
+			// reading vc address
+			vcAddress, _, err = readVcAddress()
+			gomega.Expect(err).NotTo(gomega.HaveOccurred())
+		}
+
 	})
 	ginkgo.AfterEach(func() {
 		ctx, cancel := context.WithCancel(context.Background())

tests/e2e/csi_snapshot_basic.go

@@ -106,7 +106,8 @@ var _ = ginkgo.Describe("Volume Snapshot Basic Test", func() {
 		}
 
 		// reading vc credentials
-		vcAddress = e2eVSphere.Config.Global.VCenterHostname + ":" + sshdPort
+		vcAddress, _, err = readVcAddress()
+		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 
 		// reading operation scale value
 		if os.Getenv("VOLUME_OPS_SCALE") != "" {
@@ -167,8 +168,6 @@ var _ = ginkgo.Describe("Volume Snapshot Basic Test", func() {
 			snapc, err = snapclient.NewForConfig(restConfig)
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
 			setStoragePolicyQuota(ctx, restConfig, storagePolicyName, namespace, rqLimit)
-
-			vcAddress := e2eVSphere.Config.Global.VCenterHostname + ":" + sshdPort
 			//if isQuotaValidationSupported is true then quotaValidation is considered in tests
 			vcVersion = getVCversion(ctx, vcAddress)
 			isQuotaValidationSupported = isVersionGreaterOrEqual(vcVersion, quotaSupportedVCVersion)

tests/e2e/csi_snapshot_negative.go

@@ -61,6 +61,7 @@ var _ = ginkgo.Describe("[block-snapshot-negative] Volume Snapshot Fault-Injecti
 		serviceName            string
 		pandoraSyncWaitTime    int
 		storagePolicyName      string
+		vcAddress              string
 	)
 
 	ginkgo.BeforeEach(func() {
@@ -78,6 +79,10 @@ var _ = ginkgo.Describe("[block-snapshot-negative] Volume Snapshot Fault-Injecti
 			framework.Failf("Unable to find ready and schedulable Node")
 		}
 
+		//reading vc address
+		vcAddress, _, err = readVcAddress()
+		gomega.Expect(err).NotTo(gomega.HaveOccurred())
+
 		// Get snapshot client using the rest config
 		if vanillaCluster {
 			restConfig = getRestConfigClient()
@@ -163,7 +168,6 @@ var _ = ginkgo.Describe("[block-snapshot-negative] Volume Snapshot Fault-Injecti
 					startHostDOnHost(ctx, hostIP)
 				}
 			} else {
-				vcAddress := e2eVSphere.Config.Global.VCenterHostname + ":" + sshdPort
 				ginkgo.By(fmt.Sprintf("Starting %v on the vCenter host", serviceName))
 				err := invokeVCenterServiceControl(ctx, startOperation, serviceName, vcAddress)
 				gomega.Expect(err).NotTo(gomega.HaveOccurred())
@@ -320,6 +324,7 @@ func snapshotOperationWhileServiceDown(serviceName string, namespace string,
 	scParameters := make(map[string]string)
 
 	storagePolicyName := GetAndExpectStringEnvVar(envStoragePolicyNameForSharedDatastores)
+	vcAddress, _, err := readVcAddress()
 
 	if vanillaCluster {
 		ginkgo.By("Create storage class")
@@ -477,7 +482,6 @@ func snapshotOperationWhileServiceDown(serviceName string, namespace string,
 
 	} else {
 		ginkgo.By(fmt.Sprintf("Stopping %v on the vCenter host", serviceName))
-		vcAddress := e2eVSphere.Config.Global.VCenterHostname + ":" + sshdPort
 		err = invokeVCenterServiceControl(ctx, stopOperation, serviceName, vcAddress)
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 		isServiceStopped = true
@@ -604,7 +608,6 @@ func snapshotOperationWhileServiceDown(serviceName string, namespace string,
 
 		} else {
 			ginkgo.By(fmt.Sprintf("Stopping %v on the vCenter host", serviceName))
-			vcAddress := e2eVSphere.Config.Global.VCenterHostname + ":" + sshdPort
 			err = invokeVCenterServiceControl(ctx, stopOperation, serviceName, vcAddress)
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
 			isServiceStopped = true
@@ -730,7 +733,6 @@ func snapshotOperationWhileServiceDown(serviceName string, namespace string,
 
 		} else {
 			ginkgo.By(fmt.Sprintf("Stopping %v on the vCenter host", serviceName))
-			vcAddress := e2eVSphere.Config.Global.VCenterHostname + ":" + sshdPort
 			err = invokeVCenterServiceControl(ctx, stopOperation, serviceName, vcAddress)
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
 			isServiceStopped = true

tests/e2e/csi_static_provisioning_basic.go

@@ -80,6 +80,7 @@ var _ = ginkgo.Describe("Basic Static Provisioning", func() {
 		nonSharedDatastoreURL      string
 		fullSyncWaitTime           int
 		isQuotaValidationSupported bool
+		vcAddress                  string
 	)
 
 	ginkgo.BeforeEach(func() {
@@ -109,6 +110,10 @@ var _ = ginkgo.Describe("Basic Static Provisioning", func() {
 		datastoreURL = GetAndExpectStringEnvVar(envSharedDatastoreURL)
 		nonSharedDatastoreURL = GetAndExpectStringEnvVar(envNonSharedStorageClassDatastoreURL)
 
+		// reading vc address
+		vcAddress, _, err = readVcAddress()
+		gomega.Expect(err).NotTo(gomega.HaveOccurred())
+
 		finder := find.NewFinder(e2eVSphere.Client.Client, false)
 		cfg, err := getConfig()
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
@@ -146,7 +151,6 @@ var _ = ginkgo.Describe("Basic Static Provisioning", func() {
 		}
 
 		if supervisorCluster || stretchedSVC {
-			vcAddress := e2eVSphere.Config.Global.VCenterHostname + ":" + sshdPort
 			//if isQuotaValidationSupported is true then quotaValidation is considered in tests
 			vcVersion = getVCversion(ctx, vcAddress)
 			isQuotaValidationSupported = isVersionGreaterOrEqual(vcVersion, quotaSupportedVCVersion)
@@ -155,7 +159,6 @@ var _ = ginkgo.Describe("Basic Static Provisioning", func() {
 	})
 
 	ginkgo.AfterEach(func() {
-		vcAddress := e2eVSphere.Config.Global.VCenterHostname + ":" + sshdPort
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 		ginkgo.By("Performing test cleanup")
@@ -1387,7 +1390,6 @@ var _ = ginkgo.Describe("Basic Static Provisioning", func() {
 
 		ginkgo.By(fmt.Sprintln("Stopping vsan-health on the vCenter host"))
 		isVsanHealthServiceStopped = true
-		vcAddress := e2eVSphere.Config.Global.VCenterHostname + ":" + sshdPort
 		err = invokeVCenterServiceControl(ctx, stopOperation, vsanhealthServiceName, vcAddress)
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 		ginkgo.By(fmt.Sprintf("Sleeping for %v seconds to allow vsan-health to completely shutdown",
@@ -1469,7 +1471,6 @@ var _ = ginkgo.Describe("Basic Static Provisioning", func() {
 
 		ginkgo.By(fmt.Sprintln("Stopping sps on the vCenter host"))
 		isSPSserviceStopped = true
-		vcAddress := e2eVSphere.Config.Global.VCenterHostname + ":" + sshdPort
 		err = invokeVCenterServiceControl(ctx, stopOperation, spsServiceName, vcAddress)
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 		ginkgo.By(fmt.Sprintf("Sleeping for %v seconds to allow sps to completely shutdown", vsanHealthServiceWaitTime))
@@ -2271,7 +2272,6 @@ var _ = ginkgo.Describe("Basic Static Provisioning", func() {
 
 		ginkgo.By(fmt.Sprintln("Stopping vsan-health on the vCenter host"))
 		isVsanHealthServiceStopped = true
-		vcAddress := e2eVSphere.Config.Global.VCenterHostname + ":" + sshdPort
 		err = invokeVCenterServiceControl(ctx, stopOperation, vsanhealthServiceName, vcAddress)
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 		err = waitVCenterServiceToBeInState(ctx, vsanhealthServiceName, vcAddress, svcStoppedMessage)

tests/e2e/ds_rename.go

@@ -55,7 +55,8 @@ var _ bool = ginkgo.Describe("ds-rename", func() {
 		bootstrap()
 		scParameters = make(map[string]string)
 		storagePolicyName = GetAndExpectStringEnvVar(envStoragePolicyNameForSharedDatastores)
-		vcAddress = e2eVSphere.Config.Global.VCenterHostname + ":" + sshdPort
+		vcAddress, _, err = readVcAddress()
+		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 
 		govmomiClient := newClient(ctx, &e2eVSphere)
 		pc = newPbmClient(ctx, govmomiClient)