From 68a0496bc7fa0770427d22bd25c6910b9144e9ab Mon Sep 17 00:00:00 2001
From: Matthew Salerno <m@salernosection.com>
Date: Sun, 24 Mar 2024 21:07:59 -0400
Subject: [PATCH] Update tests to use `subnets` in all connections

---
 tests/acls/double-dev-ring.nix  | 4 ++++
 tests/acls/manual-ipv4.nix      | 1 +
 tests/acls/manual-ipv6-auto.nix | 1 +
 tests/acls/manual-ipv6.nix      | 1 +
 tests/acls/mesh.nix             | 1 +
 tests/acls/ring.nix             | 4 ++++
 tests/acls/simple.nix           | 1 +
 tests/double-dev-ring.nix       | 2 ++
 tests/mesh.nix                  | 2 ++
 9 files changed, 17 insertions(+)

diff --git a/tests/acls/double-dev-ring.nix b/tests/acls/double-dev-ring.nix
index 5c535a2..4a172a4 100644
--- a/tests/acls/double-dev-ring.nix
+++ b/tests/acls/double-dev-ring.nix
@@ -87,18 +87,22 @@
     {
       a = [{type= "peer"; rule = "is"; value = "peer1";}];
       b = [{type= "peer"; rule = "is"; value = "peer2";}];
+      subnets = [ "ring" ];
     }
     {
       a = [{type= "peer"; rule = "is"; value = "peer2";}];
       b = [{type= "peer"; rule = "is"; value = "peer3";}];
+      subnets = [ "ring" ];
     }
     {
       a = [{type= "peer"; rule = "is"; value = "peer3";}];
       b = [{type= "peer"; rule = "is"; value = "peer4";}];
+      subnets = [ "ring" ];
     }
     {
       a = [{type= "peer"; rule = "is"; value = "peer4";}];
       b = [{type= "peer"; rule = "is"; value = "peer1";}];
+      subnets = [ "ring" ];
     }
   ];
 }
\ No newline at end of file
diff --git a/tests/acls/manual-ipv4.nix b/tests/acls/manual-ipv4.nix
index aaf602b..4a31c28 100644
--- a/tests/acls/manual-ipv4.nix
+++ b/tests/acls/manual-ipv4.nix
@@ -60,6 +60,7 @@
     {
       a = [{type= "subnet"; rule = "is"; value = "manual";}];
       b = [{type= "subnet"; rule = "is"; value = "manual";}];
+      subnets = [ "manual" ];
     }
   ];
 }
\ No newline at end of file
diff --git a/tests/acls/manual-ipv6-auto.nix b/tests/acls/manual-ipv6-auto.nix
index fac873b..e0c96ff 100644
--- a/tests/acls/manual-ipv6-auto.nix
+++ b/tests/acls/manual-ipv6-auto.nix
@@ -58,6 +58,7 @@
     {
       a = [{type= "subnet"; rule = "is"; value = "manual";}];
       b = [{type= "subnet"; rule = "is"; value = "manual";}];
+      subnets = [ "manual" ];
     }
   ];
 }
\ No newline at end of file
diff --git a/tests/acls/manual-ipv6.nix b/tests/acls/manual-ipv6.nix
index 7c2e556..81df6c6 100644
--- a/tests/acls/manual-ipv6.nix
+++ b/tests/acls/manual-ipv6.nix
@@ -58,6 +58,7 @@
     {
       a = [{type= "subnet"; rule = "is"; value = "manual";}];
       b = [{type= "subnet"; rule = "is"; value = "manual";}];
+      subnets = [ "manual" ];
     }
   ];
 }
\ No newline at end of file
diff --git a/tests/acls/mesh.nix b/tests/acls/mesh.nix
index b051be1..e761155 100644
--- a/tests/acls/mesh.nix
+++ b/tests/acls/mesh.nix
@@ -86,6 +86,7 @@
     {
       a = [{type= "subnet"; rule = "is"; value = "mesh";}];
       b = [{type= "subnet"; rule = "is"; value = "mesh";}];
+      subnets = [ "mesh" ];
     }
   ];
 }
\ No newline at end of file
diff --git a/tests/acls/ring.nix b/tests/acls/ring.nix
index 5eceaab..680977c 100644
--- a/tests/acls/ring.nix
+++ b/tests/acls/ring.nix
@@ -86,18 +86,22 @@
     {
       a = [{type= "peer"; rule = "is"; value = "node1";}];
       b = [{type= "peer"; rule = "is"; value = "node2";}];
+      subnets = [ "ring" ];
     }
     {
       a = [{type= "peer"; rule = "is"; value = "node2";}];
       b = [{type= "peer"; rule = "is"; value = "node3";}];
+      subnets = [ "ring" ];
     }
     {
       a = [{type= "peer"; rule = "is"; value = "node3";}];
       b = [{type= "peer"; rule = "is"; value = "node4";}];
+      subnets = [ "ring" ];
     }
     {
       a = [{type= "peer"; rule = "is"; value = "node4";}];
       b = [{type= "peer"; rule = "is"; value = "node1";}];
+      subnets = [ "ring" ];
     }
   ];
 }
\ No newline at end of file
diff --git a/tests/acls/simple.nix b/tests/acls/simple.nix
index 90db8a6..f9ba98d 100644
--- a/tests/acls/simple.nix
+++ b/tests/acls/simple.nix
@@ -53,6 +53,7 @@
     {
       a = [{type= "subnet"; rule = "is"; value = "simple";}];
       b = [{type= "subnet"; rule = "is"; value = "simple";}];
+      subnets = [ "simple" ];
     }
   ];
 }
\ No newline at end of file
diff --git a/tests/double-dev-ring.nix b/tests/double-dev-ring.nix
index 596910e..84030b2 100644
--- a/tests/double-dev-ring.nix
+++ b/tests/double-dev-ring.nix
@@ -12,6 +12,7 @@
       virtualisation.vlans = [ 1 ];
       imports = [ self.nixosModules.default ];      
       systemd.network.enable = true;
+      networking.useDHCP = false;
       wirenix = {
         configurer = "networkd";
         devNameMethod = "hash";
@@ -33,6 +34,7 @@
       virtualisation.vlans = [ 1 ];
       imports = [ self.nixosModules.default ];
       systemd.network.enable = true;
+      networking.useDHCP = false;
       wirenix = {
         configurer = "networkd";
         devNameMethod = "hash";
diff --git a/tests/mesh.nix b/tests/mesh.nix
index 32535a0..07d2651 100644
--- a/tests/mesh.nix
+++ b/tests/mesh.nix
@@ -39,6 +39,7 @@
       virtualisation.vlans = [ 1 ];
       imports = [ self.nixosModules.default ];      
       systemd.network.enable = true;
+      networking.useDHCP = false;
       wirenix = {
         enable = true;
         configurer = "networkd";
@@ -60,6 +61,7 @@
       virtualisation.vlans = [ 1 ];
       imports = [ self.nixosModules.default ];      
       systemd.network.enable = true;
+      networking.useDHCP = false;
       wirenix = {
         enable = true;
         configurer = "networkd";