Vc version in the test

Author: kirankumarbasavaraju-broadcom

tests/e2e/binding_modes_with_topology.go

@@ -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, framework.ClaimProvisionTimeout)
+			pvclaim.Namespace, pvclaim.Name, framework.Poll, time.Minute)
 		gomega.Expect(err).NotTo(gomega.HaveOccurred(), fmt.Sprintf("Failed to provision volume with err: %v", err))
 
 		pv = getPvFromClaim(client, pvclaim.Namespace, pvclaim.Name)

tests/e2e/config_change_test.go

@@ -77,7 +77,7 @@ var _ bool = ginkgo.Describe("[csi-supervisor] config-change-test", func() {
 		// Create Storage class and PVC
 		ginkgo.By("Creating Storage Class and PVC")
 		_, pvc, err := createPVCAndStorageClass(ctx, client, namespace, nil,
-			scParameters, "", nil, "", true, "", storagePolicyName)
+			scParameters, "", nil, "", false, "", storagePolicyName)
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 
 		ginkgo.By(fmt.Sprintf("Waiting for claim %s to be in bound phase", pvc.Name))
@@ -100,6 +100,7 @@ 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
 		username := vsphereCfg.Global.User
 		currentPassword := vsphereCfg.Global.Password
 		newPassword := e2eTestPassword

tests/e2e/connection.go

@@ -91,20 +91,16 @@ func connect(ctx context.Context, vs *vSphere, forceRefresh ...bool) {
 
 // newClient creates a new client for vSphere connection.
 func newClient(ctx context.Context, vs *vSphere) *govmomi.Client {
-	isPrivateNetwork := GetBoolEnvVarOrDefault("IS_PRIVATE_NETWORK", false)
-	vCenterIp := vs.Config.Global.VCenterHostname
-	if isPrivateNetwork {
-		vCenterIp = GetStringEnvVarOrDefault("LOCAL_HOST_IP", defaultlocalhostIP)
-	}
 	url, err := neturl.Parse(fmt.Sprintf("https://%s:%s/sdk",
-		vCenterIp, vs.Config.Global.VCenterPort))
+		vs.Config.Global.VCenterHostname, vs.Config.Global.VCenterPort))
 	gomega.Expect(err).NotTo(gomega.HaveOccurred())
 	url.User = neturl.UserPassword(vs.Config.Global.User, vs.Config.Global.Password)
 	client, err := govmomi.NewClient(ctx, url, true)
 	gomega.Expect(err).NotTo(gomega.HaveOccurred())
 	err = client.UseServiceVersion(vsanNamespace)
 	gomega.Expect(err).NotTo(gomega.HaveOccurred())
 	client.RoundTripper = vim25.Retry(client.RoundTripper, vim25.TemporaryNetworkError(roundTripperDefaultCount))
+	client.Version = cnsDevVersion
 	return client
 }
 
@@ -122,6 +118,8 @@ func connectCns(ctx context.Context, vs *vSphere) error {
 	if vs.CnsClient == nil {
 		vs.CnsClient, err = newCnsClient(ctx, vs.Client.Client)
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
+		vs.CnsClient.Version = cnsDevVersion
+		vs.CnsClient.Client.Version = cnsDevVersion
 	}
 	return nil
 }

tests/e2e/crypto.go

@@ -26,9 +26,7 @@ import (
 	"github.com/onsi/ginkgo/v2"
 	"github.com/onsi/gomega"
 	vmopv1 "github.com/vmware-tanzu/vm-operator/api/v1alpha1"
-	vmopv2 "github.com/vmware-tanzu/vm-operator/api/v1alpha2"
 	vmopv3 "github.com/vmware-tanzu/vm-operator/api/v1alpha3"
-	vmopv4 "github.com/vmware-tanzu/vm-operator/api/v1alpha4"
 	v1 "k8s.io/api/core/v1"
 	storagev1 "k8s.io/api/storage/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -120,9 +118,7 @@ var _ = ginkgo.Describe("[csi-supervisor] [encryption] Block volume encryption",
 		}
 		vmopScheme := runtime.NewScheme()
 		gomega.Expect(vmopv1.AddToScheme(vmopScheme)).Should(gomega.Succeed())
-		gomega.Expect(vmopv2.AddToScheme(vmopScheme)).Should(gomega.Succeed())
 		gomega.Expect(vmopv3.AddToScheme(vmopScheme)).Should(gomega.Succeed())
