remove useless wrapper

Signed-off-by: Valeriy Khorunzhin <[email protected]>

Author: Valeriy Khorunzhin

test/e2e/internal/util/vm.go

@@ -111,22 +111,6 @@ func CheckExternalConnectivity(f *framework.Framework, vmName, host, expectedHTT
 	Expect(strings.TrimSpace(httpCode)).To(Equal(expectedHTTPCode), "HTTP response code from %s should be %s, got %s", host, expectedHTTPCode, httpCode)
 }
 
-func UntilVirtualMachineStopped(key client.ObjectKey, timeout time.Duration) {
-	GinkgoHelper()
-
-	Eventually(func() error {
-		vm := &v1alpha2.VirtualMachine{}
-		err := framework.GetClients().GenericClient().Get(context.Background(), key, vm)
-		if err != nil {
-			return err
-		}
-		if vm.Status.Phase == v1alpha2.MachineStopped {
-			return nil
-		}
-		return fmt.Errorf("virtual machine %s is not stopped (phase: %s)", key.Name, vm.Status.Phase)
-	}).WithTimeout(timeout).WithPolling(time.Second).Should(Succeed())
-}
-
 func RebootVirtualMachineFromOS(f *framework.Framework, vm *v1alpha2.VirtualMachine) error {
 	_, err := f.SSHCommand(vm.Name, vm.Namespace, "sudo reboot")
 	if err != nil && strings.Contains(err.Error(), "unexpected EOF") {

test/e2e/vmop/restore.go

@@ -308,17 +308,13 @@ func (r *restoreModeTest) GetDataFromVMBDA() string {
 func (r *restoreModeTest) RemoveDisks() {
 	GinkgoHelper()
 
-	// Stop VM and remove all disks to test Strict restore mode.
 	err := util.StopVirtualMachineFromOS(r.Framework, r.VM)
 	Expect(err).NotTo(HaveOccurred())
-	util.UntilVirtualMachineStopped(crclient.ObjectKeyFromObject(r.VM), framework.ShortTimeout)
+	util.UntilObjectPhase(string(v1alpha2.MachineStopped), framework.ShortTimeout, r.VM)
 
-	err = r.Framework.Delete(context.Background(), r.VDRoot)
-	Expect(err).NotTo(HaveOccurred())
-	err = r.Framework.Delete(context.Background(), r.VDBlank)
+	err = r.Framework.Delete(context.Background(), r.VDRoot, r.VDBlank)
 	Expect(err).NotTo(HaveOccurred())
 
-	// Wait for disks to be fully deleted before proceeding with restore
 	Eventually(func(g Gomega) {
 		var vdRootLocal v1alpha2.VirtualDisk
 		err = r.Framework.Clients.GenericClient().Get(context.Background(), types.NamespacedName{