diff options
| author | rnhmjoj <rnhmjoj@inventati.org> | 2019-07-09 08:06:52 +0200 |
|---|---|---|
| committer | Linus Heckemann <git@sphalerite.org> | 2019-07-09 08:08:45 +0200 |
| commit | 1738283e6e53267ed1999daedccfb1a6ca3306b7 (patch) | |
| tree | dee4cfeb4cdeff67efa39fffdb19bb3872181049 /nixos/tests/networking.nix | |
| parent | ab225fc1ab94b5fc8136566d56ec9044b05fcaa0 (diff) | |
nixos/network-interfaces: make `preferTempAddr=false` work again
Diffstat (limited to 'nixos/tests/networking.nix')
| -rw-r--r-- | nixos/tests/networking.nix | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index ed9f287d55821..949d946bdc4c4 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -510,7 +510,7 @@ let ''; }; }; - nodes.client = { pkgs, ... }: with pkgs.lib; { + nodes.clientWithPrivacy = { pkgs, ... }: with pkgs.lib; { virtualisation.vlans = [ 1 ]; networking = { useNetworkd = networkd; @@ -522,21 +522,39 @@ let }; }; }; + nodes.client = { pkgs, ... }: with pkgs.lib; { + virtualisation.vlans = [ 1 ]; + networking = { + useNetworkd = networkd; + useDHCP = true; + interfaces.eth1 = { + preferTempAddress = false; + ipv4.addresses = mkOverride 0 [ ]; + ipv6.addresses = mkOverride 0 [ ]; + }; + }; + }; testScript = { ... }: '' startAll; $client->waitForUnit("network.target"); + $clientWithPrivacy->waitForUnit("network.target"); $router->waitForUnit("network-online.target"); # Wait until we have an ip address + $clientWithPrivacy->waitUntilSucceeds("ip addr show dev eth1 | grep -q 'fd00:1234:5678:1:'"); $client->waitUntilSucceeds("ip addr show dev eth1 | grep -q 'fd00:1234:5678:1:'"); # Test vlan 1 + $clientWithPrivacy->waitUntilSucceeds("ping -c 1 fd00:1234:5678:1::1"); $client->waitUntilSucceeds("ping -c 1 fd00:1234:5678:1::1"); # Test address used is temporary - $client->waitUntilSucceeds("! ip route get fd00:1234:5678:1::1 | grep -q ':[a-f0-9]*ff:fe[a-f0-9]*:'"); + $clientWithPrivacy->waitUntilSucceeds("! ip route get fd00:1234:5678:1::1 | grep -q ':[a-f0-9]*ff:fe[a-f0-9]*:'"); + + # Test address used is EUI-64 + $client->waitUntilSucceeds("ip route get fd00:1234:5678:1::1 | grep -q ':[a-f0-9]*ff:fe[a-f0-9]*:'"); ''; }; routes = { |