install: add raid1/disk variants

Adds a new system_disk test parameter to distinguish raid1 setup from
(pre-existing) single-disk one.  Adds Alpine-specific setup for
tune_firstboot to manually assemble the RAID.

Signed-off-by: Yann Dirson <[email protected]>

Author: ydirson

lib/typing.py

@@ -31,6 +31,7 @@
     # No way to allow arbitrary fields in addition?  This conveys the
     # field's type, but allows them in places we wouldn't want them,
     # and forces every XML attribute we use to appear here.
+    'device': NotRequired[str],
     'guest-storage': NotRequired[str],
     'mode': NotRequired[str],
     'name': NotRequired[str],

tests/install/conftest.py

@@ -98,7 +98,15 @@ def installer_iso(request):
 @pytest.fixture(scope='function')
 def system_disks_names(request):
     firmware = request.getfixturevalue("firmware")
-    yield {"uefi": "nvme0n1", "bios": "sda"}[firmware]
+    system_disk_config = request.getfixturevalue("system_disk_config")
+    yield (
+        ({"uefi": "nvme0n1", "bios": "sda"}[firmware],)
+        + (
+            ({"uefi": "nvme0n2", "bios": "sdb"}[firmware],)
+            if system_disk_config == "raid1"
+            else ()
+        )
+    )
 
 # Remasters the ISO sepecified by `installer_iso` mark, with:
 # - network and ssh support activated, and .ssh/authorized_key so tests can

tests/install/test-sequences/inst+upg+rst.lst

@@ -1,2 +1,2 @@
-tests/install/test.py::TestNested::test_restore[uefi-83nightly-83nightly-83nightly-iso-ext]
-tests/install/test.py::TestNested::test_boot_rst[uefi-83nightly-83nightly-83nightly-iso-ext]
+tests/install/test.py::TestNested::test_restore[uefi-83nightly-83nightly-83nightly-disk-iso-ext]
+tests/install/test.py::TestNested::test_boot_rst[uefi-83nightly-83nightly-83nightly-disk-iso-ext]

tests/install/test-sequences/inst+upg.lst

@@ -1,2 +1,2 @@
-tests/install/test.py::TestNested::test_upgrade[uefi-83nightly-83nightly-host1-iso-ext]
-tests/install/test.py::TestNested::test_boot_upg[uefi-83nightly-83nightly-host1-iso-ext]
+tests/install/test.py::TestNested::test_upgrade[uefi-83nightly-83nightly-host1-disk-iso-ext]
+tests/install/test.py::TestNested::test_boot_upg[uefi-83nightly-83nightly-host1-disk-iso-ext]

tests/install/test-sequences/inst.lst

@@ -1,3 +1,3 @@
-tests/install/test.py::TestNested::test_install[uefi-83nightly-iso-ext]
-tests/install/test.py::TestNested::test_tune_firstboot[None-uefi-83nightly-host1-iso-ext]
-tests/install/test.py::TestNested::test_boot_inst[uefi-83nightly-host1-iso-ext]
+tests/install/test.py::TestNested::test_install[uefi-83nightly-disk-iso-ext]
+tests/install/test.py::TestNested::test_tune_firstboot[None-uefi-83nightly-host1-disk-iso-ext]
+tests/install/test.py::TestNested::test_boot_inst[uefi-83nightly-host1-disk-iso-ext]

tests/install/test.py

@@ -43,6 +43,7 @@ def helper_vm_with_plugged_disk(running_vm, create_vms):
 class TestNested:
     @pytest.mark.parametrize("local_sr", ("nosr", "ext", "lvm"))
     @pytest.mark.parametrize("package_source", ("iso", "net"))
