[READY] - nixos-modules.routers.*: frr updates and ipv6 tests (#1104)

Author: kylerisse

nix/nixos-configurations/router-conf/configuration.nix

@@ -8,6 +8,7 @@
       enable = true;
       frrBorderInterface = "fiber0";
       frrExpoInterface = "fiber1";
+      trunkInterfaces = [ "copper0" ];
     };
     services.ssh.enable = true;
     services.alloy = {

nix/nixos-configurations/router-expo/configuration.nix

@@ -8,6 +8,7 @@
       enable = true;
       frrBorderInterface = "fiber0";
       frrConferenceInterface = "fiber1";
+      trunkInterfaces = [ "copper0" ];
     };
     services.ssh.enable = true;
     services.alloy = {

nix/nixos-modules/routers/border.nix

@@ -129,20 +129,22 @@ in
             networkConfig.DHCP = false;
             address = [
               "172.20.1.1/24"
+              "2001:470:f026:901::1/64"
             ];
           };
           "50-bridge902" = {
             matchConfig.Name = "bridge902";
             networkConfig.DHCP = false;
             address = [
               "172.20.2.1/24"
+              "2001:470:f026:902::1/64"
             ];
           };
         }
         (mkIf (!cfg.staticWANEnable) {
           # temporary for testing at various sites
           # will be static for show
-          "10-nat-dhcp" = {
+          "10-${cfg.WANInterface}" = {
             matchConfig.Name = cfg.WANInterface;
             enable = true;
             networkConfig = {
@@ -155,7 +157,7 @@ in
         })
 
         (mkIf cfg.staticWANEnable {
-          "10-nat-static" = {
+          "10-${cfg.WANInterface}" = {
             matchConfig.Name = cfg.WANInterface;
             networkConfig.DHCP = false;
             address = [
@@ -195,6 +197,7 @@ in
         "bridge901" # cf
         "bridge902" # expo
       ];
+      # service.frr.passive-interface add 103 and 104 later
     };
   };
 }