vsan stretch automation for TKG, WCP and VMService VMs

kubernetes-sigs · Sep 16, 2024 · fc3b3aa · fc3b3aa
1 parent 3196039
commit fc3b3aa
Show file tree

Hide file tree

Showing 8 changed files with 1,996 additions and 347 deletions.
diff --git a/tests/e2e/hci_mesh_rwx_disruptive.go b/tests/e2e/hci_mesh_rwx_disruptive.go
@@ -677,7 +677,7 @@ var _ = ginkgo.Describe("[rwx-hci-singlevc-disruptive] RWX-Topology-HciMesh-Sing
 
 		ginkgo.By("PSOD all host in remote cluster4 and when psod is triggered, create new set of rwx pvc")
 		for i := 0; i < len(hostListCluster4); i++ {
-			err = psodHost(hostListCluster4[i])
+			err = psodHost(hostListCluster4[i], "")
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
 
 			if i == 0 {
@@ -729,7 +729,7 @@ var _ = ginkgo.Describe("[rwx-hci-singlevc-disruptive] RWX-Topology-HciMesh-Sing
 		ginkgo.By("PSOD again all host in remote cluster4 and perform scaleup " +
 			"operation on deployment and statefulset")
 		for i := 0; i < len(hostListCluster4); i++ {
-			err = psodHost(hostListCluster4[i])
+			err = psodHost(hostListCluster4[i], "")
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
 
 			if i == 0 {
@@ -1873,7 +1873,7 @@ var _ = ginkgo.Describe("[rwx-hci-singlevc-disruptive] RWX-Topology-HciMesh-Sing
 
 		ginkgo.By("PSOD all host in local cluster2 and when psod is triggered, create new set of rwx pvc")
 		for i := 0; i < len(hostListCluster2); i++ {
-			err = psodHost(hostListCluster2[i])
+			err = psodHost(hostListCluster2[i], "")
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
 
 			if i == 0 {
@@ -1929,7 +1929,7 @@ var _ = ginkgo.Describe("[rwx-hci-singlevc-disruptive] RWX-Topology-HciMesh-Sing
 		ginkgo.By("PSOD all host in local cluster3 and perform scaleup " +
 			"operation on deployment and statefulset")
 		for i := 0; i < len(hostListCluster3); i++ {
-			err = psodHost(hostListCluster3[i])
+			err = psodHost(hostListCluster3[i], "")
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
 
 			if i == 0 {

diff --git a/tests/e2e/no_hci_mesh_rwx_singlevc_topology_disruptive.go b/tests/e2e/no_hci_mesh_rwx_singlevc_topology_disruptive.go
@@ -752,7 +752,7 @@ var _ = ginkgo.Describe("[rwx-nohci-singlevc-disruptive] RWX-Topology-NoHciMesh-
 
 		ginkgo.By("PSOD all host")
 		for i := 0; i < len(hostList); i++ {
-			err = psodHost(hostList[i])
+			err = psodHost(hostList[i], "")
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
 
 			if i == 2 {

diff --git a/tests/e2e/rwx_topology_utils.go b/tests/e2e/rwx_topology_utils.go
@@ -893,18 +893,24 @@ func verifyK8sNodeStatusAfterSiteRecovery(client clientset.Interface, ctx contex
 }
 
 /* This util will perform psod operation on a host */
-func psodHost(hostIP string) error {
+func psodHost(hostIP string, psodTimeOut string) error {
 	ginkgo.By("PSOD")
-	sshCmd := fmt.Sprintf("vsish -e set /config/Misc/intOpts/BlueScreenTimeout %s", psodTime)
-	op, err := runCommandOnESX("root", hostIP, sshCmd)
+	var timeout string
+	if psodTimeOut != "" {
+		timeout = psodTimeOut
+	} else {
+		timeout = psodTime
+	}
+	sshCmd := fmt.Sprintf("vsish -e set /config/Misc/intOpts/BlueScreenTimeout %s", timeout)
+	op, err := runCommandOnESX(rootUser, hostIP, sshCmd)
 	framework.Logf(op)
 	if err != nil {
 		return fmt.Errorf("failed to set BlueScreenTimeout: %w", err)
 	}
 
 	ginkgo.By("Injecting PSOD")
-	psodCmd := "vsish -e set /reliability/crashMe/Panic 1"
-	op, err = runCommandOnESX("root", hostIP, psodCmd)
+	psodCmd := "vsish -e set /reliability/crashMe/Panic 1; exit"
+	op, err = runCommandOnESX(rootUser, hostIP, psodCmd)
 	framework.Logf(op)
 	if err != nil {
 		return fmt.Errorf("failed to inject PSOD: %w", err)

diff --git a/tests/e2e/util.go b/tests/e2e/util.go
@@ -3618,18 +3618,8 @@ func psodHostWithPv(ctx context.Context, vs *vSphere, pvName string) string {
 	framework.Logf("hostIP %v", hostIP)
 	gomega.Expect(hostIP).NotTo(gomega.BeEmpty())
 
-	ginkgo.By("PSOD")
-	sshCmd := fmt.Sprintf("vsish -e set /config/Misc/intOpts/BlueScreenTimeout %s", psodTime)
-	op, err := runCommandOnESX("root", hostIP, sshCmd)
-	framework.Logf(op)
+	err := psodHost(hostIP, "")
 	gomega.Expect(err).NotTo(gomega.HaveOccurred())
-
-	ginkgo.By("Injecting PSOD ")
-	psodCmd := "vsish -e set /reliability/crashMe/Panic 1"
-	op, err = runCommandOnESX("root", hostIP, psodCmd)
-	framework.Logf(op)
-	gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
-
 	return hostIP
 }