refactoring

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

Author: Valeriy Khorunzhin

test/e2e/internal/util/vm.go

@@ -26,6 +26,7 @@ import (
 	. "github.com/onsi/gomega"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	crclient "sigs.k8s.io/controller-runtime/pkg/client"
 
 	vmopbuilder "github.com/deckhouse/virtualization-controller/pkg/builder/vmop"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/conditions"
@@ -148,3 +149,21 @@ func IsVDAttached(vm *v1alpha2.VirtualMachine, vd *v1alpha2.VirtualDisk) bool {
 	}
 	return false
 }
+
+func IsRestartRequired(vm *v1alpha2.VirtualMachine, timeout time.Duration) bool {
+	GinkgoHelper()
+
+	if vm.Spec.Disruptions.RestartApprovalMode != v1alpha2.Manual {
+		return false
+	}
+
+	Eventually(func(g Gomega) {
+		err := framework.GetClients().GenericClient().Get(context.Background(), crclient.ObjectKeyFromObject(vm), vm)
+		g.Expect(err).NotTo(HaveOccurred())
+		needRestart, _ := conditions.GetCondition(vmcondition.TypeAwaitingRestartToApplyConfiguration, vm.Status.Conditions)
+		g.Expect(needRestart.Status).To(Equal(metav1.ConditionTrue))
+		g.Expect(vm.Status.RestartAwaitingChanges).NotTo(BeNil())
+	}).WithTimeout(timeout).WithPolling(time.Second).Should(Succeed())
+
+	return true
+}

test/e2e/vm/configuration.go

@@ -25,7 +25,6 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/api/resource"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/utils/ptr"
 	crclient "sigs.k8s.io/controller-runtime/pkg/client"
 
@@ -88,9 +87,7 @@ var _ = Describe("VirtualMachineConfiguration", func() {
 		err = f.Clients.GenericClient().Update(context.Background(), t.VM)
 		Expect(err).NotTo(HaveOccurred())
 
-		t.CheckRestartAwaitingChanges(t.VM)
-
-		if t.VM.Spec.Disruptions.RestartApprovalMode == v1alpha2.Manual {
+		if util.IsRestartRequired(t.VM, 3*time.Second) {
 			util.RebootVirtualMachineBySSH(f, t.VM)
 		}
 
@@ -157,18 +154,3 @@ func (t *configurationTest) GenerateResources(restartApprovalMode v1alpha2.Resta
 		vmbuilder.WithRestartApprovalMode(restartApprovalMode),
 	)
 }
-
-func (t *configurationTest) CheckRestartAwaitingChanges(vm *v1alpha2.VirtualMachine) {
-	if vm.Spec.Disruptions.RestartApprovalMode != v1alpha2.Manual {
-		return
-	}
-
-	// Avoid race conditions during the calculation of the "need restart" condition.
-	Eventually(func(g Gomega) {
-		err := t.Framework.Clients.GenericClient().Get(context.Background(), crclient.ObjectKeyFromObject(t.VM), t.VM)
-		g.Expect(err).NotTo(HaveOccurred())
-		needRestart, _ := conditions.GetCondition(vmcondition.TypeAwaitingRestartToApplyConfiguration, t.VM.Status.Conditions)
-		g.Expect(needRestart.Status).To(Equal(metav1.ConditionTrue))
-		g.Expect(t.VM.Status.RestartAwaitingChanges).NotTo(BeNil())
-	}).WithTimeout(3 * time.Second).WithPolling(time.Second).Should(Succeed())
-}