new changes

Author: sipriyaa

tests/e2e/e2e_common.go

@@ -489,14 +489,12 @@ var (
 // For management workload domain isolation
 var (
 	envZonal2StoragePolicyName                     = "ZONAL2_STORAGE_POLICY_IMM"
-	envZonal2StoragePolicyNameLateBidning          = "ZONAL2_STORAGE_POLICY_WFFC"
 	envZonal1StoragePolicyName                     = "ZONAL1_STORAGE_POLICY_IMM"
 	envZonal3StoragePolicyName                     = "ZONAL3_STORAGE_POLICY_IMM"
 	topologyDomainIsolation                        = "Workload_Management_Isolation"
 	envIsolationSharedStoragePolicyName            = "WORKLOAD_ISOLATION_SHARED_STORAGE_POLICY"
 	envSharedZone2Zone4StoragePolicyName           = "SHARED_ZONE2_ZONE4_STORAGE_POLICY_IMM"
 	envSharedZone2Zone4DatastoreUrl                = "SHARED_ZONE2_ZONE4_DATASTORE_URL"
-	envZonal2DatastoreUrl                          = "ZONAL2_DATASTORE_URL"
 	envZone3DatastoreName                          = "ZONE3_DATASTORE_NAME"
 	envZone2DatastoreName                          = "ZONE2_DATASTORE_NAME"
 	vmMigrationUserName                            = "VM_MIGRATION_USER_NAME"

tests/e2e/mgmt_wrkld_domain_isolation.go

@@ -379,9 +379,12 @@ var _ bool = ginkgo.Describe("[domain-isolation] Management-Workload-Domain-Isol
 		replicas = 3
 
 		// reading zonal storage policy of zone-2 wrkld domain
-		storagePolicyNameWffc := GetAndExpectStringEnvVar(envZonal2StoragePolicyNameLateBidning)
 		storagePolicyNameImm := GetAndExpectStringEnvVar(envZonal2StoragePolicyName)
 		storageProfileId = e2eVSphere.GetSpbmPolicyID(storagePolicyNameImm)
+
+		// append late-binding now as it knowns to k8s and not to vc
+		storagePolicyNameWffc := storagePolicyNameImm + "-latebinding"
+
 		/*
 			EX - zone -> zone-1, zone-2, zone-3, zone-4
 			so topValStartIndex=1 and topValEndIndex=2 will fetch the 1st index value from topology map string
@@ -887,14 +890,14 @@ var _ bool = ginkgo.Describe("[domain-isolation] Management-Workload-Domain-Isol
 		// reading zonal storage policy of zone-1 and zone-2
 		storagePolicyNameZ1 := GetAndExpectStringEnvVar(envZonal1StoragePolicyName)
 		storageProfileIdZ1 := e2eVSphere.GetSpbmPolicyID(storagePolicyNameZ1)
-		storagePolicyNameZ2 := GetAndExpectStringEnvVar(envZonal2StoragePolicyNameLateBidning)
+		storagePolicyNameZ2 := GetAndExpectStringEnvVar(envZonal2StoragePolicyName)
 		storageProfileIdZ2 := e2eVSphere.GetSpbmPolicyID(storagePolicyNameZ2)
 
 		// append late-binding now as it knowns to k8s and not to vc
 		storagePolicyNameZ2 = storagePolicyNameZ2 + "-latebinding"
 
 		// read datastore url
-		zonal2DsUrl := os.Getenv(envZonal2DatastoreUrl)
+		zonal2DsUrl := os.Getenv(envZone2DatastoreUrl)
 
 		ginkgo.By("Create a WCP namespace tagged to zone-1 & zone-2")
 		namespace, statuscode, err = createtWcpNsWithZonesAndPolicies(vcRestSessionId,