resolve

Signed-off-by: Valeriy Khorunzhin <valeriy.khorunzhin@flant.com>

Author: Valeriy Khorunzhin

test/e2e/internal/util/vm.go

@@ -308,7 +308,7 @@ func RebootVirtualMachineByVMOP(f *framework.Framework, vm *v1alpha2.VirtualMach
 func RebootVirtualMachineByPodDeletion(f *framework.Framework, vm *v1alpha2.VirtualMachine) {
 	GinkgoHelper()
 
-	activePodName, err := getActivePodName(vm)
+	activePodName, err := GetActivePodName(vm)
 	Expect(err).NotTo(HaveOccurred())
 	Expect(activePodName).NotTo(BeEmpty())
 
@@ -323,7 +323,34 @@ func RebootVirtualMachineByPodDeletion(f *framework.Framework, vm *v1alpha2.Virt
 	Expect(err).NotTo(HaveOccurred())
 }
 
-func getActivePodName(vm *v1alpha2.VirtualMachine) (string, error) {
+func GetVirtualMachineAndActivePod(ctx context.Context, f *framework.Framework, vm *v1alpha2.VirtualMachine) (*v1alpha2.VirtualMachine, *corev1.Pod, error) {
+	var currentVM v1alpha2.VirtualMachine
+	err := f.GenericClient().Get(ctx, client.ObjectKey{
+		Namespace: vm.Namespace,
+		Name:      vm.Name,
+	}, &currentVM)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	activePodName, err := GetActivePodName(&currentVM)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	var activePod corev1.Pod
+	err = f.GenericClient().Get(ctx, client.ObjectKey{
+		Namespace: vm.Namespace,
+		Name:      activePodName,
+	}, &activePod)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	return &currentVM, &activePod, nil
+}
+
+func GetActivePodName(vm *v1alpha2.VirtualMachine) (string, error) {
 	for _, pod := range vm.Status.VirtualMachinePods {
 		if pod.Active {
 			return pod.Name, nil

test/e2e/vm/evacuation.go

@@ -154,17 +154,10 @@ func evacuateVirtualMachines(ctx context.Context, f *framework.Framework, vms ..
 	Eventually(func(g Gomega) {
 		pods = []corev1.Pod{}
 		for _, vm := range vms {
-			var currentVM v1alpha2.VirtualMachine
-			err := f.GenericClient().Get(ctx, crclient.ObjectKeyFromObject(vm), &currentVM)
+			_, pod, err := util.GetVirtualMachineAndActivePod(ctx, f, vm)
 			g.Expect(err).NotTo(HaveOccurred())
-
-			activePodName, err := getActiveVirtualMachinePodName(&currentVM)
-			g.Expect(err).NotTo(HaveOccurred())
-
-			var pod corev1.Pod
-			err = f.GenericClient().Get(ctx, crclient.ObjectKey{Namespace: vm.Namespace, Name: activePodName}, &pod)
-			g.Expect(err).NotTo(HaveOccurred())
-			pods = append(pods, pod)
+			g.Expect(pod).NotTo(BeNil())
+			pods = append(pods, *pod)
 		}
 	}).WithTimeout(framework.MiddleTimeout).WithPolling(framework.PollingInterval).Should(Succeed())
 

test/e2e/vm/label_annotation.go

@@ -22,8 +22,6 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	crclient "sigs.k8s.io/controller-runtime/pkg/client"
 
 	vmbuilder "github.com/deckhouse/virtualization-controller/pkg/builder/vm"
@@ -124,7 +122,7 @@ func expectLabelState(ctx context.Context, f *framework.Framework, vm *v1alpha2.
 	GinkgoHelper()
 
 	Eventually(func(g Gomega) {
-		currentVM, activePod, err := getVirtualMachineAndActivePod(ctx, f, vm)
+		currentVM, activePod, err := util.GetVirtualMachineAndActivePod(ctx, f, vm)
 		g.Expect(err).NotTo(HaveOccurred())
 
 		if isPresent {
@@ -142,7 +140,7 @@ func expectAnnotationState(ctx context.Context, f *framework.Framework, vm *v1al
 	GinkgoHelper()
 
 	Eventually(func(g Gomega) {
-		currentVM, activePod, err := getVirtualMachineAndActivePod(ctx, f, vm)
+		currentVM, activePod, err := util.GetVirtualMachineAndActivePod(ctx, f, vm)
 		g.Expect(err).NotTo(HaveOccurred())
 
 		if isPresent {
@@ -155,32 +153,3 @@ func expectAnnotationState(ctx context.Context, f *framework.Framework, vm *v1al
 		g.Expect(activePod.Annotations).NotTo(HaveKey(metadataSpecialKey))
 	}).WithTimeout(framework.LongTimeout).WithPolling(framework.PollingInterval).Should(Succeed())
 }
-
-func getVirtualMachineAndActivePod(ctx context.Context, f *framework.Framework, vm *v1alpha2.VirtualMachine) (*v1alpha2.VirtualMachine, *corev1.Pod, error) {
-	currentVM, err := f.VirtClient().VirtualMachines(vm.Namespace).Get(ctx, vm.Name, metav1.GetOptions{})
-	if err != nil {
-		return nil, nil, err
-	}
-
-	activePodName, err := getActiveVirtualMachinePodName(currentVM)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	activePod, err := f.KubeClient().CoreV1().Pods(vm.Namespace).Get(ctx, activePodName, metav1.GetOptions{})
-	if err != nil {
-		return nil, nil, err
-	}
-
-	return currentVM, activePod, nil
-}
-
-func getActiveVirtualMachinePodName(vm *v1alpha2.VirtualMachine) (string, error) {
-	for _, pod := range vm.Status.VirtualMachinePods {
-		if pod.Active {
-			return pod.Name, nil
-		}
-	}
-
-	return "", fmt.Errorf("active pod was not found for vm %s/%s", vm.Namespace, vm.Name)
-}