+    @pytest.mark.parametrize("system_disk_config", ("disk", "raid1"))
     @pytest.mark.parametrize("iso_version", (
         "83nightly", "830net",
         "830",
@@ -54,7 +55,7 @@ class TestNested:
     ))
     @pytest.mark.parametrize("firmware", ("uefi", "bios"))
     @pytest.mark.vm_definitions(
-        lambda firmware: dict(
+        lambda firmware, system_disk_config: dict(
             name="vm1",
             template="Other install media",
             params=(
@@ -74,31 +75,47 @@ class TestNested:
                 ),
                 "bios": (),
             }[firmware],
-            vdis=[dict(name="vm1 system disk", size="100GiB", device="xvda", userdevice="0")],
+            vdis=([dict(name="vm1 system disk", size="100GiB", device="xvda", userdevice="0")]
+                  + ([dict(name="vm1 system disk mirror", size="100GiB", device="xvdb", userdevice="1")]
+                     if system_disk_config == "raid1" else [])
+                  ),
             cd_vbd=dict(device="xvdd", userdevice="3"),
             vifs=[dict(index=0, network_name=NETWORKS["MGMT"])],
         ))
     @pytest.mark.answerfile(
-        lambda system_disks_names, local_sr, package_source, iso_version: AnswerFile("INSTALL")
+        lambda system_disks_names, local_sr, package_source, system_disk_config, iso_version: AnswerFile("INSTALL")
         .top_setattr({} if local_sr == "nosr" else {"sr-type": local_sr})
         .top_append(
             {"TAG": "source", "type": "local"} if package_source == "iso"
             else {"TAG": "source", "type": "url",
                   "CONTENTS": ISO_IMAGES[iso_version]['net-url']} if package_source == "net"
             else ValueError(f"package_source {package_source!r}"),
+
+            {"TAG": "raid", "device": "md127",
+             "CONTENTS": [
+                 {"TAG": "disk", "CONTENTS": diskname} for diskname in system_disks_names
+             ]} if system_disk_config == "raid1"
+            else None if system_disk_config == "disk"
+            else ValueError(f"system_disk_config {system_disk_config!r}"),
+
             {"TAG": "admin-interface", "name": "eth0", "proto": "dhcp"},
             {"TAG": "primary-disk",
              "guest-storage": "no" if local_sr == "nosr" else "yes",
-             "CONTENTS": system_disks_names[0]},
+             "CONTENTS": ("md127" if system_disk_config == "raid1"
+                          else system_disks_names[0] if system_disk_config == "disk"
+                          else "should-not-happen"),
+             } if system_disk_config in ("disk", "raid1")
+            else ValueError(f"system_disk_config {system_disk_config!r}"),
         ))
     def test_install(self, vm_booted_with_installer, system_disks_names,
-                     firmware, iso_version, package_source, local_sr):
+                     firmware, iso_version, package_source, system_disk_config, local_sr):
         host_vm = vm_booted_with_installer
         installer.monitor_install(ip=host_vm.ip)
 
     @pytest.mark.usefixtures("xcpng_chained")
     @pytest.mark.parametrize("local_sr", ("nosr", "ext", "lvm"))
     @pytest.mark.parametrize("package_source", ("iso", "net"))
+    @pytest.mark.parametrize("system_disk_config", ("disk", "raid1"))
     @pytest.mark.parametrize("machine", ("host1", "host2"))
     @pytest.mark.parametrize("version", (
         "83nightly", "830net",
@@ -112,15 +129,24 @@ def test_install(self, vm_booted_with_installer, system_disks_names,
     ))
     @pytest.mark.parametrize("firmware", ("uefi", "bios"))
     @pytest.mark.continuation_of(
-        lambda version, firmware, local_sr, package_source: [dict(
+        lambda version, firmware, local_sr, package_source, system_disk_config: [dict(
             vm="vm1",
-            image_test=f"TestNested::test_install[{firmware}-{version}-{package_source}-{local_sr}]")])
-    @pytest.mark.small_vm
+            image_test=(f"TestNested::test_install[{firmware}-{version}-{system_disk_config}"
+                        f"-{package_source}-{local_sr}]"))])
     def test_tune_firstboot(self, create_vms, helper_vm_with_plugged_disk,
-                            firmware, version, machine, local_sr, package_source):
+                            firmware, version, machine, local_sr, package_source, system_disk_config):
         helper_vm = helper_vm_with_plugged_disk
 
-        helper_vm.ssh(["mount /dev/xvdb1 /mnt"])
+        if system_disk_config == "disk":
+            helper_vm.ssh(["mount /dev/xvdb1 /mnt"])
+        elif system_disk_config == "raid1":
+            # FIXME helper VM has to be an Alpine, that should not be a random vm_ref
+            helper_vm.ssh(["apk add mdadm"])
+            helper_vm.ssh(["mdadm -A /dev/md/127 -N localhost:127"])
+            helper_vm.ssh(["mount /dev/md127p1 /mnt"])
+        else:
+            raise ValueError(f"unhandled system_disk_config {system_disk_config!r}")
+
         try:
             # hostname
             logging.info("Setting hostname to %r", machine)
@@ -134,7 +160,7 @@ def test_tune_firstboot(self, create_vms, helper_vm_with_plugged_disk,
                  '/mnt/etc/xensource-inventory'])
             helper_vm.ssh(["grep UUID /mnt/etc/xensource-inventory"])
         finally:
