From 6b7530f27d3b5e0d1b6f00b0d9fe42ffad738eee Mon Sep 17 00:00:00 2001 From: DavHau Date: Tue, 14 Oct 2025 14:42:54 +0700 Subject: [PATCH] wireguard/test: move test to service directory --- checks/flake-module.nix | 1 - checks/wireguard/default.nix | 115 ------------------ clanServices/wireguard/flake-module.nix | 8 ++ clanServices/wireguard/tests/vm/default.nix | 102 ++++++++++++++++ .../vm}/sops/machines/controller1/key.json | 0 .../vm}/sops/machines/controller2/key.json | 0 .../tests/vm}/sops/machines/peer1/key.json | 0 .../tests/vm}/sops/machines/peer2/key.json | 0 .../tests/vm}/sops/machines/peer3/key.json | 0 .../sops/secrets/controller1-age.key/secret | 0 .../secrets/controller1-age.key/users/admin | 0 .../sops/secrets/controller2-age.key/secret | 0 .../secrets/controller2-age.key/users/admin | 0 .../vm}/sops/secrets/peer1-age.key/secret | 0 .../sops/secrets/peer1-age.key/users/admin | 0 .../vm}/sops/secrets/peer2-age.key/secret | 0 .../sops/secrets/peer2-age.key/users/admin | 0 .../vm}/sops/secrets/peer3-age.key/secret | 0 .../sops/secrets/peer3-age.key/users/admin | 0 .../tests/vm}/sops/users/admin/key.json | 0 .../privatekey/machines/controller1 | 0 .../privatekey/secret | 0 .../privatekey/users/admin | 0 .../publickey/value | 0 .../.validation-hash | 0 .../prefix/value | 0 .../privatekey/machines/controller2 | 0 .../privatekey/secret | 0 .../privatekey/users/admin | 0 .../publickey/value | 0 .../.validation-hash | 0 .../prefix/value | 0 .../privatekey/machines/peer1 | 0 .../privatekey/secret | 0 .../privatekey/users/admin | 0 .../publickey/value | 0 .../.validation-hash | 0 .../suffix/value | 0 .../privatekey/machines/peer2 | 0 .../privatekey/secret | 0 .../privatekey/users/admin | 0 .../publickey/value | 0 .../.validation-hash | 0 .../suffix/value | 0 .../privatekey/machines/peer3 | 0 .../privatekey/secret | 0 .../privatekey/users/admin | 0 .../publickey/value | 0 .../.validation-hash | 0 .../suffix/value | 0 50 files changed, 110 insertions(+), 116 deletions(-) delete mode 100644 checks/wireguard/default.nix create mode 100644 clanServices/wireguard/tests/vm/default.nix rename {checks/wireguard => clanServices/wireguard/tests/vm}/sops/machines/controller1/key.json (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/sops/machines/controller2/key.json (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/sops/machines/peer1/key.json (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/sops/machines/peer2/key.json (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/sops/machines/peer3/key.json (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/sops/secrets/controller1-age.key/secret (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/sops/secrets/controller1-age.key/users/admin (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/sops/secrets/controller2-age.key/secret (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/sops/secrets/controller2-age.key/users/admin (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/sops/secrets/peer1-age.key/secret (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/sops/secrets/peer1-age.key/users/admin (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/sops/secrets/peer2-age.key/secret (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/sops/secrets/peer2-age.key/users/admin (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/sops/secrets/peer3-age.key/secret (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/sops/secrets/peer3-age.key/users/admin (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/sops/users/admin/key.json (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/vars/per-machine/controller1/wireguard-keys-wg-test-one/privatekey/machines/controller1 (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/vars/per-machine/controller1/wireguard-keys-wg-test-one/privatekey/secret (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/vars/per-machine/controller1/wireguard-keys-wg-test-one/privatekey/users/admin (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/vars/per-machine/controller1/wireguard-keys-wg-test-one/publickey/value (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/vars/per-machine/controller1/wireguard-network-wg-test-one/.validation-hash (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/vars/per-machine/controller1/wireguard-network-wg-test-one/prefix/value (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/vars/per-machine/controller2/wireguard-keys-wg-test-one/privatekey/machines/controller2 (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/vars/per-machine/controller2/wireguard-keys-wg-test-one/privatekey/secret (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/vars/per-machine/controller2/wireguard-keys-wg-test-one/privatekey/users/admin (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/vars/per-machine/controller2/wireguard-keys-wg-test-one/publickey/value (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/vars/per-machine/controller2/wireguard-network-wg-test-one/.validation-hash (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/vars/per-machine/controller2/wireguard-network-wg-test-one/prefix/value (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/vars/per-machine/peer1/wireguard-keys-wg-test-one/privatekey/machines/peer1 (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/vars/per-machine/peer1/wireguard-keys-wg-test-one/privatekey/secret (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/vars/per-machine/peer1/wireguard-keys-wg-test-one/privatekey/users/admin (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/vars/per-machine/peer1/wireguard-keys-wg-test-one/publickey/value (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/vars/per-machine/peer1/wireguard-network-wg-test-one/.validation-hash (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/vars/per-machine/peer1/wireguard-network-wg-test-one/suffix/value (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/vars/per-machine/peer2/wireguard-keys-wg-test-one/privatekey/machines/peer2 (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/vars/per-machine/peer2/wireguard-keys-wg-test-one/privatekey/secret (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/vars/per-machine/peer2/wireguard-keys-wg-test-one/privatekey/users/admin (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/vars/per-machine/peer2/wireguard-keys-wg-test-one/publickey/value (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/vars/per-machine/peer2/wireguard-network-wg-test-one/.validation-hash (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/vars/per-machine/peer2/wireguard-network-wg-test-one/suffix/value (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/vars/per-machine/peer3/wireguard-keys-wg-test-one/privatekey/machines/peer3 (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/vars/per-machine/peer3/wireguard-keys-wg-test-one/privatekey/secret (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/vars/per-machine/peer3/wireguard-keys-wg-test-one/privatekey/users/admin (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/vars/per-machine/peer3/wireguard-keys-wg-test-one/publickey/value (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/vars/per-machine/peer3/wireguard-network-wg-test-one/.validation-hash (100%) rename {checks/wireguard => clanServices/wireguard/tests/vm}/vars/per-machine/peer3/wireguard-network-wg-test-one/suffix/value (100%) diff --git a/checks/flake-module.nix b/checks/flake-module.nix index 5c895c856..1fe9f1a0b 100644 --- a/checks/flake-module.nix +++ b/checks/flake-module.nix @@ -90,7 +90,6 @@ in nixos-test-user-firewall-nftables = self.clanLib.test.containerTest ./user-firewall/nftables.nix nixosTestArgs; service-dummy-test = import ./service-dummy-test nixosTestArgs; - wireguard = import ./wireguard nixosTestArgs; service-dummy-test-from-flake = import ./service-dummy-test-from-flake nixosTestArgs; }; diff --git a/checks/wireguard/default.nix b/checks/wireguard/default.nix deleted file mode 100644 index bc01cab62..000000000 --- a/checks/wireguard/default.nix +++ /dev/null @@ -1,115 +0,0 @@ -{ - pkgs, - nixosLib, - clan-core, - lib, - ... -}: -nixosLib.runTest ( - { ... }: - - let - machines = [ - "controller1" - "controller2" - "peer1" - "peer2" - "peer3" - ]; - in - { - imports = [ - clan-core.modules.nixosTest.clanTest - ]; - - hostPkgs = pkgs; - - name = "wireguard"; - - clan = { - directory = ./.; - modules."@clan/wireguard" = import ../../clanServices/wireguard/default.nix; - inventory = { - - machines = lib.genAttrs machines (_: { }); - - instances = { - - /* - wg-test-one - ┌───────────────────────────────┐ - │ ◄───────────── │ - │ controller2 controller1 - │ ▲ ─────────────► ▲ ▲ - │ │ │ │ │ │ │ │ │ - │ │ │ │ │ │ │ │ │ - │ │ │ │ │ │ │ │ │ - │ │ │ │ └───────────────┐ │ │ │ │ - │ │ │ └──────────────┐ │ │ │ │ │ - │ ▼ │ ▼ ▼ ▼ - └─► peer2 │ peer1 peer3 - │ ▲ - └──────────┘ - */ - - wg-test-one = { - - module.name = "@clan/wireguard"; - module.input = "self"; - - roles.controller.machines."controller1".settings = { - endpoint = "192.168.1.1"; - }; - - roles.controller.machines."controller2".settings = { - endpoint = "192.168.1.2"; - }; - - roles.peer.machines = { - peer1.settings.controller = "controller1"; - peer2.settings.controller = "controller2"; - peer3.settings.controller = "controller1"; - }; - }; - - # TODO: Will this actually work with conflicting ports? Can we re-use interfaces? - #wg-test-two = { - # module.name = "@clan/wireguard"; - - # roles.controller.machines."controller1".settings = { - # endpoint = "192.168.1.1"; - # port = 51922; - # }; - - # roles.peer.machines = { - # peer1 = { }; - # }; - #}; - }; - }; - }; - - testScript = '' - start_all() - - # Show all addresses - machines = [peer1, peer2, peer3, controller1, controller2] - for m in machines: - m.systemctl("start network-online.target") - - for m in machines: - m.wait_for_unit("network-online.target") - m.wait_for_unit("systemd-networkd.service") - - print("\n\n" + "="*60) - print("STARTING PING TESTS") - print("="*60) - - for m1 in machines: - for m2 in machines: - if m1 != m2: - print(f"\n--- Pinging from {m1.name} to {m2.name}.wg-test-one ---") - m1.wait_until_succeeds(f"ping -c1 {m2.name}.wg-test-one >&2") - ''; - } -) diff --git a/clanServices/wireguard/flake-module.nix b/clanServices/wireguard/flake-module.nix index 8da6931a0..12d4ee6df 100644 --- a/clanServices/wireguard/flake-module.nix +++ b/clanServices/wireguard/flake-module.nix @@ -4,4 +4,12 @@ let in { clan.modules.wireguard = module; + perSystem = + { ... }: + { + clan.nixosTests.service-wireguard = { + imports = [ ./tests/vm/default.nix ]; + clan.modules."@clan/wireguard" = module; + }; + }; } diff --git a/clanServices/wireguard/tests/vm/default.nix b/clanServices/wireguard/tests/vm/default.nix new file mode 100644 index 000000000..a971c4644 --- /dev/null +++ b/clanServices/wireguard/tests/vm/default.nix @@ -0,0 +1,102 @@ +{ + lib, + ... +}: + +let + machines = [ + "controller1" + "controller2" + "peer1" + "peer2" + "peer3" + ]; +in +{ + name = "service-wireguard"; + + clan = { + directory = ./.; + inventory = { + + machines = lib.genAttrs machines (_: { }); + + instances = { + + /* + wg-test-one + ┌───────────────────────────────┐ + │ ◄───────────── │ + │ controller2 controller1 + │ ▲ ─────────────► ▲ ▲ + │ │ │ │ │ │ │ │ │ + │ │ │ │ │ │ │ │ │ + │ │ │ │ │ │ │ │ │ + │ │ │ │ └───────────────┐ │ │ │ │ + │ │ │ └──────────────┐ │ │ │ │ │ + │ ▼ │ ▼ ▼ ▼ + └─► peer2 │ peer1 peer3 + │ ▲ + └──────────┘ + */ + + wg-test-one = { + + module.name = "@clan/wireguard"; + module.input = "self"; + + roles.controller.machines."controller1".settings = { + endpoint = "192.168.1.1"; + }; + + roles.controller.machines."controller2".settings = { + endpoint = "192.168.1.2"; + }; + + roles.peer.machines = { + peer1.settings.controller = "controller1"; + peer2.settings.controller = "controller2"; + peer3.settings.controller = "controller1"; + }; + }; + + # TODO: Will this actually work with conflicting ports? Can we re-use interfaces? + #wg-test-two = { + # module.name = "@clan/wireguard"; + + # roles.controller.machines."controller1".settings = { + # endpoint = "192.168.1.1"; + # port = 51922; + # }; + + # roles.peer.machines = { + # peer1 = { }; + # }; + #}; + }; + }; + }; + + testScript = '' + start_all() + + # Show all addresses + machines = [peer1, peer2, peer3, controller1, controller2] + for m in machines: + m.systemctl("start network-online.target") + + for m in machines: + m.wait_for_unit("network-online.target") + m.wait_for_unit("systemd-networkd.service") + + print("\n\n" + "="*60) + print("STARTING PING TESTS") + print("="*60) + + for m1 in machines: + for m2 in machines: + if m1 != m2: + print(f"\n--- Pinging from {m1.name} to {m2.name}.wg-test-one ---") + m1.wait_until_succeeds(f"ping -c1 {m2.name}.wg-test-one >&2") + ''; +} diff --git a/checks/wireguard/sops/machines/controller1/key.json b/clanServices/wireguard/tests/vm/sops/machines/controller1/key.json similarity index 100% rename from checks/wireguard/sops/machines/controller1/key.json rename to clanServices/wireguard/tests/vm/sops/machines/controller1/key.json diff --git a/checks/wireguard/sops/machines/controller2/key.json b/clanServices/wireguard/tests/vm/sops/machines/controller2/key.json similarity index 100% rename from checks/wireguard/sops/machines/controller2/key.json rename to clanServices/wireguard/tests/vm/sops/machines/controller2/key.json diff --git a/checks/wireguard/sops/machines/peer1/key.json b/clanServices/wireguard/tests/vm/sops/machines/peer1/key.json similarity index 100% rename from checks/wireguard/sops/machines/peer1/key.json rename to clanServices/wireguard/tests/vm/sops/machines/peer1/key.json diff --git a/checks/wireguard/sops/machines/peer2/key.json b/clanServices/wireguard/tests/vm/sops/machines/peer2/key.json similarity index 100% rename from checks/wireguard/sops/machines/peer2/key.json rename to clanServices/wireguard/tests/vm/sops/machines/peer2/key.json diff --git a/checks/wireguard/sops/machines/peer3/key.json b/clanServices/wireguard/tests/vm/sops/machines/peer3/key.json similarity index 100% rename from checks/wireguard/sops/machines/peer3/key.json rename to clanServices/wireguard/tests/vm/sops/machines/peer3/key.json diff --git a/checks/wireguard/sops/secrets/controller1-age.key/secret b/clanServices/wireguard/tests/vm/sops/secrets/controller1-age.key/secret similarity index 100% rename from checks/wireguard/sops/secrets/controller1-age.key/secret rename to clanServices/wireguard/tests/vm/sops/secrets/controller1-age.key/secret diff --git a/checks/wireguard/sops/secrets/controller1-age.key/users/admin b/clanServices/wireguard/tests/vm/sops/secrets/controller1-age.key/users/admin similarity index 100% rename from checks/wireguard/sops/secrets/controller1-age.key/users/admin rename to clanServices/wireguard/tests/vm/sops/secrets/controller1-age.key/users/admin diff --git a/checks/wireguard/sops/secrets/controller2-age.key/secret b/clanServices/wireguard/tests/vm/sops/secrets/controller2-age.key/secret similarity index 100% rename from checks/wireguard/sops/secrets/controller2-age.key/secret rename to clanServices/wireguard/tests/vm/sops/secrets/controller2-age.key/secret diff --git a/checks/wireguard/sops/secrets/controller2-age.key/users/admin b/clanServices/wireguard/tests/vm/sops/secrets/controller2-age.key/users/admin similarity index 100% rename from checks/wireguard/sops/secrets/controller2-age.key/users/admin rename to clanServices/wireguard/tests/vm/sops/secrets/controller2-age.key/users/admin diff --git a/checks/wireguard/sops/secrets/peer1-age.key/secret b/clanServices/wireguard/tests/vm/sops/secrets/peer1-age.key/secret similarity index 100% rename from checks/wireguard/sops/secrets/peer1-age.key/secret rename to clanServices/wireguard/tests/vm/sops/secrets/peer1-age.key/secret diff --git a/checks/wireguard/sops/secrets/peer1-age.key/users/admin b/clanServices/wireguard/tests/vm/sops/secrets/peer1-age.key/users/admin similarity index 100% rename from checks/wireguard/sops/secrets/peer1-age.key/users/admin rename to clanServices/wireguard/tests/vm/sops/secrets/peer1-age.key/users/admin diff --git a/checks/wireguard/sops/secrets/peer2-age.key/secret b/clanServices/wireguard/tests/vm/sops/secrets/peer2-age.key/secret similarity index 100% rename from checks/wireguard/sops/secrets/peer2-age.key/secret rename to clanServices/wireguard/tests/vm/sops/secrets/peer2-age.key/secret diff --git a/checks/wireguard/sops/secrets/peer2-age.key/users/admin b/clanServices/wireguard/tests/vm/sops/secrets/peer2-age.key/users/admin similarity index 100% rename from checks/wireguard/sops/secrets/peer2-age.key/users/admin rename to clanServices/wireguard/tests/vm/sops/secrets/peer2-age.key/users/admin diff --git a/checks/wireguard/sops/secrets/peer3-age.key/secret b/clanServices/wireguard/tests/vm/sops/secrets/peer3-age.key/secret similarity index 100% rename from checks/wireguard/sops/secrets/peer3-age.key/secret rename to clanServices/wireguard/tests/vm/sops/secrets/peer3-age.key/secret diff --git a/checks/wireguard/sops/secrets/peer3-age.key/users/admin b/clanServices/wireguard/tests/vm/sops/secrets/peer3-age.key/users/admin similarity index 100% rename from checks/wireguard/sops/secrets/peer3-age.key/users/admin rename to clanServices/wireguard/tests/vm/sops/secrets/peer3-age.key/users/admin diff --git a/checks/wireguard/sops/users/admin/key.json b/clanServices/wireguard/tests/vm/sops/users/admin/key.json similarity index 100% rename from checks/wireguard/sops/users/admin/key.json rename to clanServices/wireguard/tests/vm/sops/users/admin/key.json diff --git a/checks/wireguard/vars/per-machine/controller1/wireguard-keys-wg-test-one/privatekey/machines/controller1 b/clanServices/wireguard/tests/vm/vars/per-machine/controller1/wireguard-keys-wg-test-one/privatekey/machines/controller1 similarity index 100% rename from checks/wireguard/vars/per-machine/controller1/wireguard-keys-wg-test-one/privatekey/machines/controller1 rename to clanServices/wireguard/tests/vm/vars/per-machine/controller1/wireguard-keys-wg-test-one/privatekey/machines/controller1 diff --git a/checks/wireguard/vars/per-machine/controller1/wireguard-keys-wg-test-one/privatekey/secret b/clanServices/wireguard/tests/vm/vars/per-machine/controller1/wireguard-keys-wg-test-one/privatekey/secret similarity index 100% rename from checks/wireguard/vars/per-machine/controller1/wireguard-keys-wg-test-one/privatekey/secret rename to clanServices/wireguard/tests/vm/vars/per-machine/controller1/wireguard-keys-wg-test-one/privatekey/secret diff --git a/checks/wireguard/vars/per-machine/controller1/wireguard-keys-wg-test-one/privatekey/users/admin b/clanServices/wireguard/tests/vm/vars/per-machine/controller1/wireguard-keys-wg-test-one/privatekey/users/admin similarity index 100% rename from checks/wireguard/vars/per-machine/controller1/wireguard-keys-wg-test-one/privatekey/users/admin rename to clanServices/wireguard/tests/vm/vars/per-machine/controller1/wireguard-keys-wg-test-one/privatekey/users/admin diff --git a/checks/wireguard/vars/per-machine/controller1/wireguard-keys-wg-test-one/publickey/value b/clanServices/wireguard/tests/vm/vars/per-machine/controller1/wireguard-keys-wg-test-one/publickey/value similarity index 100% rename from checks/wireguard/vars/per-machine/controller1/wireguard-keys-wg-test-one/publickey/value rename to clanServices/wireguard/tests/vm/vars/per-machine/controller1/wireguard-keys-wg-test-one/publickey/value diff --git a/checks/wireguard/vars/per-machine/controller1/wireguard-network-wg-test-one/.validation-hash b/clanServices/wireguard/tests/vm/vars/per-machine/controller1/wireguard-network-wg-test-one/.validation-hash similarity index 100% rename from checks/wireguard/vars/per-machine/controller1/wireguard-network-wg-test-one/.validation-hash rename to clanServices/wireguard/tests/vm/vars/per-machine/controller1/wireguard-network-wg-test-one/.validation-hash diff --git a/checks/wireguard/vars/per-machine/controller1/wireguard-network-wg-test-one/prefix/value b/clanServices/wireguard/tests/vm/vars/per-machine/controller1/wireguard-network-wg-test-one/prefix/value similarity index 100% rename from checks/wireguard/vars/per-machine/controller1/wireguard-network-wg-test-one/prefix/value rename to clanServices/wireguard/tests/vm/vars/per-machine/controller1/wireguard-network-wg-test-one/prefix/value diff --git a/checks/wireguard/vars/per-machine/controller2/wireguard-keys-wg-test-one/privatekey/machines/controller2 b/clanServices/wireguard/tests/vm/vars/per-machine/controller2/wireguard-keys-wg-test-one/privatekey/machines/controller2 similarity index 100% rename from checks/wireguard/vars/per-machine/controller2/wireguard-keys-wg-test-one/privatekey/machines/controller2 rename to clanServices/wireguard/tests/vm/vars/per-machine/controller2/wireguard-keys-wg-test-one/privatekey/machines/controller2 diff --git a/checks/wireguard/vars/per-machine/controller2/wireguard-keys-wg-test-one/privatekey/secret b/clanServices/wireguard/tests/vm/vars/per-machine/controller2/wireguard-keys-wg-test-one/privatekey/secret similarity index 100% rename from checks/wireguard/vars/per-machine/controller2/wireguard-keys-wg-test-one/privatekey/secret rename to clanServices/wireguard/tests/vm/vars/per-machine/controller2/wireguard-keys-wg-test-one/privatekey/secret diff --git a/checks/wireguard/vars/per-machine/controller2/wireguard-keys-wg-test-one/privatekey/users/admin b/clanServices/wireguard/tests/vm/vars/per-machine/controller2/wireguard-keys-wg-test-one/privatekey/users/admin similarity index 100% rename from checks/wireguard/vars/per-machine/controller2/wireguard-keys-wg-test-one/privatekey/users/admin rename to clanServices/wireguard/tests/vm/vars/per-machine/controller2/wireguard-keys-wg-test-one/privatekey/users/admin diff --git a/checks/wireguard/vars/per-machine/controller2/wireguard-keys-wg-test-one/publickey/value b/clanServices/wireguard/tests/vm/vars/per-machine/controller2/wireguard-keys-wg-test-one/publickey/value similarity index 100% rename from checks/wireguard/vars/per-machine/controller2/wireguard-keys-wg-test-one/publickey/value rename to clanServices/wireguard/tests/vm/vars/per-machine/controller2/wireguard-keys-wg-test-one/publickey/value diff --git a/checks/wireguard/vars/per-machine/controller2/wireguard-network-wg-test-one/.validation-hash b/clanServices/wireguard/tests/vm/vars/per-machine/controller2/wireguard-network-wg-test-one/.validation-hash similarity index 100% rename from checks/wireguard/vars/per-machine/controller2/wireguard-network-wg-test-one/.validation-hash rename to clanServices/wireguard/tests/vm/vars/per-machine/controller2/wireguard-network-wg-test-one/.validation-hash diff --git a/checks/wireguard/vars/per-machine/controller2/wireguard-network-wg-test-one/prefix/value b/clanServices/wireguard/tests/vm/vars/per-machine/controller2/wireguard-network-wg-test-one/prefix/value similarity index 100% rename from checks/wireguard/vars/per-machine/controller2/wireguard-network-wg-test-one/prefix/value rename to clanServices/wireguard/tests/vm/vars/per-machine/controller2/wireguard-network-wg-test-one/prefix/value diff --git a/checks/wireguard/vars/per-machine/peer1/wireguard-keys-wg-test-one/privatekey/machines/peer1 b/clanServices/wireguard/tests/vm/vars/per-machine/peer1/wireguard-keys-wg-test-one/privatekey/machines/peer1 similarity index 100% rename from checks/wireguard/vars/per-machine/peer1/wireguard-keys-wg-test-one/privatekey/machines/peer1 rename to clanServices/wireguard/tests/vm/vars/per-machine/peer1/wireguard-keys-wg-test-one/privatekey/machines/peer1 diff --git a/checks/wireguard/vars/per-machine/peer1/wireguard-keys-wg-test-one/privatekey/secret b/clanServices/wireguard/tests/vm/vars/per-machine/peer1/wireguard-keys-wg-test-one/privatekey/secret similarity index 100% rename from checks/wireguard/vars/per-machine/peer1/wireguard-keys-wg-test-one/privatekey/secret rename to clanServices/wireguard/tests/vm/vars/per-machine/peer1/wireguard-keys-wg-test-one/privatekey/secret diff --git a/checks/wireguard/vars/per-machine/peer1/wireguard-keys-wg-test-one/privatekey/users/admin b/clanServices/wireguard/tests/vm/vars/per-machine/peer1/wireguard-keys-wg-test-one/privatekey/users/admin similarity index 100% rename from checks/wireguard/vars/per-machine/peer1/wireguard-keys-wg-test-one/privatekey/users/admin rename to clanServices/wireguard/tests/vm/vars/per-machine/peer1/wireguard-keys-wg-test-one/privatekey/users/admin diff --git a/checks/wireguard/vars/per-machine/peer1/wireguard-keys-wg-test-one/publickey/value b/clanServices/wireguard/tests/vm/vars/per-machine/peer1/wireguard-keys-wg-test-one/publickey/value similarity index 100% rename from checks/wireguard/vars/per-machine/peer1/wireguard-keys-wg-test-one/publickey/value rename to clanServices/wireguard/tests/vm/vars/per-machine/peer1/wireguard-keys-wg-test-one/publickey/value diff --git a/checks/wireguard/vars/per-machine/peer1/wireguard-network-wg-test-one/.validation-hash b/clanServices/wireguard/tests/vm/vars/per-machine/peer1/wireguard-network-wg-test-one/.validation-hash similarity index 100% rename from checks/wireguard/vars/per-machine/peer1/wireguard-network-wg-test-one/.validation-hash rename to clanServices/wireguard/tests/vm/vars/per-machine/peer1/wireguard-network-wg-test-one/.validation-hash diff --git a/checks/wireguard/vars/per-machine/peer1/wireguard-network-wg-test-one/suffix/value b/clanServices/wireguard/tests/vm/vars/per-machine/peer1/wireguard-network-wg-test-one/suffix/value similarity index 100% rename from checks/wireguard/vars/per-machine/peer1/wireguard-network-wg-test-one/suffix/value rename to clanServices/wireguard/tests/vm/vars/per-machine/peer1/wireguard-network-wg-test-one/suffix/value diff --git a/checks/wireguard/vars/per-machine/peer2/wireguard-keys-wg-test-one/privatekey/machines/peer2 b/clanServices/wireguard/tests/vm/vars/per-machine/peer2/wireguard-keys-wg-test-one/privatekey/machines/peer2 similarity index 100% rename from checks/wireguard/vars/per-machine/peer2/wireguard-keys-wg-test-one/privatekey/machines/peer2 rename to clanServices/wireguard/tests/vm/vars/per-machine/peer2/wireguard-keys-wg-test-one/privatekey/machines/peer2 diff --git a/checks/wireguard/vars/per-machine/peer2/wireguard-keys-wg-test-one/privatekey/secret b/clanServices/wireguard/tests/vm/vars/per-machine/peer2/wireguard-keys-wg-test-one/privatekey/secret similarity index 100% rename from checks/wireguard/vars/per-machine/peer2/wireguard-keys-wg-test-one/privatekey/secret rename to clanServices/wireguard/tests/vm/vars/per-machine/peer2/wireguard-keys-wg-test-one/privatekey/secret diff --git a/checks/wireguard/vars/per-machine/peer2/wireguard-keys-wg-test-one/privatekey/users/admin b/clanServices/wireguard/tests/vm/vars/per-machine/peer2/wireguard-keys-wg-test-one/privatekey/users/admin similarity index 100% rename from checks/wireguard/vars/per-machine/peer2/wireguard-keys-wg-test-one/privatekey/users/admin rename to clanServices/wireguard/tests/vm/vars/per-machine/peer2/wireguard-keys-wg-test-one/privatekey/users/admin diff --git a/checks/wireguard/vars/per-machine/peer2/wireguard-keys-wg-test-one/publickey/value b/clanServices/wireguard/tests/vm/vars/per-machine/peer2/wireguard-keys-wg-test-one/publickey/value similarity index 100% rename from checks/wireguard/vars/per-machine/peer2/wireguard-keys-wg-test-one/publickey/value rename to clanServices/wireguard/tests/vm/vars/per-machine/peer2/wireguard-keys-wg-test-one/publickey/value diff --git a/checks/wireguard/vars/per-machine/peer2/wireguard-network-wg-test-one/.validation-hash b/clanServices/wireguard/tests/vm/vars/per-machine/peer2/wireguard-network-wg-test-one/.validation-hash similarity index 100% rename from checks/wireguard/vars/per-machine/peer2/wireguard-network-wg-test-one/.validation-hash rename to clanServices/wireguard/tests/vm/vars/per-machine/peer2/wireguard-network-wg-test-one/.validation-hash diff --git a/checks/wireguard/vars/per-machine/peer2/wireguard-network-wg-test-one/suffix/value b/clanServices/wireguard/tests/vm/vars/per-machine/peer2/wireguard-network-wg-test-one/suffix/value similarity index 100% rename from checks/wireguard/vars/per-machine/peer2/wireguard-network-wg-test-one/suffix/value rename to clanServices/wireguard/tests/vm/vars/per-machine/peer2/wireguard-network-wg-test-one/suffix/value diff --git a/checks/wireguard/vars/per-machine/peer3/wireguard-keys-wg-test-one/privatekey/machines/peer3 b/clanServices/wireguard/tests/vm/vars/per-machine/peer3/wireguard-keys-wg-test-one/privatekey/machines/peer3 similarity index 100% rename from checks/wireguard/vars/per-machine/peer3/wireguard-keys-wg-test-one/privatekey/machines/peer3 rename to clanServices/wireguard/tests/vm/vars/per-machine/peer3/wireguard-keys-wg-test-one/privatekey/machines/peer3 diff --git a/checks/wireguard/vars/per-machine/peer3/wireguard-keys-wg-test-one/privatekey/secret b/clanServices/wireguard/tests/vm/vars/per-machine/peer3/wireguard-keys-wg-test-one/privatekey/secret similarity index 100% rename from checks/wireguard/vars/per-machine/peer3/wireguard-keys-wg-test-one/privatekey/secret rename to clanServices/wireguard/tests/vm/vars/per-machine/peer3/wireguard-keys-wg-test-one/privatekey/secret diff --git a/checks/wireguard/vars/per-machine/peer3/wireguard-keys-wg-test-one/privatekey/users/admin b/clanServices/wireguard/tests/vm/vars/per-machine/peer3/wireguard-keys-wg-test-one/privatekey/users/admin similarity index 100% rename from checks/wireguard/vars/per-machine/peer3/wireguard-keys-wg-test-one/privatekey/users/admin rename to clanServices/wireguard/tests/vm/vars/per-machine/peer3/wireguard-keys-wg-test-one/privatekey/users/admin diff --git a/checks/wireguard/vars/per-machine/peer3/wireguard-keys-wg-test-one/publickey/value b/clanServices/wireguard/tests/vm/vars/per-machine/peer3/wireguard-keys-wg-test-one/publickey/value similarity index 100% rename from checks/wireguard/vars/per-machine/peer3/wireguard-keys-wg-test-one/publickey/value rename to clanServices/wireguard/tests/vm/vars/per-machine/peer3/wireguard-keys-wg-test-one/publickey/value diff --git a/checks/wireguard/vars/per-machine/peer3/wireguard-network-wg-test-one/.validation-hash b/clanServices/wireguard/tests/vm/vars/per-machine/peer3/wireguard-network-wg-test-one/.validation-hash similarity index 100% rename from checks/wireguard/vars/per-machine/peer3/wireguard-network-wg-test-one/.validation-hash rename to clanServices/wireguard/tests/vm/vars/per-machine/peer3/wireguard-network-wg-test-one/.validation-hash diff --git a/checks/wireguard/vars/per-machine/peer3/wireguard-network-wg-test-one/suffix/value b/clanServices/wireguard/tests/vm/vars/per-machine/peer3/wireguard-network-wg-test-one/suffix/value similarity index 100% rename from checks/wireguard/vars/per-machine/peer3/wireguard-network-wg-test-one/suffix/value rename to clanServices/wireguard/tests/vm/vars/per-machine/peer3/wireguard-network-wg-test-one/suffix/value