From 6281ee83054dd9b2a1ca95634784b25d2d03c67d Mon Sep 17 00:00:00 2001
From: Kiara Grouwstra <kiara@procolix.eu>
Date: Mon, 24 Nov 2025 18:10:39 +0100
Subject: [PATCH] update data model tests to account for changes

Signed-off-by: Kiara Grouwstra <kiara@procolix.eu>
---
 deployment/check/data-model-basic/nixosTest.nix           | 8 ++++----
 deployment/check/data-model-nixops4/data-model.nix        | 4 ++--
 deployment/check/data-model-nixops4/flake-under-test.nix  | 2 +-
 deployment/check/data-model-ssh/data-model.nix            | 6 +++---
 .../check/data-model-tf-proxmox/setups/template.nix       | 6 +++---
 deployment/check/data-model-tf-proxmox/setups/vm.nix      | 6 +++---
 deployment/check/data-model-tf/data-model.nix             | 6 +++---
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/deployment/check/data-model-basic/nixosTest.nix b/deployment/check/data-model-basic/nixosTest.nix
index da249ef6..00689883 100644
--- a/deployment/check/data-model-basic/nixosTest.nix
+++ b/deployment/check/data-model-basic/nixosTest.nix
@@ -19,13 +19,13 @@ in
         imports = [ ../common/model.nix ];
         options = {
           default = mkOption {
-            type = config.deployment-type;
+            type = config.env-output;
             default = config.environments.default.deployment {
               configuration = config."example-configuration";
             };
           };
           deploy = mkOption {
-            default = config.default.ssh-host.run;
+            default = config.default.deployments.nixos-configuration;
           };
         };
         config = {
@@ -34,7 +34,7 @@ in
             implementation =
               { required-resources, ... }:
               {
-                nixos-configuration = {
+                deployments.nixos-configuration = {
                   imports = [
                     (mkNixosConfiguration environment required-resources)
                     "${modulesPath}/../lib/testing/nixos-test-base.nix"
@@ -44,7 +44,7 @@ in
           };
         };
       }
-    )).default.nixos-configuration;
+    )).deploy;
 
   extraTestScript = ''
     with subtest("Check the data model"):
diff --git a/deployment/check/data-model-nixops4/data-model.nix b/deployment/check/data-model-nixops4/data-model.nix
index 0778ed7a..aad60ee9 100644
--- a/deployment/check/data-model-nixops4/data-model.nix
+++ b/deployment/check/data-model-nixops4/data-model.nix
@@ -30,7 +30,7 @@ in
             ...
           }:
           {
-            nixops4 =
+            deployments.nixops4 =
               { providers, ... }:
               {
                 providers = {
@@ -56,7 +56,7 @@ in
       };
     };
     options.default = lib.mkOption {
-      type = config.deployment-type;
+      type = config.env-output;
       default = config.environments.default.deployment {
         configuration = config."example-configuration";
       };
diff --git a/deployment/check/data-model-nixops4/flake-under-test.nix b/deployment/check/data-model-nixops4/flake-under-test.nix
index 38bbd0a9..0076f2ba 100644
--- a/deployment/check/data-model-nixops4/flake-under-test.nix
+++ b/deployment/check/data-model-nixops4/flake-under-test.nix
@@ -23,7 +23,7 @@
               inherit (import ./deployment/check/data-model-nixops4/constants.nix) pathToRoot pathFromRoot;
               nodeName = "nixops4";
             };
-          }).default.nixops4;
+          }).default.deployments.nixops4;
       }
     );
 }
diff --git a/deployment/check/data-model-ssh/data-model.nix b/deployment/check/data-model-ssh/data-model.nix
index 64fc5ebc..e19aa41d 100644
--- a/deployment/check/data-model-ssh/data-model.nix
+++ b/deployment/check/data-model-ssh/data-model.nix
@@ -32,7 +32,7 @@ in
             ...
           }:
           {
-            ssh-host = {
+            deployments.ssh-host = {
               nixos-configuration = {
                 imports = [
                   (mkNixosConfiguration environment required-resources)
@@ -55,13 +55,13 @@ in
     };
     options = {
       default = mkOption {
-        type = config.deployment-type;
+        type = config.env-output;
         default = config.environments.default.deployment {
           configuration = config."example-configuration";
         };
       };
       deploy = mkOption {
-        default = config.default.ssh-host.run;
+        default = config.default.deployments.ssh-host.run;
       };
     };
   }
diff --git a/deployment/check/data-model-tf-proxmox/setups/template.nix b/deployment/check/data-model-tf-proxmox/setups/template.nix
index 5ca78d4c..e3b8d1e9 100644
--- a/deployment/check/data-model-tf-proxmox/setups/template.nix
+++ b/deployment/check/data-model-tf-proxmox/setups/template.nix
@@ -35,7 +35,7 @@ in
             ...
           }:
           {
-            tf-proxmox-template = {
+            deployments.tf-proxmox-template = {
               nixos-configuration = {
                 imports = [
                   (mkNixosConfiguration environment required-resources)
@@ -57,14 +57,14 @@ in
     };
     options = {
       default = mkOption {
-        type = config.deployment-type;
+        type = config.env-output;
         default = config.environments.default.deployment {
           # normally our template is distinct, but our test cannot download build deps due to sandboxing
           configuration = config."example-configuration";
         };
       };
       deploy = mkOption {
-        default = config.default.tf-proxmox-template.run;
+        default = config.default.deployments.tf-proxmox-template.run;
       };
     };
   }
diff --git a/deployment/check/data-model-tf-proxmox/setups/vm.nix b/deployment/check/data-model-tf-proxmox/setups/vm.nix
index 4984457b..18fa458c 100644
--- a/deployment/check/data-model-tf-proxmox/setups/vm.nix
+++ b/deployment/check/data-model-tf-proxmox/setups/vm.nix
@@ -47,7 +47,7 @@ in
             deployment-name,
           }:
           {
-            tf-proxmox-vm = {
+            deployments.tf-proxmox-vm = {
               nixos-configuration = {
                 imports = [
                   (mkNixosConfiguration environment required-resources)
@@ -84,13 +84,13 @@ in
     };
     options = {
       default = mkOption {
-        type = config.deployment-type;
+        type = config.env-output;
         default = config.environments.default.deployment {
           configuration = config."example-configuration";
         };
       };
       deploy = mkOption {
-        default = config.default.tf-proxmox-vm.run;
+        default = config.default.deployments.tf-proxmox-vm.run;
       };
     };
   }
diff --git a/deployment/check/data-model-tf/data-model.nix b/deployment/check/data-model-tf/data-model.nix
index 1ba49faf..226375ba 100644
--- a/deployment/check/data-model-tf/data-model.nix
+++ b/deployment/check/data-model-tf/data-model.nix
@@ -32,7 +32,7 @@ in
             deployment-name,
           }:
           {
-            tf-host = {
+            deployments.tf-host = {
               nixos-configuration = {
                 imports = [
                   (mkNixosConfiguration environment required-resources)
@@ -55,13 +55,13 @@ in
     };
     options = {
       default = mkOption {
-        type = config.deployment-type;
+        type = config.env-output;
         default = config.environments.default.deployment {
           configuration = config."example-configuration";
         };
       };
       deploy = mkOption {
-        default = config.default.tf-host.run;
+        default = config.default.deployments.tf-host.run;
       };
     };
   }