-            helper_vm.ssh(["umount /dev/xvdb1"])
+            helper_vm.ssh(["umount /mnt"])
 
     def _test_firstboot(self, create_vms, mode, *, machine='DEFAULT', is_restore=False):
         host_vm = create_vms[0]
@@ -290,6 +316,7 @@ def _test_firstboot(self, create_vms, mode, *, machine='DEFAULT', is_restore=Fal
     @pytest.mark.usefixtures("xcpng_chained")
     @pytest.mark.parametrize("local_sr", ("nosr", "ext", "lvm"))
     @pytest.mark.parametrize("package_source", ("iso", "net"))
+    @pytest.mark.parametrize("system_disk_config", ("disk", "raid1"))
     @pytest.mark.parametrize("machine", ("host1", "host2"))
     @pytest.mark.parametrize("version", (
         "83nightly", "830net",
@@ -303,17 +330,19 @@ def _test_firstboot(self, create_vms, mode, *, machine='DEFAULT', is_restore=Fal
     ))
     @pytest.mark.parametrize("firmware", ("uefi", "bios"))
     @pytest.mark.continuation_of(
-        lambda firmware, version, machine, local_sr, package_source: [
+        lambda firmware, version, machine, local_sr, package_source, system_disk_config: [
             dict(vm="vm1",
                  image_test=("TestNested::test_tune_firstboot"
-                             f"[None-{firmware}-{version}-{machine}-{package_source}-{local_sr}]"))])
+                             f"[None-{firmware}-{version}-{machine}-{system_disk_config}"
+                             f"-{package_source}-{local_sr}]"))])
     def test_boot_inst(self, create_vms,
-                       firmware, version, machine, package_source, local_sr):
+                       firmware, version, machine, package_source, system_disk_config, local_sr):
         self._test_firstboot(create_vms, version, machine=machine)
 
     @pytest.mark.usefixtures("xcpng_chained")
     @pytest.mark.parametrize("local_sr", ("nosr", "ext", "lvm"))
     @pytest.mark.parametrize("package_source", ("iso", "net"))
+    @pytest.mark.parametrize("system_disk_config", ("disk", "raid1"))
     @pytest.mark.parametrize("machine", ("host1", "host2"))
     @pytest.mark.parametrize(("orig_version", "iso_version"), [
         ("83nightly", "83nightly"),
@@ -330,26 +359,33 @@ def test_boot_inst(self, create_vms,
     ])
     @pytest.mark.parametrize("firmware", ("uefi", "bios"))
     @pytest.mark.continuation_of(
-        lambda firmware, orig_version, machine, package_source, local_sr: [dict(
+        lambda firmware, orig_version, machine, system_disk_config, package_source, local_sr: [dict(
             vm="vm1",
-            image_test=f"TestNested::test_boot_inst[{firmware}-{orig_version}-{machine}-{package_source}-{local_sr}]")])
+            image_test=(f"TestNested::test_boot_inst[{firmware}-{orig_version}-{machine}-{system_disk_config}"
+                        f"-{package_source}-{local_sr}]"))])
     @pytest.mark.answerfile(
-        lambda system_disks_names, package_source, iso_version: AnswerFile("UPGRADE").top_append(
+        lambda system_disks_names, package_source, system_disk_config, iso_version: AnswerFile("UPGRADE").top_append(
             {"TAG": "source", "type": "local"} if package_source == "iso"
             else {"TAG": "source", "type": "url",
                   "CONTENTS": ISO_IMAGES[iso_version]['net-url']} if package_source == "net"
             else ValueError(f"package_source {package_source!r}"),
             {"TAG": "existing-installation",
-             "CONTENTS": system_disks_names[0]},
+             "CONTENTS": (system_disks_names[0] if system_disk_config == "disk"
+                          else "md127" if system_disk_config == "raid1"
+                          else "should-not-happen")}
+            if system_disk_config in ("disk", "raid1")
+            else ValueError(f"system_disk_config {system_disk_config!r}"),
         ))
     def test_upgrade(self, vm_booted_with_installer, system_disks_names,
-                     firmware, orig_version, iso_version, machine, package_source, local_sr):
+                     firmware, orig_version, iso_version, machine, package_source,
+                     system_disk_config, local_sr):
         host_vm = vm_booted_with_installer
         installer.monitor_upgrade(ip=host_vm.ip)
 
     @pytest.mark.usefixtures("xcpng_chained")
     @pytest.mark.parametrize("local_sr", ("nosr", "ext", "lvm"))
     @pytest.mark.parametrize("package_source", ("iso", "net"))
