Merge pull request #3818 from kavyashree-r/wcp-regression-fix

Added wait time for the storage quota details to get updated

Author: chethanv28

tests/e2e/csi_static_provisioning_basic.go

@@ -910,6 +910,7 @@ var _ = ginkgo.Describe("Basic Static Provisioning", func() {
 		gomega.Expect(exists).To(gomega.BeTrue(), fmt.Sprintf("Pod doesn't have %s annotation", vmUUIDLabel))
 		_, err = e2eVSphere.getVMByUUID(ctx, vmUUID)
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
+		time.Sleep(pollTimeoutShort)
 
 		diskSizeInMbstr := convertInt64ToStrMbFormat(diskSizeInMb)
 		if isQuotaValidationSupported {
@@ -1056,6 +1057,7 @@ var _ = ginkgo.Describe("Basic Static Provisioning", func() {
 		gomega.Expect(err).To(gomega.HaveOccurred(),
 			fmt.Sprintf("PodVM with vmUUID: %s still exists. So volume: %s is not detached from the PodVM",
 				vmUUID, pv.Spec.CSI.VolumeHandle))
+		time.Sleep(pollTimeoutShort)
 		defer func() {
 			testCleanUpUtil(ctx, restConfig, cnsRegisterVolume, namespace, pvc.Name, pv.Name)
 			if isQuotaValidationSupported {

tests/e2e/util.go

@@ -7005,7 +7005,7 @@ func checkVcServicesHealthPostReboot(ctx context.Context, host string, timeout .
 	addr := ip + ":" + portNum
 
 	//list of default stopped services in VC
-	var defaultStoppedServicesList = []string{"vmcam", "vmware-imagebuilder", "vmware-netdumper",
+	var defaultStoppedServicesList = []string{"vc-salt", "vmcam", "vmware-imagebuilder", "vmware-netdumper",
 		"vmware-rbd-watchdog", "vmware-vcha"}
 	waitErr := wait.PollUntilContextTimeout(ctx, pollTimeoutShort, pollTime, true,
 		func(ctx context.Context) (bool, error) {

tests/e2e/vsphere_volume_expansion.go

@@ -982,6 +982,7 @@ var _ = ginkgo.Describe("Volume Expansion Test", func() {
 
 		pvcConditions := pvclaim.Status.Conditions
 		expectEqual(len(pvcConditions), 0, "pvc should not have conditions")
+		time.Sleep(pollTimeoutShort)
 
 		ginkgo.By("Verify filesystem size for mount point /mnt/volume1")
 		fsSize, err = getFileSystemSizeForOsType(f, client, pod)