install: add a "firmware" parameter

Author: ydirson

tests/install/test.py

@@ -17,32 +17,40 @@
 @pytest.mark.dependency()
 class TestNested:
     @pytest.mark.parametrize("iso_version", ("821.1", "83b2"))
+    @pytest.mark.parametrize("firmware", ("uefi", "bios"))
     @pytest.mark.installer_iso(lambda version: {"821.1": "xcpng-8.2.1-2023",
                                                 "83b2": "xcpng-8.3-beta2"}[version],
                                param_mapping={"version": "iso_version"})
-    @pytest.mark.vm_definitions(
-        dict(name="vm 1",
-             template="Other install media",
-             params=(
-                 # dict(param_name="", value=""),
-                 dict(param_name="memory-static-max", value="4GiB"),
-                 dict(param_name="memory-dynamic-max", value="4GiB"),
-                 dict(param_name="memory-dynamic-min", value="4GiB"),
-                 dict(param_name="platform", key="exp-nested-hvm", value="true"), # FIXME < 8.3 host?
-                 dict(param_name="HVM-boot-params", key="firmware", value="uefi"),
-                 dict(param_name="HVM-boot-params", key="order", value="dc"),
-                 dict(param_name="platform", key="device-model", value="qemu-upstream-uefi"),
-             ),
-             vdis=[dict(name="vm 1 system disk", size="100GiB", device="xvda", userdevice="0")],
-             vifs=[dict(index=0, network_uuid="eabc1038-e40f-2ae5-0781-a3adbec1cae8")], # FIXME
-             ))
-    @pytest.mark.answerfile(
-        {
-            "base": "INSTALL",
-            "source": {"type": "local"},
-            "primary-disk": {"text": "nvme0n1"},
-        })
-    def test_install_uefi(self, request, iso_version, iso_remaster, create_vms):
+    @pytest.mark.vm_definitions(lambda firmware: dict(
+        name="vm 1",
+        template="Other install media",
+        params=(
+            # dict(param_name="", value=""),
+            dict(param_name="memory-static-max", value="4GiB"),
+            dict(param_name="memory-dynamic-max", value="4GiB"),
+            dict(param_name="memory-dynamic-min", value="4GiB"),
+            dict(param_name="platform", key="exp-nested-hvm", value="true"), # FIXME < 8.3 host?
+            dict(param_name="HVM-boot-params", key="order", value="dc"),
+        ) + {
+            "uefi": (
+                dict(param_name="HVM-boot-params", key="firmware", value="uefi"),
+                dict(param_name="platform", key="device-model", value="qemu-upstream-uefi"),
+            ),
+            "bios": (),
+        }[firmware],
+        vdis=[dict(name="vm 1 system disk", size="100GiB", device="xvda", userdevice="0")],
+        vifs=[dict(index=0, network_uuid="eabc1038-e40f-2ae5-0781-a3adbec1cae8")], # FIXME
+    ),
+                                param_mapping={"firmware": "firmware"})
+    @pytest.mark.answerfile(lambda firmware: {
+        "base": "INSTALL",
+        "source": {"type": "local"},
+        "primary-disk": {"text": {"uefi": "nvme0n1",
+                                  "bios": "sda"}[firmware]
+                         },
+    },
+                            param_mapping={"firmware": "firmware"})
+    def test_install(self, request, firmware, iso_version, iso_remaster, create_vms):
         assert len(create_vms) == 1
         host_vm = create_vms[0]
         # FIXME should be part of vm def
@@ -126,20 +134,22 @@ def test_install_uefi(self, request, iso_version, iso_remaster, create_vms):
 
 
     @pytest.mark.usefixtures("xcpng_chained")
+    # FIXME take "uefi" outa here and allow "bios"
     @pytest.mark.parametrize("mode", [
         "821.1",
         "821.1-821.1",
         "83b2",
         "821.1-83b2",
         #"83b2-83b2", # 8.3b2 disabled the upgrade from 8.3
     ])
+    @pytest.mark.parametrize("firmware", ("uefi", "bios"))
     @pytest.mark.continuation_of(
-        lambda params: [dict(vm="vm 1",
-                             test=(f"TestNested::test_upgrade_uefi[{params}]"
-                                   if "-" in params else
-                                   f"TestNested::test_install_uefi[{params}]"))],
-        param_mapping={"params": "mode"})
-    def test_firstboot_uefi(self, request, create_vms, mode):
+        lambda params, firmware: [dict(vm="vm 1",
+                                       test=(f"TestNested::test_upgrade[{firmware}-{params}]"
+                                             if "-" in params else
+                                             f"TestNested::test_install[{firmware}-{params}]"))],
+        param_mapping={"params": "mode", "firmware": "firmware"})
+    def test_firstboot(self, firmware, request, create_vms, mode):
         host_vm = create_vms[0]
         vif = host_vm.vifs()[0]
         mac_address = vif.param_get('MAC')
@@ -249,21 +259,24 @@ def test_firstboot_uefi(self, request, create_vms, mode):
         ("821.1", "83b2"),
         #("83b2", "83b2"), # 8.3b2 disabled the upgrade from 8.3
     ])
+    @pytest.mark.parametrize("firmware", ("uefi", "bios"))
     @pytest.mark.continuation_of(
-        lambda params: [dict(vm="vm 1",
-                             test=f"TestNested::test_firstboot_uefi[{params}]")],
-        param_mapping={"params": "orig_version"},
+        lambda firmware, params: [dict(vm="vm 1",
+                                       test=f"TestNested::test_firstboot[{firmware}-{params}]")],
+        param_mapping={"params": "orig_version", "firmware": "firmware"},
     )
-    @pytest.mark.answerfile(
-        {
-            "base": "UPGRADE",
-            "source": {"type": "local"},
-            "existing-installation": {"text": "nvme0n1"},
-        })
+    @pytest.mark.answerfile(lambda firmware: {
+        "base": "UPGRADE",
+        "source": {"type": "local"},
+        "existing-installation": {"text": {"uefi": "nvme0n1",
+                                           "bios": "sda"}[firmware]
+                                  },
+    },
+                            param_mapping={"firmware": "firmware"})
     @pytest.mark.installer_iso(lambda version: {"821.1": "xcpng-8.2.1-2023",
                                                 "83b2": "xcpng-8.3-beta2"}[version],
                                param_mapping={"version": "iso_version"})
-    def test_upgrade_uefi(self, request, orig_version, iso_version, iso_remaster, create_vms):
+    def test_upgrade(self, request, firmware, orig_version, iso_version, iso_remaster, create_vms):
         host_vm = create_vms[0]
         vif = host_vm.vifs()[0]
         mac_address = vif.param_get('MAC')