commit 68729958e889b7db114fcb3f5ca297d28ae59165 · pyrox.dev/nixpkgs

+25

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

···

       239
       239
        
                       ip link set "${i}" master "${n}"

     

       240
       240
        
                       ip link set "${i}" up

     

       241
       241
        
                     '')}

     

       242
       242
       +
                     # Save list of enslaved interfaces

     

       243
       243
       +
                     echo "${flip concatMapStrings v.interfaces (i: ''

     

       244
       244
       +
                       ${i}

     

       245
       245
       +
                     '')}" > /run/${n}.interfaces

     

       242
       246
        
       

     

       243
       247
        
                     # Enable stp on the interface

     

       244
       248
        
                     ${optionalString v.rstp ''

     
···

       250
       254
        
                   postStop = ''

     

       251
       255
        
                     ip link set "${n}" down || true

     

       252
       256
        
                     ip link del "${n}" || true

     

       257
       257
       +
                     rm -f /run/${n}.interfaces

     

       253
       258
        
                   '';

     

       259
       259
       +
                   reload = ''

     

       260
       260
       +
                     # Un-enslave child interfaces (old list of interfaces)

     

       261
       261
       +
                     for interface in `cat /run/${n}.interfaces`; do

     

       262
       262
       +
                       ip link set "$interface" nomaster up

     

       263
       263
       +
                     done

     

       264
       264
       +
       

     

       265
       265
       +
                     # Enslave child interfaces (new list of interfaces)

     

       266
       266
       +
                     ${flip concatMapStrings v.interfaces (i: ''

     

       267
       267
       +
                       ip link set "${i}" master "${n}"

     

       268
       268
       +
                       ip link set "${i}" up

     

       269
       269
       +
                     '')}

     

       270
       270
       +
                     # Save list of enslaved interfaces

     

       271
       271
       +
                     echo "${flip concatMapStrings v.interfaces (i: ''

     

       272
       272
       +
                       ${i}

     

       273
       273
       +
                     '')}" > /run/${n}.interfaces

     

       274
       274
       +
       

     

       275
       275
       +
                     # (Un-)set stp on the bridge

     

       276
       276
       +
                     echo ${if v.rstp then "2" else "0"} > /sys/class/net/${n}/bridge/stp_state

     

       277
       277
       +
                   '';

     

       278
       278
       +
                   reloadIfChanged = true;

     

       254
       279
        
                 });

     

       255
       280
        
       

     

       256
       281
        
               createVswitchDevice = n: v: nameValuePair "${n}-netdev"

nixos/release.nix

···

       228
       228
        
         tests.containers-imperative = callTest tests/containers-imperative.nix {};

     

       229
       229
        
         tests.containers-extra_veth = callTest tests/containers-extra_veth.nix {};

     

       230
       230
        
         tests.containers-physical_interfaces = callTest tests/containers-physical_interfaces.nix {};

     

       231
       231
       +
         tests.containers-restart_networking = callTest tests/containers-restart_networking.nix {};

     

       231
       232
        
         tests.containers-tmpfs = callTest tests/containers-tmpfs.nix {};

     

       232
       233
        
         tests.containers-hosts = callTest tests/containers-hosts.nix {};

     

       233
       234
        
         tests.containers-macvlans = callTest tests/containers-macvlans.nix {};

+114

nixos/tests/containers-restart_networking.nix

