[VIRT] Add fixture for migratable VMs in upgrade test (RedHatQE#1970)

store migratable VIRT VMs in fixture to reduce extra API calls

Author: dshchedr

tests/virt/upgrade/conftest.py

@@ -292,9 +292,28 @@ def run_strategy_golden_image_data_source(admin_client, run_strategy_golden_imag
 
 
 @pytest.fixture(scope="session")
-def linux_boot_time_before_upgrade(vms_for_upgrade):
+def virt_migratable_vms(vms_for_upgrade):
+    def _vm_is_migrateable(vm):
+        vm_spec = vm.instance.spec
+        vm_access_modes = (
+            vm.get_storage_configuration()
+            if (vm_spec.get("instancetype") or vm_spec.get("preference"))
+            else vm.access_modes
+        )
+        if DataVolume.AccessMode.RWO in vm_access_modes:
+            return False
+        return True
+
+    migratable_vms = [vm for vm in vms_for_upgrade if _vm_is_migrateable(vm=vm)]
+
+    LOGGER.info(f"VIRT migratable vms: {[vm.name for vm in migratable_vms]}")
+    return migratable_vms
+
+
+@pytest.fixture(scope="session")
+def linux_boot_time_before_upgrade(virt_migratable_vms):
     boot_time_dict = {}
-    for vm in vms_for_upgrade:
+    for vm in virt_migratable_vms:
         boot_time_dict[vm.name] = get_vm_boot_time(vm=vm)
     yield boot_time_dict
 

tests/virt/upgrade/test_upgrade_virt.py

@@ -20,7 +20,6 @@
     verify_run_strategy_vmi_status,
     verify_vms_ssh_connectivity,
     verify_windows_boot_time,
-    vm_is_migrateable,
 )
 from tests.virt.utils import assert_migration_post_copy_mode
 from utilities.constants import DATA_SOURCE_NAME, DEPENDENCY_SCOPE_SESSION
@@ -102,10 +101,9 @@ def test_vm_ssh_before_upgrade(self, vms_for_upgrade):
         depends=[VMS_RUNNING_BEFORE_UPGRADE_TEST_NODE_ID],
         scope=DEPENDENCY_SCOPE_SESSION,
     )
-    def test_migration_before_upgrade(self, vms_for_upgrade):
-        for vm in vms_for_upgrade:
-            if vm_is_migrateable(vm=vm):
-                migrate_vm_and_verify(vm=vm, wait_for_interfaces=False, check_ssh_connectivity=False)
+    def test_migration_before_upgrade(self, virt_migratable_vms):
+        for vm in virt_migratable_vms:
+            migrate_vm_and_verify(vm=vm, wait_for_interfaces=False, check_ssh_connectivity=False)
 
     @pytest.mark.ocp_upgrade
     @pytest.mark.sno
@@ -180,10 +178,10 @@ def test_vmi_pod_image_updates_after_upgrade_optin(
         ],
         scope=DEPENDENCY_SCOPE_SESSION,
     )
-    def test_is_vm_running_after_upgrade(self, vms_for_upgrade, linux_boot_time_before_upgrade):
+    def test_is_vm_running_after_upgrade(self, vms_for_upgrade, virt_migratable_vms, linux_boot_time_before_upgrade):
         for vm in vms_for_upgrade:
             vm.vmi.wait_until_running()
-        verify_linux_boot_time(vm_list=vms_for_upgrade, initial_boot_time=linux_boot_time_before_upgrade)
+        verify_linux_boot_time(vm_list=virt_migratable_vms, initial_boot_time=linux_boot_time_before_upgrade)
 
     @pytest.mark.gating
     @pytest.mark.ocp_upgrade
@@ -280,11 +278,10 @@ def test_windows_vm_after_upgrade(
         ],
         scope=DEPENDENCY_SCOPE_SESSION,
     )
-    def test_migration_after_upgrade(self, vms_for_upgrade):
-        for vm in vms_for_upgrade:
-            if vm_is_migrateable(vm=vm):
-                migrate_vm_and_verify(vm=vm)
-                vm_console_run_commands(vm=vm, commands=["ls"], timeout=1100)
+    def test_migration_after_upgrade(self, virt_migratable_vms):
+        for vm in virt_migratable_vms:
+            migrate_vm_and_verify(vm=vm)
+            vm_console_run_commands(vm=vm, commands=["ls"], timeout=1100)
 
     @pytest.mark.ocp_upgrade
     @pytest.mark.sno

tests/virt/upgrade/utils.py

@@ -3,7 +3,6 @@
 from datetime import datetime
 
 import pytest
-from ocp_resources.datavolume import DataVolume
 from ocp_resources.template import Template
 from ocp_resources.virtual_machine import VirtualMachine
 from ocp_resources.virtual_machine_instance_migration import (
@@ -165,35 +164,20 @@ def verify_run_strategy_vmi_status(run_strategy_vmi_list):
     return run_strategy_vmi_list
 
 
-def vm_is_migrateable(vm):
-    vm_spec = vm.instance.spec
-    vm_access_modes = (
-        vm.get_storage_configuration()
-        if (vm_spec.get("instancetype") or vm_spec.get("preference"))
-        else vm.access_modes
-    )
-    if DataVolume.AccessMode.RWO in vm_access_modes:
-        LOGGER.info(f"Cannot migrate a VM {vm.name} with RWO PVC.")
-        return False
-    return True
-
-
 def verify_linux_boot_time(vm_list, initial_boot_time):
     rebooted_vms = {}
     for vm in vm_list:
-        if vm_is_migrateable(vm=vm):
-            current_boot_time = get_vm_boot_time(vm=vm)
-            if initial_boot_time[vm.name] != current_boot_time:
-                rebooted_vms[vm.name] = {"initial": initial_boot_time[vm.name], "current": current_boot_time}
+        current_boot_time = get_vm_boot_time(vm=vm)
+        if initial_boot_time[vm.name] != current_boot_time:
+            rebooted_vms[vm.name] = {"initial": initial_boot_time[vm.name], "current": current_boot_time}
     assert not rebooted_vms, f"Boot time changed for VMs:\n {rebooted_vms}"
 
 
 def verify_windows_boot_time(windows_vm, initial_boot_time):
-    if vm_is_migrateable(vm=windows_vm):
-        current_boot_time = get_vm_boot_time(vm=windows_vm)
-        assert initial_boot_time == current_boot_time, (
-            f"Boot time for Windows VM changed:\n initial: {initial_boot_time}\n current: {current_boot_time}"
-        )
+    current_boot_time = get_vm_boot_time(vm=windows_vm)
+    assert initial_boot_time == current_boot_time, (
+        f"Boot time for Windows VM changed:\n initial: {initial_boot_time}\n current: {current_boot_time}"
+    )
 
 
 @contextmanager