drop assert_vm_xml_efi

Signed-off-by: akri3i <guptaakriti70@gmail.com>

Author: akri3i

tests/infrastructure/instance_types/supported_os/test_fedora_os.py

@@ -9,7 +9,6 @@
 from utilities.constants import PREFERENCE_STR, U1_MEDIUM_STR
 from utilities.virt import (
     assert_linux_efi,
-    assert_vm_xml_efi,
     check_qemu_guest_agent_installed,
     check_vm_xml_smbios,
     running_vm,
@@ -79,15 +78,12 @@ def test_efi_secureboot_enabled_lockdown_state(self, golden_image_fedora_vm_with
     @pytest.mark.polarion("CNV-11834")
     def test_efi_secureboot_disabled_and_enabled(
         self,
-        admin_client,
         golden_image_fedora_vm_with_instance_type,
     ):
         vm = golden_image_fedora_vm_with_instance_type
 
         def _update_and_verify_secure_boot(vm, secure_boot_value):
             update_vm_efi_spec_and_restart(vm=vm, spec={"secureBoot": secure_boot_value})
-            # assert vm config at hypervisor level
-            assert_vm_xml_efi(vm=vm, admin_client=admin_client, secure_boot_enabled=secure_boot_value)
             assert_linux_efi(vm=vm)
 
         # Disable secureboot

tests/infrastructure/instance_types/supported_os/test_rhel_os.py

@@ -13,7 +13,6 @@
 from utilities.constants import PREFERENCE_STR, U1_MEDIUM_STR
 from utilities.virt import (
     assert_linux_efi,
-    assert_vm_xml_efi,
     check_qemu_guest_agent_installed,
     check_vm_xml_smbios,
     migrate_vm_and_verify,
@@ -101,15 +100,12 @@ def test_efi_secureboot_enabled_lockdown_state(self, golden_image_rhel_vm_with_i
     @pytest.mark.polarion("CNV-11834")
     def test_efi_secureboot_disabled_and_enabled(
         self,
-        admin_client,
         golden_image_rhel_vm_with_instance_type,
     ):
         vm = golden_image_rhel_vm_with_instance_type
 
         def _update_and_verify_secure_boot(vm, secure_boot_value):
             update_vm_efi_spec_and_restart(vm=vm, spec={"secureBoot": secure_boot_value})
-            # assert vm config at hypervisor level
-            assert_vm_xml_efi(vm=vm, admin_client=admin_client, secure_boot_enabled=secure_boot_value)
             assert_linux_efi(vm=vm)
 
         # Disable secureboot

tests/virt/cluster/common_templates/fedora/test_fedora_os_support.py

@@ -20,7 +20,6 @@
 from utilities.infra import validate_os_info_vmi_vs_linux_os
 from utilities.virt import (
     assert_linux_efi,
-    assert_vm_xml_efi,
     migrate_vm_and_verify,
     running_vm,
     validate_libvirt_persistent_domain,
@@ -132,8 +131,7 @@ def test_os_version(self, matrix_fedora_os_vm_from_template):
     @pytest.mark.sno
     @pytest.mark.dependency(depends=[f"{TESTS_CLASS_NAME}::start_vm"])
     @pytest.mark.polarion("CNV-9666")
-    def test_efi_secureboot_enabled_by_default(self, admin_client, matrix_fedora_os_vm_from_template):
-        assert_vm_xml_efi(vm=matrix_fedora_os_vm_from_template, admin_client=admin_client)
+    def test_efi_secureboot_enabled_by_default(self, matrix_fedora_os_vm_from_template):
         assert_linux_efi(vm=matrix_fedora_os_vm_from_template)
 
     @pytest.mark.sno

tests/virt/cluster/common_templates/rhel/test_rhel_os_support.py

@@ -18,7 +18,7 @@
 from utilities.infra import validate_os_info_vmi_vs_linux_os
 from utilities.virt import (
     assert_linux_efi,
-    assert_vm_xml_efi,
+    assert_secureboot_disabled,
     check_qemu_guest_agent_installed,
     check_vm_xml_smbios,
     migrate_vm_and_verify,
@@ -61,7 +61,6 @@ def test_create_vm(self, matrix_rhel_os_vm_from_template):
     @pytest.mark.polarion("CNV-3266")
     def test_start_vm(self, matrix_rhel_os_vm_from_template):
         """Test CNV common templates VM initiation"""
-
         running_vm(vm=matrix_rhel_os_vm_from_template)
 
     @pytest.mark.arm64
@@ -88,10 +87,9 @@ def test_os_version(self, matrix_rhel_os_vm_from_template):
     @pytest.mark.dependency(depends=[f"{TESTS_CLASS_NAME}::start_vm"])
     @pytest.mark.polarion("CNV-8712")
     @pytest.mark.usefixtures("xfail_on_rhel_version_below_rhel9")
-    def test_efi_secureboot_enabled_by_default(self, admin_client, matrix_rhel_os_vm_from_template):
+    def test_efi_secureboot_enabled_by_default(self, matrix_rhel_os_vm_from_template):
         """Test CNV common templates EFI secureboot status"""
 
-        assert_vm_xml_efi(vm=matrix_rhel_os_vm_from_template, admin_client=admin_client)
         assert_linux_efi(vm=matrix_rhel_os_vm_from_template)
 
     @pytest.mark.arm64
@@ -224,7 +222,7 @@ def test_vmi_guest_agent_info_after_guest_reboot(self, matrix_rhel_os_vm_from_te
     def test_efi_secureboot_disabled(self, admin_client, matrix_rhel_os_vm_from_template):
         vm = matrix_rhel_os_vm_from_template
         update_vm_efi_spec_and_restart(vm=vm, spec={"secureBoot": False})
-        assert_vm_xml_efi(vm=vm, admin_client=admin_client, secure_boot_enabled=False)
+        assert_secureboot_disabled(vm=vm, admin_client=admin_client)
         assert_linux_efi(vm=vm)
 
     @pytest.mark.arm64

tests/virt/cluster/common_templates/windows/test_windows_os_support.py

@@ -17,7 +17,6 @@
 from utilities.guest_support import assert_windows_efi, check_vm_xml_hyperv, check_windows_vm_hvinfo
 from utilities.ssp import validate_os_info_vmi_vs_windows_os
 from utilities.virt import (
-    assert_vm_xml_efi,
     check_vm_xml_smbios,
     migrate_vm_and_verify,
     running_vm,
@@ -58,10 +57,9 @@ def test_start_vm(self, matrix_windows_os_vm_from_template):
     @pytest.mark.sno
     @pytest.mark.dependency(depends=[f"{TESTS_CLASS_NAME}::start_vm"])
     @pytest.mark.polarion("CNV-8854")
-    def test_efi_secureboot_enabled_by_default(self, admin_client, matrix_windows_os_vm_from_template):
+    def test_efi_secureboot_enabled_by_default(self, matrix_windows_os_vm_from_template):
         """Test CNV common templates EFI secureboot status"""
 
-        assert_vm_xml_efi(vm=matrix_windows_os_vm_from_template, admin_client=admin_client)
         assert_windows_efi(vm=matrix_windows_os_vm_from_template)
 
     @pytest.mark.sno

utilities/virt.py

@@ -2574,6 +2574,20 @@ def assert_linux_efi(vm: VirtualMachineForTests) -> None:
     return run_ssh_commands(host=vm.ssh_exec, commands=shlex.split("ls -ld /sys/firmware/efi"))[0]
 
 
+def assert_secureboot_disabled(vm: VirtualMachineForTests, admin_client: DynamicClient) -> None:
+    LOGGER.info("Verify VM XML - EFI secureBoot is disabled.")
+    xml_dict_os = vm.vmi.get_xml_dict(privileged_client=admin_client)["domain"]["os"]
+    vmi_xml_os_secure = xml_dict_os["loader"]["@secure"]
+    vmi_xml_efi_vars_path = xml_dict_os["nvram"]["@template"]
+    expected_vars_path = "/usr/share/OVMF/OVMF_VARS.fd"
+    assert vmi_xml_os_secure == "no", (
+        f"EFI secure value {vmi_xml_os_secure} is not set to 'no' — Secure Boot is not disabled"
+    )
+    assert vmi_xml_efi_vars_path == expected_vars_path, (
+        f"EFIVarsPath {vmi_xml_efi_vars_path} does not match expected {expected_vars_path}"
+    )
+
+
 def pause_unpause_vm_and_check_connectivity(vm: VirtualMachineForTests) -> None:
     vm.vmi.pause(wait=True)
     vm.vmi.unpause(wait=True)
@@ -2615,29 +2629,6 @@ def check_vm_xml_smbios(vm: VirtualMachineForTests, cm_values: Dict[str, str], a
     assert all(results.values())
 
 
-def assert_vm_xml_efi(
-    vm: VirtualMachineForTests, admin_client: DynamicClient, *, secure_boot_enabled: bool = True
-) -> None:
-    LOGGER.info("Verify VM XML - EFI secureBoot values.")
-    xml_dict_os = vm.vmi.get_xml_dict(privileged_client=admin_client)["domain"]["os"]
-    ovmf_path = "/usr/share/OVMF"
-    efi_path = f"{ovmf_path}/OVMF_CODE.secboot.fd"
-    # efi vars path when secure boot is enabled: /usr/share/OVMF/OVMF_VARS.secboot.fd
-    # efi vars path when secure boot is disabled: /usr/share/OVMF/OVMF_VARS.fd
-    efi_vars_path = f"{ovmf_path}/OVMF_VARS.{'secboot.' if secure_boot_enabled else ''}fd"
-    vmi_xml_efi_path = xml_dict_os["loader"]["#text"]
-    vmi_xml_efi_vars_path = xml_dict_os["nvram"]["@template"]
-    vmi_xml_os_secure = xml_dict_os["loader"]["@secure"]
-    os_secure = "yes" if secure_boot_enabled else "no"
-    assert vmi_xml_efi_path == efi_path, f"EFIPath value {vmi_xml_efi_path} does not match expected {efi_path} value"
-    assert vmi_xml_os_secure == os_secure, (
-        f"EFI secure value {vmi_xml_os_secure} does not seem to be set as {os_secure}"
-    )
-    assert vmi_xml_efi_vars_path == efi_vars_path, (
-        f"EFIVarsPath value {vmi_xml_efi_vars_path} does not match expected {efi_vars_path} value"
-    )
-
-
 def update_vm_efi_spec_and_restart(
     vm: VirtualMachineForTests, spec: dict[str, Any] | None = None, wait_for_interfaces: bool = True
 ) -> None: