Update tests to use `subnets` in all connections

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" ];
     }
   ];
 }

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" ];
     }
   ];
 }

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" ];
     }
   ];
 }

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" ];
     }
   ];
 }

tests/acls/mesh.nix

@@ -86,6 +86,7 @@
     {
       a = [{type= "subnet"; rule = "is"; value = "mesh";}];
       b = [{type= "subnet"; rule = "is"; value = "mesh";}];
+      subnets = [ "mesh" ];
     }
   ];
 }

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" ];
     }
   ];
 }

tests/acls/simple.nix

@@ -53,6 +53,7 @@
     {
       a = [{type= "subnet"; rule = "is"; value = "simple";}];
       b = [{type= "subnet"; rule = "is"; value = "simple";}];
+      subnets = [ "simple" ];
     }
   ];
 }

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";

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";