test: migrate VirtualMachineEvacuation e2e test to new framework (#2323)

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

Author: eofff

test/e2e/default_config.yaml

@@ -24,7 +24,6 @@ testData:
   vmConfiguration: "/tmp/testdata/vm-configuration"
   vmMigration: "/tmp/testdata/vm-migration"
   vmMigrationCancel: "/tmp/testdata/vm-migration-cancel"
-  vmEvacuation: "/tmp/testdata/vm-evacuation"
   vdSnapshots: "/tmp/testdata/vd-snapshots"
   sshKey: "/tmp/testdata/sshkeys/id_ed"
   sshUser: "cloud"

test/e2e/internal/config/config.go

@@ -92,7 +92,6 @@ type TestData struct {
 	ImageHotplug      string `yaml:"imageHotplug"`
 	VMMigration       string `yaml:"vmMigration"`
 	VMMigrationCancel string `yaml:"vmMigrationCancel"`
-	VMEvacuation      string `yaml:"vmEvacuation"`
 	VdSnapshots       string `yaml:"vdSnapshots"`
 	Sshkey            string `yaml:"sshKey"`
 	SSHUser           string `yaml:"sshUser"`

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,14 +323,41 @@ 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
 		}
 	}
 
-	return "", fmt.Errorf("no active pod found for virtual machine %s", vm.Name)
+	return "", fmt.Errorf("no active pod found for virtual machine %s/%s", vm.Namespace, vm.Name)
 }
 
 func UntilVirtualMachineRebooted(key client.ObjectKey, previousRunningTime time.Time, timeout time.Duration) {