-		gomega.Expect(vmopv4.AddToScheme(vmopScheme)).Should(gomega.Succeed())
 		vmopClient, err = ctlrclient.New(f.ClientConfig(), ctlrclient.Options{Scheme: vmopScheme})
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 		vmImageName := GetAndExpectStringEnvVar(envVmsvcVmImageName)
@@ -156,6 +152,7 @@ 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
 			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))
@@ -173,7 +170,7 @@ var _ = ginkgo.Describe("[csi-supervisor] [encryption] Block volume encryption",
 		3. Create PVC with EncryptionClass [2]
 		4. Validate PVC volume [3] is encrypted with encryption key [1]
 	*/
-	ginkgo.It("Verify PVC is encrypted with EncryptionClass", func() {
+	ginkgo.It("Verify PVC is encrypted with EncryptionClass", ginkgo.Label(p1, wcp, vc90), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 
@@ -203,7 +200,7 @@ var _ = ginkgo.Describe("[csi-supervisor] [encryption] Block volume encryption",
 		3. Create a PVC with encrypted StorageClass but without specifying an EncryptionClass
 		4. Validate PVC volume [3] is encrypted with encryption key [1]
 	*/
-	ginkgo.It("Verify PVC is encrypted with default EncryptionClass", func() {
+	ginkgo.It("Verify PVC is encrypted with default EncryptionClass", ginkgo.Label(p1, wcp, vc90), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 
@@ -236,7 +233,7 @@ var _ = ginkgo.Describe("[csi-supervisor] [encryption] Block volume encryption",
 		7. Update PVC with second EncryptionClass [4]
 		8. Validate PVC volume [5] is encrypted with second encryption key [2]
 	*/
-	ginkgo.It("Verify PVC is recrypted when a new EncryptionClass is applied", func() {
+	ginkgo.It("Verify PVC is recrypted when a new EncryptionClass is applied", ginkgo.Label(p1, wcp, vc90), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 
@@ -283,7 +280,7 @@ var _ = ginkgo.Describe("[csi-supervisor] [encryption] Block volume encryption",
 		7. Validate PVC volume [4] is encrypted with second encryption key [2]
 	*/
 	ginkgo.It("Verify PVC is recrypted when a new encryption key is applied to its "+
-		"associated EncryptionClass", func() {
+		"associated EncryptionClass", ginkgo.Label(p1, wcp, vc90), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 
@@ -322,7 +319,7 @@ var _ = ginkgo.Describe("[csi-supervisor] [encryption] Block volume encryption",
 		3. Create PVC with EncryptionClass [2]
 	*/
 	ginkgo.It("Verify PVC creation fails when associated with an EncryptionClass "+
-		"but the StorageClass does not support encryption", func() {
+		"but the StorageClass does not support encryption", ginkgo.Label(p1, wcp, vc90), func() {
 
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
@@ -357,7 +354,7 @@ var _ = ginkgo.Describe("[csi-supervisor] [encryption] Block volume encryption",
 		5. Validate VM [4] is encrypted with encryption key [1]
 		6. Validate PVC [3] is not encrypted
 	*/
-	ginkgo.It("Verify VM is encrypted with EncryptionClass while PVC is not encrypted", func() {
+	ginkgo.It("Verify VM is encrypted with EncryptionClass while PVC is not encrypted", ginkgo.Label(p1, wcp, vc90), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 
@@ -405,7 +402,7 @@ var _ = ginkgo.Describe("[csi-supervisor] [encryption] Block volume encryption",
 		5. Validate VM [4] is encrypted with encryption key [1]
 		6. Validate PVC [3] is encrypted with encryption key [1]
 	*/
-	ginkgo.It("Verify VM and associated PVC are encrypted with EncryptionClass", func() {
+	ginkgo.It("Verify VM and associated PVC are encrypted with EncryptionClass", ginkgo.Label(p1, wcp, vc90), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 
@@ -454,7 +451,7 @@ var _ = ginkgo.Describe("[csi-supervisor] [encryption] Block volume encryption",
 		5. Validate VM [4] is encrypted with encryption key [1]
 		6. Validate PVC [3] is encrypted with encryption key [1]
 	*/
-	ginkgo.It("Verify VM and associated PVC are encrypted with default EncryptionClass", func() {
+	ginkgo.It("Verify VM and associated PVC are encrypted with default EncryptionClass", ginkgo.Label(p1, wcp, vc90), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 
@@ -505,7 +502,7 @@ var _ = ginkgo.Describe("[csi-supervisor] [encryption] Block volume encryption",
 		11. Validate PVC [5] is encrypted with second encryption key [2]
 		12. Validate VM [6] is encrypted with first encryption key [1]
 	*/
-	ginkgo.It("Verify VM and attached PVC are encrypted/recrypted with different keys", func() {
+	ginkgo.It("Verify VM and attached PVC are encrypted/recrypted with different keys", ginkgo.Label(p1, wcp, vc90), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 
@@ -577,7 +574,7 @@ var _ = ginkgo.Describe("[csi-supervisor] [encryption] Block volume encryption",
 		    9. Bring vsan-service up
 			10. Validate PVC volume [5] is encrypted with second encryption key [2]
 	*/
-	ginkgo.It("Verify PVC encryption when vsan-health is down", func() {
+	ginkgo.It("Verify PVC encryption when vsan-health is down", ginkgo.Label(p1, wcp, negative, vc90), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 
@@ -607,6 +604,7 @@ 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/crypto_snapshot.go

@@ -27,9 +27,7 @@ import (
 	"github.com/onsi/ginkgo/v2"
 	"github.com/onsi/gomega"
 	vmopv1 "github.com/vmware-tanzu/vm-operator/api/v1alpha1"
-	vmopv2 "github.com/vmware-tanzu/vm-operator/api/v1alpha2"
 	vmopv3 "github.com/vmware-tanzu/vm-operator/api/v1alpha3"
-	vmopv4 "github.com/vmware-tanzu/vm-operator/api/v1alpha4"
 	storagev1 "k8s.io/api/storage/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -131,9 +129,7 @@ var _ = ginkgo.Describe("[csi-supervisor] [encryption] Block volume snapshot enc
 		}
 		vmopScheme := runtime.NewScheme()
 		gomega.Expect(vmopv1.AddToScheme(vmopScheme)).Should(gomega.Succeed())
-		gomega.Expect(vmopv2.AddToScheme(vmopScheme)).Should(gomega.Succeed())
 		gomega.Expect(vmopv3.AddToScheme(vmopScheme)).Should(gomega.Succeed())
-		gomega.Expect(vmopv4.AddToScheme(vmopScheme)).Should(gomega.Succeed())
 		vmopClient, err = ctlrclient.New(f.ClientConfig(), ctlrclient.Options{Scheme: vmopScheme})
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 		vmImageName := GetAndExpectStringEnvVar(envVmsvcVmImageName)
@@ -177,7 +173,7 @@ var _ = ginkgo.Describe("[csi-supervisor] [encryption] Block volume snapshot enc
 		4. Create a dynamic volume snapshot from PVC [3]
 		5. Create PVC with EncryptionClass [2] from snapshot [4]
 	*/
-	ginkgo.It("Verify PVC from snapshot is recrypted with the same EncryptionClass", func() {
+	ginkgo.It("Verify PVC from snapshot is recrypted with the same EncryptionClass", ginkgo.Label(p1, wcp, negative, vc90), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 
@@ -222,7 +218,7 @@ var _ = ginkgo.Describe("[csi-supervisor] [encryption] Block volume snapshot enc
 		6. Create second EncryptionClass with encryption key [5]
 		7. Create PVC with EncryptionClass [6] from snapshot [4]
 	*/
-	ginkgo.It("Verify PVC from snapshot is recrypted with different EncryptionClass", func() {
+	ginkgo.It("Verify PVC from snapshot is recrypted with different EncryptionClass", ginkgo.Label(p1, wcp, negative, vc90), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 
@@ -272,7 +268,7 @@ var _ = ginkgo.Describe("[csi-supervisor] [encryption] Block volume snapshot enc
 		4. Create a dynamic volume snapshot from PVC [3]
 		5. Create PVC with EncryptionClass [2] from snapshot [4]
 	*/
-	ginkgo.It("Verify PVC from snapshot is encrypted with EncryptionClass", func() {
+	ginkgo.It("Verify PVC from snapshot is encrypted with EncryptionClass", ginkgo.Label(p1, wcp, negative, vc90), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 
@@ -314,7 +310,7 @@ var _ = ginkgo.Describe("[csi-supervisor] [encryption] Block volume snapshot enc
 		4. Create a dynamic volume snapshot from PVC [3]
 		5. Create PVC without encryption from snapshot [4]
 	*/
-	ginkgo.It("Verify PVC from snapshot is decrypted", func() {
+	ginkgo.It("Verify PVC from snapshot is decrypted", ginkgo.Label(p1, wcp, negative, vc90), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 

tests/e2e/csi_cns_telemetry_statefulsets.go

@@ -164,8 +164,7 @@ var _ = ginkgo.Describe("[csi-block-vanilla] [csi-file-vanilla] [csi-supervisor]
 		if !windowsEnv {
 			gomega.Expect(fss.CheckMount(ctx, client, statefulset, mountPath)).NotTo(gomega.HaveOccurred())
 		}
-		ssPodsBeforeScaleDown, err := fss.GetPodList(ctx, client, statefulset)
-		gomega.Expect(err).NotTo(gomega.HaveOccurred())
+		ssPodsBeforeScaleDown := fss.GetPodList(ctx, client, statefulset)
 		gomega.Expect(ssPodsBeforeScaleDown.Items).NotTo(gomega.BeEmpty(),
 			fmt.Sprintf("Unable to get list of Pods from the Statefulset: %v", statefulset.Name))
 		gomega.Expect(len(ssPodsBeforeScaleDown.Items) == int(replicas)).To(gomega.BeTrue(),
@@ -208,8 +207,7 @@ var _ = ginkgo.Describe("[csi-block-vanilla] [csi-file-vanilla] [csi-supervisor]
 		_, scaledownErr := fss.Scale(ctx, client, statefulset, replicas)
 		gomega.Expect(scaledownErr).NotTo(gomega.HaveOccurred())
 		fss.WaitForStatusReplicas(ctx, client, statefulset, replicas)
-		ssPodsAfterScaleDown, err := fss.GetPodList(ctx, client, statefulset)
-		gomega.Expect(err).NotTo(gomega.HaveOccurred())
+		ssPodsAfterScaleDown := fss.GetPodList(ctx, client, statefulset)
 		gomega.Expect(len(ssPodsAfterScaleDown.Items) == int(replicas)).To(gomega.BeTrue(),
 			"Number of Pods in the statefulset should match with number of replicas")
 	})

tests/e2e/csi_cns_telemetry_vc_reboot.go

@@ -43,6 +43,7 @@ var _ bool = ginkgo.Describe("[csi-block-vanilla] [csi-file-vanilla] "+
 	var (
 		client       clientset.Interface
 		namespace    string
+		vcAddress    string
 		isVcRebooted bool
 	)
 	ginkgo.BeforeEach(func() {
@@ -61,8 +62,8 @@ 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
 	})
-
 	ginkgo.AfterEach(func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
@@ -160,7 +161,7 @@ var _ bool = ginkgo.Describe("[csi-block-vanilla] [csi-file-vanilla] "+
 		err = invokeVCenterReboot(ctx, vcAddress)
 		isVcRebooted = true
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
-		err = waitForHostToBeUp(vcAddress)
+		err = waitForHostToBeUp(e2eVSphere.Config.Global.VCenterHostname)
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 		ginkgo.By("Done with reboot")
 
@@ -199,7 +200,7 @@ var _ bool = ginkgo.Describe("[csi-block-vanilla] [csi-file-vanilla] "+
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
 		}()
 
-		err = waitForHostToBeUp(vcAddress)
+		err = waitForHostToBeUp(e2eVSphere.Config.Global.VCenterHostname)
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 		ginkgo.By("Done with reboot")
 		essentialServices := []string{spsServiceName, vsanhealthServiceName, vpxdServiceName}
@@ -302,7 +303,7 @@ var _ bool = ginkgo.Describe("[csi-block-vanilla] [csi-file-vanilla] "+
 		err = invokeVCenterReboot(ctx, vcAddress)
 		isVcRebooted = true
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
-		err = waitForHostToBeUp(vcAddress)
+		err = waitForHostToBeUp(e2eVSphere.Config.Global.VCenterHostname)
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 		ginkgo.By("Done with reboot")
 		essentialServices := []string{spsServiceName, vsanhealthServiceName, vpxdServiceName}