commit a92cfb57256d05a76db6f58913270b92e198382c · pyrox.dev/nixpkgs

+14 -1

nixos/tests/networking.nix

···

       11
       11
        
           let

     

       12
       12
        
             vlanIfs = range 1 (length config.virtualisation.vlans);

     

       13
       13
        
           in {

     

       14
       14
       +
             environment.systemPackages = [ pkgs.iptables ]; # to debug firewall rules

     

       14
       15
        
             virtualisation.vlans = [ 1 2 3 ];

     

       15
       16
        
             boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = true;

     

       16
       17
        
             networking = {

     
···

       320
       321
        
             name = "MACVLAN";

     

       321
       322
        
             nodes.router = router;

     

       322
       323
        
             nodes.client = { pkgs, ... }: with pkgs.lib; {

     

       324
       324
       +
               environment.systemPackages = [ pkgs.iptables ]; # to debug firewall rules

     

       323
       325
        
               virtualisation.vlans = [ 1 ];

     

       324
       326
        
               networking = {

     

       325
       327
        
                 useNetworkd = networkd;

     

       328
       328
       +
                 firewall.logReversePathDrops = true; # to debug firewall rules

     

       329
       329
       +
                 # reverse path filtering rules for the macvlan interface seem

     

       330
       330
       +
                 # to be incorrect, causing the test to fail. Disable temporarily.

     

       331
       331
       +
                 firewall.checkReversePath = false;

     

       326
       332
        
                 firewall.allowPing = true;

     

       327
       333
        
                 useDHCP = true;

     

       328
       334
        
                 macvlans.macvlan.interface = "eth1";

     
···

       341
       347
        
                 $client->waitUntilSucceeds("ip addr show dev eth1 | grep -q '192.168.1'");

     

       342
       348
        
                 $client->waitUntilSucceeds("ip addr show dev macvlan | grep -q '192.168.1'");

     

       343
       349
        
       

     

       344
       344
       -
                 # Print diagnosting information

     

       350
       350
       +
                 # Print lots of diagnostic information

     

       351
       351
       +
                 $router->log('**********************************************');

     

       345
       352
        
                 $router->succeed("ip addr >&2");

     

       353
       353
       +
                 $router->succeed("ip route >&2");

     

       354
       354
       +
                 $router->execute("iptables-save >&2");

     

       355
       355
       +
                 $client->log('==============================================');

     

       346
       356
        
                 $client->succeed("ip addr >&2");

     

       357
       357
       +
                 $client->succeed("ip route >&2");

     

       358
       358
       +
                 $client->execute("iptables-save >&2");

     

       359
       359
       +
                 $client->log('##############################################');

     

       347
       360
        
       

     

       348
       361
        
                 # Test macvlan creates routable ips

     

       349
       362
        
                 $client->waitUntilSucceeds("ping -c 1 192.168.1.1");

+2 -2

pkgs/tools/networking/dhcpcd/default.nix

···

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         # when updating this to >=7, check, see previous reverts:

     

       5
       5
        
         # nix-build -A nixos.tests.networking.scripted.macvlan.x86_64-linux nixos/release-combined.nix

     

       6
       6
       -
         name = "dhcpcd-6.11.5";

     

       6
       6
       +
         name = "dhcpcd-7.0.8";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "mirror://roy/dhcpcd/${name}.tar.xz";

     

       10
       10
       -
           sha256 = "17nnhxmbdcc7k2mh6sgvxisqcqbic5540xbig363ds97gvf795kg";

     

       10
       10
       +
           sha256 = "1df95lv3cbs3dk718a2vyvzmv7qhpgcxzagb27ylmav96f48x5ln";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         nativeBuildInputs = [ pkgconfig ];