test: fix powerstate (#2036)

Description
Reduced ssh command timeout wait to 5 seconds. UntilSSHReady now wait 60 seconds in test PowerState.

Why do we need it, and what problem does it solve?
There was also only one attempt to connect to the server. SSH actually only knocked once, because the timeout for SSH is 30 seconds, and for Eventually it's also 30 seconds.

---------

Signed-off-by: Nikita Korolev <nikita.korolev@flant.com>

Author: universal-itengineer

test/e2e/internal/util/vm.go

@@ -59,7 +59,7 @@ func UntilSSHReady(f *framework.Framework, vm *v1alpha2.VirtualMachine, timeout
 	GinkgoHelper()
 
 	Eventually(func(g Gomega) {
-		result, err := f.SSHCommand(vm.Name, vm.Namespace, "echo 'test'")
+		result, err := f.SSHCommand(vm.Name, vm.Namespace, "echo 'test'", framework.WithSSHTimeout(5*time.Second))
 		g.Expect(err).NotTo(HaveOccurred())
 		g.Expect(result).To(ContainSubstring("test"))
 	}).WithTimeout(timeout).WithPolling(time.Second).Should(Succeed())

test/e2e/vm/power_state.go

@@ -72,7 +72,7 @@ var _ = Describe("PowerState", func() {
 
 			util.UntilObjectPhase(string(v1alpha2.MachineRunning), framework.LongTimeout, t.VM)
 			util.UntilObjectPhase(string(v1alpha2.BlockDeviceAttachmentPhaseAttached), framework.MiddleTimeout, t.VMBDA)
-			util.UntilSSHReady(f, t.VM, framework.ShortTimeout)
+			util.UntilSSHReady(f, t.VM, framework.MiddleTimeout)
 		})
 
 		By("Shutdown VM by VMOP", func() {
@@ -101,7 +101,7 @@ var _ = Describe("PowerState", func() {
 				util.StartVirtualMachine(f, t.VM)
 				util.UntilObjectPhase(string(v1alpha2.MachineRunning), framework.MiddleTimeout, t.VM)
 				util.UntilObjectPhase(string(v1alpha2.BlockDeviceAttachmentPhaseAttached), framework.ShortTimeout, t.VMBDA)
-				util.UntilSSHReady(f, t.VM, framework.ShortTimeout)
+				util.UntilSSHReady(f, t.VM, framework.MiddleTimeout)
 			}
 		})
 
@@ -118,7 +118,7 @@ var _ = Describe("PowerState", func() {
 				util.UntilVirtualMachineRebooted(crclient.ObjectKeyFromObject(t.VM), runningLastTransitionTime, framework.LongTimeout)
 				util.UntilObjectPhase(string(v1alpha2.MachineRunning), framework.ShortTimeout, t.VM)
 				util.UntilObjectPhase(string(v1alpha2.BlockDeviceAttachmentPhaseAttached), framework.ShortTimeout, t.VMBDA)
-				util.UntilSSHReady(f, t.VM, framework.ShortTimeout)
+				util.UntilSSHReady(f, t.VM, framework.MiddleTimeout)
 			case v1alpha2.AlwaysOnUnlessStoppedManually, v1alpha2.ManualPolicy:
 				util.UntilObjectPhase(string(v1alpha2.MachineStopped), framework.LongTimeout, t.VM)
 			}
@@ -129,7 +129,7 @@ var _ = Describe("PowerState", func() {
 				util.StartVirtualMachine(f, t.VM)
 				util.UntilObjectPhase(string(v1alpha2.MachineRunning), framework.MiddleTimeout, t.VM)
 				util.UntilObjectPhase(string(v1alpha2.BlockDeviceAttachmentPhaseAttached), framework.ShortTimeout, t.VMBDA)
-				util.UntilSSHReady(f, t.VM, framework.ShortTimeout)
+				util.UntilSSHReady(f, t.VM, framework.MiddleTimeout)
 			}
 		})
 
@@ -153,7 +153,7 @@ var _ = Describe("PowerState", func() {
 			util.UntilVirtualMachineRebooted(crclient.ObjectKeyFromObject(t.VM), runningLastTransitionTime, framework.MiddleTimeout)
 			util.UntilObjectPhase(string(v1alpha2.MachineRunning), framework.ShortTimeout, t.VM)
 			util.UntilObjectPhase(string(v1alpha2.BlockDeviceAttachmentPhaseAttached), framework.ShortTimeout, t.VMBDA)
-			util.UntilSSHReady(f, t.VM, framework.ShortTimeout)
+			util.UntilSSHReady(f, t.VM, framework.MiddleTimeout)
 		})
 
 		By("Reboot VM by SSH", func() {
@@ -168,7 +168,7 @@ var _ = Describe("PowerState", func() {
 			util.UntilVirtualMachineRebooted(crclient.ObjectKeyFromObject(t.VM), runningLastTransitionTime, framework.LongTimeout)
 			util.UntilObjectPhase(string(v1alpha2.MachineRunning), framework.ShortTimeout, t.VM)
 			util.UntilObjectPhase(string(v1alpha2.BlockDeviceAttachmentPhaseAttached), framework.ShortTimeout, t.VMBDA)
-			util.UntilSSHReady(f, t.VM, framework.ShortTimeout)
+			util.UntilSSHReady(f, t.VM, framework.MiddleTimeout)
 		})
 
 		By("Check VM can reach external network", func() {