···

       1
       1
       +
       # Test for NixOS' container support.

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         client_base = rec {

     

       5
       5
       +
           networking.firewall.enable = false;

     

       6
       6
       +
       

     

       7
       7
       +
           containers.webserver = {

     

       8
       8
       +
             autoStart = true;

     

       9
       9
       +
             privateNetwork = true;

     

       10
       10
       +
             hostBridge = "br0";

     

       11
       11
       +
             config = {

     

       12
       12
       +
               networking.firewall.enable = false;

     

       13
       13
       +
               networking.firewall.allowPing = true;

     

       14
       14
       +
               networking.interfaces.eth0.ip4 = [

     

       15
       15
       +
                 { address = "192.168.1.122"; prefixLength = 24; }

     

       16
       16
       +
               ];

     

       17
       17
       +
             };

     

       18
       18
       +
           };

     

       19
       19
       +
         };

     

       20
       20
       +
       in import ./make-test.nix ({ pkgs, lib, ...} :

     

       21
       21
       +
       {

     

       22
       22
       +
         name = "containers-restart_networking";

     

       23
       23
       +
         meta = with pkgs.stdenv.lib.maintainers; {

     

       24
       24
       +
           maintainers = [ kampfschlaefer ];

     

       25
       25
       +
         };

     

       26
       26
       +
       

     

       27
       27
       +
         nodes = {

     

       28
       28
       +
           client = { lib, pkgs, ... }: client_base // {

     

       29
       29
       +
             virtualisation.vlans = [ 1 ];

     

       30
       30
       +
       

     

       31
       31
       +
             networking.bridges.br0 = {

     

       32
       32
       +
               interfaces = [];

     

       33
       33
       +
               rstp = false;

     

       34
       34
       +
             };

     

       35
       35
       +
             networking.interfaces = {

     

       36
       36
       +
               eth1.ip4 = lib.mkOverride 0 [ ];

     

       37
       37
       +
               br0.ip4 = [{ address = "192.168.1.1"; prefixLength = 24; }];

     

       38
       38
       +
             };

     

       39
       39
       +
       

     

       40
       40
       +
           };

     

       41
       41
       +
           client_eth1 = { lib, pkgs, ... }: client_base // {

     

       42
       42
       +
             networking.bridges.br0 = {

     

       43
       43
       +
               interfaces = [ "eth1" ];

     

       44
       44
       +
               rstp = false;

     

       45
       45
       +
             };

     

       46
       46
       +
             networking.interfaces = {

     

       47
       47
       +
               eth1.ip4 = lib.mkOverride 0 [ ];

     

       48
       48
       +
               br0.ip4 = [{ address = "192.168.1.2"; prefixLength = 24; }];

     

       49
       49
       +
             };

     

       50
       50
       +
           };

     

       51
       51
       +
           client_eth1_rstp = { lib, pkgs, ... }: client_base // {

     

       52
       52
       +
             networking.bridges.br0 = {

     

       53
       53
       +
               interfaces = [ "eth1" ];

     

       54
       54
       +
               rstp = true;

     

       55
       55
       +
             };

     

       56
       56
       +
             networking.interfaces = {

     

       57
       57
       +
               eth1.ip4 = lib.mkOverride 0 [ ];

     

       58
       58
       +
               br0.ip4 = [{ address = "192.168.1.2"; prefixLength = 24; }];

     

       59
       59
       +
             };

     

       60
       60
       +
           };

     

       61
       61
       +
         };

     

       62
       62
       +
       

     

       63
       63
       +
         testScript = {nodes, ...}: let

     

       64
       64
       +
           originalSystem = nodes.client.config.system.build.toplevel;

     

       65
       65
       +
           eth1_bridged = nodes.client_eth1.config.system.build.toplevel;

     

       66
       66
       +
           eth1_rstp = nodes.client_eth1_rstp.config.system.build.toplevel;

     

       67
       67
       +
         in ''

     

       68
       68
       +
           $client->start();

     

       69
       69
       +
       

     

       70
       70
       +
           $client->waitForUnit("default.target");

     

       71
       71
       +
       

     

       72
       72
       +
           subtest "initial state", sub {

     

       73
       73
       +
             $client->succeed("ping 192.168.1.122 -c 1 -n >&2");

     

       74
       74
       +
             $client->succeed("nixos-container run webserver -- ping -c 1 -n 192.168.1.1 >&2");

     

       75
       75
       +
       

     

       76
       76
       +
             $client->fail("ip l show eth1 |grep \"master br0\" >&2");

     

       77
       77
       +
             $client->fail("grep eth1 /run/br0.interfaces >&2");

     

       78
       78
       +
           };

     

       79
       79
       +
       

     

       80
       80
       +
           subtest "interfaces without stp", sub {

     

       81
       81
       +
             $client->succeed("${eth1_bridged}/bin/switch-to-configuration test >&2");

     

       82
       82
       +
       

     

       83
       83
       +
             $client->succeed("ping 192.168.1.122 -c 1 -n >&2");

     

       84
       84
       +
             $client->succeed("nixos-container run webserver -- ping -c 1 -n 192.168.1.2 >&2");

     

       85
       85
       +
       

     

       86
       86
       +
             $client->succeed("ip l show eth1 |grep \"master br0\" >&2");

     

       87
       87
       +
             $client->succeed("grep eth1 /run/br0.interfaces >&2");

     

       88
       88
       +
           };

     

       89
       89
       +
       

     

       90
       90
       +
           # activating rstp needs another service, therefor the bridge will restart and the container will loose its connectivity

     

       91
       91
       +
           #subtest "interfaces with rstp", sub {

     

       92
       92
       +
           #  $client->succeed("${eth1_rstp}/bin/switch-to-configuration test >&2");

     

       93
       93
       +
           #  $client->execute("ip -4 a >&2");

     

       94
       94
       +
           #  $client->execute("ip l >&2");

     

       95
       95
       +
           #

     

       96
       96
       +
           #  $client->succeed("ping 192.168.1.122 -c 1 -n >&2");

     

       97
       97
       +
           #  $client->succeed("nixos-container run webserver -- ping -c 1 -n 192.168.1.2 >&2");

     

       98
       98
       +
           #

     

       99
       99
       +
           #  $client->succeed("ip l show eth1 |grep \"master br0\" >&2");

     

       100
       100
       +
           #  $client->succeed("grep eth1 /run/br0.interfaces >&2");

     

       101
       101
       +
           #};

     

       102
       102
       +
       

     

       103
       103
       +
           subtest "back to no interfaces and no stp", sub {

     

       104
       104
       +
             $client->succeed("${originalSystem}/bin/switch-to-configuration test >&2");

     

       105
       105
       +
       

     

       106
       106
       +
             $client->succeed("ping 192.168.1.122 -c 1 -n >&2");

     

       107
       107
       +
             $client->succeed("nixos-container run webserver -- ping -c 1 -n 192.168.1.1 >&2");

     

       108
       108
       +
       

     

       109
       109
       +
             $client->fail("ip l show eth1 |grep \"master br0\" >&2");

     

       110
       110
       +
             $client->fail("grep eth1 /run/br0.interfaces >&2");

     

       111
       111
       +
           };

     

       112
       112
       +
         '';

     

       113
       113
       +
       

     

       114
       114
       +
       })