+    @pytest.mark.parametrize("system_disk_config", ("disk", "raid1"))
     @pytest.mark.parametrize("machine", ("host1", "host2"))
     @pytest.mark.parametrize("mode", (
         "83nightly-83nightly",
@@ -366,16 +402,18 @@ def test_upgrade(self, vm_booted_with_installer, system_disks_names,
     ))
     @pytest.mark.parametrize("firmware", ("uefi", "bios"))
     @pytest.mark.continuation_of(
-        lambda firmware, mode, machine, package_source, local_sr: [dict(
+        lambda firmware, mode, machine, system_disk_config, package_source, local_sr: [dict(
             vm="vm1",
-            image_test=(f"TestNested::test_upgrade[{firmware}-{mode}-{machine}-{package_source}-{local_sr}]"))])
+            image_test=(f"TestNested::test_upgrade[{firmware}-{mode}-{machine}-{system_disk_config}"
+                        f"-{package_source}-{local_sr}]"))])
     def test_boot_upg(self, create_vms,
-                      firmware, mode, machine, package_source, local_sr):
+                      firmware, mode, machine, package_source, system_disk_config, local_sr):
         self._test_firstboot(create_vms, mode, machine=machine)
 
     @pytest.mark.usefixtures("xcpng_chained")
     @pytest.mark.parametrize("local_sr", ("nosr", "ext", "lvm"))
     @pytest.mark.parametrize("package_source", ("iso", "net"))
+    @pytest.mark.parametrize("system_disk_config", ("disk", "raid1"))
     @pytest.mark.parametrize(("orig_version", "iso_version"), [
         ("83nightly-83nightly", "83nightly"),
         ("830-83nightly", "83nightly"),
@@ -391,22 +429,29 @@ def test_boot_upg(self, create_vms,
     ])
     @pytest.mark.parametrize("firmware", ("uefi", "bios"))
     @pytest.mark.continuation_of(
-        lambda firmware, orig_version, local_sr, package_source: [dict(
+        lambda firmware, orig_version, local_sr, system_disk_config, package_source: [dict(
             vm="vm1",
-            image_test=f"TestNested::test_boot_upg[{firmware}-{orig_version}-host1-{package_source}-{local_sr}]")])
+            image_test=(f"TestNested::test_boot_upg[{firmware}-{orig_version}-host1-{system_disk_config}"
+                        f"-{package_source}-{local_sr}]"))])
     @pytest.mark.answerfile(
-        lambda system_disks_names: AnswerFile("RESTORE").top_append(
+        lambda system_disks_names, system_disk_config: AnswerFile("RESTORE").top_append(
             {"TAG": "backup-disk",
-             "CONTENTS": system_disks_names[0]},
+             "CONTENTS": (system_disks_names[0] if system_disk_config == "disk"
+                          else "md127" if system_disk_config == "raid1"
+                          else "should-not-happen")}
+            if system_disk_config in ("disk", "raid1")
+            else ValueError(f"system_disk_config {system_disk_config!r}"),
         ))
     def test_restore(self, vm_booted_with_installer, system_disks_names,
-                     firmware, orig_version, iso_version, package_source, local_sr):
+                     firmware, orig_version, iso_version, package_source,
+                     system_disk_config, local_sr):
         host_vm = vm_booted_with_installer
         installer.monitor_restore(ip=host_vm.ip)
 
     @pytest.mark.usefixtures("xcpng_chained")
     @pytest.mark.parametrize("local_sr", ("nosr", "ext", "lvm"))
     @pytest.mark.parametrize("package_source", ("iso", "net"))
+    @pytest.mark.parametrize("system_disk_config", ("disk", "raid1"))
     @pytest.mark.parametrize("mode", (
         "83nightly-83nightly-83nightly",
         "830-83nightly-83nightly",
@@ -422,9 +467,10 @@ def test_restore(self, vm_booted_with_installer, system_disks_names,
     ))
     @pytest.mark.parametrize("firmware", ("uefi", "bios"))
     @pytest.mark.continuation_of(
-        lambda firmware, mode, package_source, local_sr: [dict(
+        lambda firmware, mode, system_disk_config, package_source, local_sr: [dict(
             vm="vm1",
-            image_test=(f"TestNested::test_restore[{firmware}-{mode}-{package_source}-{local_sr}]"))])
+            image_test=(f"TestNested::test_restore[{firmware}-{mode}-{system_disk_config}"
+                        f"-{package_source}-{local_sr}]"))])
     def test_boot_rst(self, create_vms,
-                      firmware, mode, package_source, local_sr):
+                      firmware, mode, package_source, system_disk_config, local_sr):
         self._test_firstboot(create_vms, mode, is_restore=True)