vsan stretch cluster fixes

Author: Aishwarya-Hebbar

tests/e2e/vsan_stretched_cluster.go

@@ -738,8 +738,6 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
 						framework.Logf("Volume %v still not deleted from CNS with err %v", pv.Name, errMsg)
 					} else {
 						gomega.Expect(err).NotTo(gomega.HaveOccurred())
-						err = e2eVSphere.waitForCNSVolumeToBeDeleted(volumeHandle)
-						gomega.Expect(err).NotTo(gomega.HaveOccurred())
 					}
 
 				}
@@ -1045,8 +1043,6 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
 						framework.Logf("Volume %v still not deleted from CNS with err %v", pv.Name, errMsg)
 					} else {
 						gomega.Expect(err).NotTo(gomega.HaveOccurred())
-						err = e2eVSphere.waitForCNSVolumeToBeDeleted(volumeHandle)
-						gomega.Expect(err).NotTo(gomega.HaveOccurred())
 					}
 				}
 			}()
@@ -1254,8 +1250,6 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
 					framework.Logf("Volume %v still not deleted from CNS with err %v", pv.Name, errMsg)
 				} else {
 					gomega.Expect(err).NotTo(gomega.HaveOccurred())
-					err = e2eVSphere.waitForCNSVolumeToBeDeleted(volumeHandle)
-					gomega.Expect(err).NotTo(gomega.HaveOccurred())
 				}
 
 			}
@@ -1782,9 +1776,6 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
 					framework.Logf("Volume %v still not deleted from CNS with err %v", pv.Name, errMsg)
 				} else {
 					gomega.Expect(err).NotTo(gomega.HaveOccurred())
-					err = e2eVSphere.waitForCNSVolumeToBeDeleted(volumeHandle)
-					gomega.Expect(err).NotTo(gomega.HaveOccurred())
-					// TODO: List orphan volumes
 				}
 			}
 			ginkgo.By("Bring up the secondary site")
@@ -1881,8 +1872,6 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
 						framework.Logf("Volume %v still not deleted from CNS with err %v", pv.Name, errMsg)
 					} else {
 						gomega.Expect(err).NotTo(gomega.HaveOccurred())
-						err = e2eVSphere.waitForCNSVolumeToBeDeleted(volumeHandle)
-						gomega.Expect(err).NotTo(gomega.HaveOccurred())
 					}
 				}
 			}()
@@ -3268,10 +3257,6 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
 				}
 			}()
 
-			// Get the list of csi pods running in CSI namespace
-			/*csipods, err := client.CoreV1().Pods(csiNs).List(ctx, metav1.ListOptions{})
-			gomega.Expect(err).NotTo(gomega.HaveOccurred())*/
-
 			replicas1 += 2
 			ginkgo.By(fmt.Sprintf("Scaling up statefulset %v to number of Replica: %v", statefulset1.Name, replicas1))
 			fss.UpdateReplicas(ctx, client, statefulset1, replicas1)
@@ -3443,8 +3428,6 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
 						framework.Logf("Volume %v still not deleted from CNS with err %v", pv.Name, errMsg)
 					} else {
 						gomega.Expect(err).NotTo(gomega.HaveOccurred())
-						err = e2eVSphere.waitForCNSVolumeToBeDeleted(volumeHandle)
-						gomega.Expect(err).NotTo(gomega.HaveOccurred())
 					}
 				}
 			}()
@@ -3643,8 +3626,6 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
 						framework.Logf("Volume %v still not deleted from CNS with err %v", pv.Name, errMsg)
 					} else {
 						gomega.Expect(err).NotTo(gomega.HaveOccurred())
-						err = e2eVSphere.waitForCNSVolumeToBeDeleted(volumeHandle)
-						gomega.Expect(err).NotTo(gomega.HaveOccurred())
 					}
 				}
 			}()

tests/e2e/vsan_stretched_cluster_utils.go

@@ -660,6 +660,7 @@ func checkVmStorageCompliance(storagePolicy string) bool {
 	framework.Logf("Running command: %s", cmd)
 	result, err := exec.Command("/bin/bash", "-c", cmd).Output()
 	framework.Logf("res is: %v", result)
+	framework.Logf("err: %v", err.Error())
 	return strings.Contains(err.Error(), "object references is empty")
 }