From 496390848dbb194d7de1435413834a057a766ed1 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Sat, 23 Nov 2024 13:15:12 -0500
Subject: [PATCH] incus: add lvm to storage test

---
 nixos/tests/incus/storage.nix | 94 +++++++++++++++++++++++------------
 1 file changed, 62 insertions(+), 32 deletions(-)

diff --git a/nixos/tests/incus/storage.nix b/nixos/tests/incus/storage.nix
index 05ea6ba996eb..2ca5dfcd0624 100644
--- a/nixos/tests/incus/storage.nix
+++ b/nixos/tests/incus/storage.nix
@@ -13,42 +13,72 @@ import ../make-test-python.nix (
       maintainers = lib.teams.lxc.members;
     };
 
-    nodes.machine =
-      { lib, ... }:
-      {
-        boot.supportedFilesystems = [ "zfs" ];
-        boot.zfs.forceImportRoot = false;
-        environment.systemPackages = [ pkgs.parted ];
-        networking.hostId = "01234567";
-        networking.nftables.enable = true;
+    nodes.machine = {
+      boot.supportedFilesystems = [ "zfs" ];
+      boot.zfs.forceImportRoot = false;
 
-        virtualisation = {
-          emptyDiskImages = [ 2048 ];
-          incus = {
-            enable = true;
-            package = incus;
-          };
-        };
+      environment.systemPackages = [ pkgs.parted ];
+
+      networking.hostId = "01234567";
+      networking.nftables.enable = true;
+
+      services.lvm = {
+        boot.thin.enable = true;
+        dmeventd.enable = true;
       };
 
-    testScript = ''
-      machine.wait_for_unit("incus.service")
+      virtualisation = {
+        emptyDiskImages = [
+          2048
+          2048
+        ];
+        incus = {
+          enable = true;
+          package = incus;
+        };
+      };
+    };
 
-      with subtest("Verify zfs pool created and usable"):
-        machine.succeed(
-            "zpool status",
-            "parted --script /dev/vdb mklabel gpt",
-            "zpool create zfs_pool /dev/vdb",
-        )
+    testScript = # python
+      ''
+        machine.wait_for_unit("incus.service")
 
-        machine.succeed("incus storage create zfs_pool zfs source=zfs_pool/incus")
-        machine.succeed("zfs list zfs_pool/incus")
-        machine.succeed("incus storage volume create zfs_pool test_fs --type filesystem")
-        machine.succeed("incus storage volume create zfs_pool test_vol --type block")
-        machine.succeed("incus storage show zfs_pool")
-        machine.succeed("incus storage volume list zfs_pool")
-        machine.succeed("incus storage volume show zfs_pool test_fs")
-        machine.succeed("incus storage volume show zfs_pool test_vol")
-    '';
+        with subtest("Verify zfs pool created and usable"):
+            machine.succeed(
+                "zpool status",
+                "parted --script /dev/vdb mklabel gpt",
+                "zpool create zfs_pool /dev/vdb",
+            )
+
+            machine.succeed("incus storage create zfs_pool zfs source=zfs_pool/incus")
+            machine.succeed("zfs list zfs_pool/incus")
+
+            machine.succeed("incus storage volume create zfs_pool test_fs --type filesystem")
+            machine.succeed("incus storage volume create zfs_pool test_vol --type block")
+
+            machine.succeed("incus storage show zfs_pool")
+            machine.succeed("incus storage volume list zfs_pool")
+            machine.succeed("incus storage volume show zfs_pool test_fs")
+            machine.succeed("incus storage volume show zfs_pool test_vol")
+
+            machine.succeed("incus create zfs1 --empty --storage zfs_pool")
+            machine.succeed("incus list zfs1")
+
+        with subtest("Verify lvm pool created and usable"):
+            machine.succeed("incus storage create lvm_pool lvm source=/dev/vdc lvm.vg_name=incus_pool")
+            machine.succeed("vgs incus_pool")
+
+            machine.succeed("incus storage volume create lvm_pool test_fs --type filesystem")
+            machine.succeed("incus storage volume create lvm_pool test_vol --type block")
+
+            machine.succeed("incus storage show lvm_pool")
+
+            machine.succeed("incus storage volume list lvm_pool")
+            machine.succeed("incus storage volume show lvm_pool test_fs")
+            machine.succeed("incus storage volume show lvm_pool test_vol")
+
+            machine.succeed("incus create lvm1 --empty --storage zfs_pool")
+            machine.succeed("incus list lvm1")
+      '';
   }
 )