commit f41111c4da9a7eb5cade95d945eec7576757d27d · pyrox.dev/nixpkgs

+3 -2

nixos/modules/tasks/network-interfaces-scripted.nix

···

       210
       210
        
                       ${flip concatMapStrings (i.ipv4Routes ++ i.ipv6Routes) (route:

     

       211
       211
        
                         let

     

       212
       212
        
                           cidr = "${route.address}/${toString route.prefixLength}";

     

       213
       213
       -
                           nextHop = optionalString (route.nextHop != null) ''via "${route.nextHop}"'';

     

       213
       213
       +
                           via = optionalString (route.via != null) ''via "${route.via}"'';

     

       214
       214
       +
                           options = concatStrings (mapAttrsToList (name: val: "${name} ${val} ") route.options);

     

       214
       215
        
                         in

     

       215
       216
        
                         ''

     

       216
       217
        
                            echo "${cidr}" >> $state

     

       217
       218
        
                            echo -n "adding route ${cidr}... "

     

       218
       218
       -
                            if out=$(ip route add "${cidr}" ${route.options} ${nextHop} dev "${i.name}" 2>&1); then

     

       219
       219
       +
                            if out=$(ip route add "${cidr}" ${options} ${via} dev "${i.name}" 2>&1); then

     

       219
       220
        
                              echo "done"

     

       220
       221
        
                            elif ! echo "$out" | grep "File exists" >/dev/null 2>&1; then

     

       221
       222
        
                              echo "failed"

+6 -6

nixos/modules/tasks/network-interfaces.nix

···

       131
       131
        
               '';

     

       132
       132
        
             };

     

       133
       133
        
       

     

       134
       134
       -
             nextHop = mkOption {

     

       134
       134
       +
             via = mkOption {

     

       135
       135
        
               type = types.nullOr types.str;

     

       136
       136
        
               default = null;

     

       137
       137
        
               description = "IPv${toString v} address of the next hop.";

     

       138
       138
        
             };

     

       139
       139
        
       

     

       140
       140
        
             options = mkOption {

     

       141
       141
       -
               type = types.str;

     

       142
       142
       -
               default = "";

     

       143
       143
       -
               example = "mtu 1492 window 524288";

     

       141
       141
       +
               type = types.attrsOf types.str;

     

       142
       142
       +
               default = { };

     

       143
       143
       +
               example = { mtu = "1492"; window = "524288"; };

     

       144
       144
        
               description = ''

     

       145
       145
        
                 Other route options. See the symbol <literal>OPTION</literal>

     

       146
       146
        
                 in the <literal>ip-route(8)</literal> manual page for the details.

     
···

       237
       237
        
               default = [];

     

       238
       238
        
               example = [

     

       239
       239
        
                 { address = "10.0.0.0"; prefixLength = 16; }

     

       240
       240
       -
                 { address = "192.168.2.0"; prefixLength = 24; nextHop = "192.168.1.1"; }

     

       240
       240
       +
                 { address = "192.168.2.0"; prefixLength = 24; via = "192.168.1.1"; }

     

       241
       241
        
               ];

     

       242
       242
        
               type = with types; listOf (submodule (routeOpts 4));

     

       243
       243
        
               description = ''

     
···

       249
       249
        
               default = [];

     

       250
       250
        
               example = [

     

       251
       251
        
                 { address = "fdfd:b3f0::"; prefixLength = 48; }

     

       252
       252
       -
                 { address = "2001:1470:fffd:2098::"; prefixLength = 64; nextHop = "fdfd:b3f0::1"; }

     

       252
       252
       +
                 { address = "2001:1470:fffd:2098::"; prefixLength = 64; via = "fdfd:b3f0::1"; }

     

       253
       253
        
               ];

     

       254
       254
        
               type = with types; listOf (submodule (routeOpts 6));

     

       255
       255
        
               description = ''

+63

nixos/tests/networking.nix

···

       533
       533
        
                 $client->succeed("! ip route get fd00:1234:5678:1::1 | grep -q ':[a-f0-9]*ff:fe[a-f0-9]*:'");

     

       534
       534
        
               '';

     

       535
       535
        
           };

     

       536
       536
       +
           routes = {

     

       537
       537
       +
             name = "routes";

     

       538
       538
       +
             machine = {

     

       539
       539
       +
               networking.useDHCP = false;

     

       540
       540
       +
               networking.interfaces."eth0" = {

     

       541
       541
       +
                 ip4 = [ { address = "192.168.1.2"; prefixLength = 24; } ];

     

       542
       542
       +
                 ip6 = [ { address = "2001:1470:fffd:2097::"; prefixLength = 64; } ];

     

       543
       543
       +
                 ipv6Routes = [

     

       544
       544
       +
                   { address = "fdfd:b3f0::"; prefixLength = 48; }

     

       545
       545
       +
                   { address = "2001:1470:fffd:2098::"; prefixLength = 64; via = "fdfd:b3f0::1"; }

     

       546
       546
       +
                 ];

     

       547
       547
       +
                 ipv4Routes = [

     

       548
       548
       +
                   { address = "10.0.0.0"; prefixLength = 16; options = { mtu = "1500"; }; }

     

       549
       549
       +
                   { address = "192.168.2.0"; prefixLength = 24; via = "192.168.1.1"; }

     

       550
       550
       +
                 ];

     

       551
       551
       +
               };

     

       552
       552
       +
               virtualisation.vlans = [ ];

     

       553
       553
       +
             };

     

       554
       554
       +
       

     

       555
       555
       +
             testScript = ''

     

       556
       556
       +
               my $targetIPv4Table = <<'END';

     

       557
       557
       +
               10.0.0.0/16 scope link mtu 1500 

     

       558
       558
       +
               192.168.1.0/24 proto kernel scope link src 192.168.1.2 

     

       559
       559
       +
               192.168.2.0/24 via 192.168.1.1 

     

       560
       560
       +
               END

     

       561
       561
       +
       

     

       562
       562
       +
               my $targetIPv6Table = <<'END';

     

       563
       563
       +
               2001:1470:fffd:2097::/64 proto kernel metric 256 pref medium

     

       564
       564
       +
               2001:1470:fffd:2098::/64 via fdfd:b3f0::1 metric 1024 pref medium

     

       565
       565
       +
               fdfd:b3f0::/48 metric 1024 pref medium

     

       566
       566
       +
               END

     

       567
       567
       +
       

     

       568
       568
       +
               $machine->start;

     

       569
       569
       +
               $machine->waitForUnit("network.target");

     

       570
       570
       +
       

     

       571
       571
       +
               # test routing tables

     

       572
       572
       +
               my $ipv4Table = $machine->succeed("ip -4 route list dev eth0 | head -n3");

     

       573
       573
       +
               my $ipv6Table = $machine->succeed("ip -6 route list dev eth0 | head -n3");

     

       574
       574
       +
               "$ipv4Table" eq "$targetIPv4Table" or die(

     

       575
       575
       +
                 "The IPv4 routing table does not match the expected one:\n",

     

       576
       576
       +
                 "Result:\n", "$ipv4Table\n",

     

       577
       577
       +
                 "Expected:\n", "$targetIPv4Table\n"

     

       578
       578
       +
               );

     

       579
       579
       +
               "$ipv6Table" eq "$targetIPv6Table" or die(

     

       580
       580
       +
                 "The IPv6 routing table does not match the expected one:\n",

     

       581
       581
       +
                 "Result:\n", "$ipv6Table\n",

     

       582
       582
       +
                 "Expected:\n", "$targetIPv6Table\n"

     

       583
       583
       +
               );

     

       584
       584
       +
       

     

       585
       585
       +
               # test clean-up of the tables

     

       586
       586
       +
               $machine->succeed("systemctl stop network-addresses-eth0");

     

       587
       587
       +
               my $ipv4Residue = $machine->succeed("ip -4 route list dev eth0 | head -n-3");

     

       588
       588
       +
               my $ipv6Residue = $machine->succeed("ip -6 route list dev eth0 | head -n-3");

     

       589
       589
       +
               $ipv4Residue eq "" or die(

     

       590
       590
       +
                 "The IPv4 routing table has not been properly cleaned:\n",

     

       591
       591
       +
                 "$ipv4Residue\n"

     

       592
       592
       +
               );

     

       593
       593
       +
               $ipv6Residue eq "" or die(

     

       594
       594
       +
                 "The IPv6 routing table has not been properly cleaned:\n",

     

       595
       595
       +
                 "$ipv6Residue\n"

     

       596
       596
       +
               );

     

       597
       597
       +
             '';

     

       598
       598
       +
           };

     

       536
       599
        
         };

     

       537
       600
        
       

     

       538
       601
        
       in mapAttrs (const (attrs: makeTest (attrs // {