diff options
| author | rnhmjoj <rnhmjoj@inventati.org> | 2017-12-03 05:14:54 +0100 |
|---|---|---|
| committer | rnhmjoj <rnhmjoj@inventati.org> | 2018-02-17 14:57:07 +0100 |
| commit | e239c1e5820bdbb3d94ccc46e2d6756b0d37057d (patch) | |
| tree | 949c07008657835d1ac6d6b247a50d05d7152cae /nixos/tests/networking.nix | |
| parent | c1bed05e341756f7fdfa73035c7f1e078e49be3d (diff) | |
| download | nixpkgs-e239c1e5820bdbb3d94ccc46e2d6756b0d37057d.tar nixpkgs-e239c1e5820bdbb3d94ccc46e2d6756b0d37057d.tar.gz nixpkgs-e239c1e5820bdbb3d94ccc46e2d6756b0d37057d.tar.bz2 nixpkgs-e239c1e5820bdbb3d94ccc46e2d6756b0d37057d.tar.lz nixpkgs-e239c1e5820bdbb3d94ccc46e2d6756b0d37057d.tar.xz nixpkgs-e239c1e5820bdbb3d94ccc46e2d6756b0d37057d.tar.zst nixpkgs-e239c1e5820bdbb3d94ccc46e2d6756b0d37057d.zip | |
nixos/tests: rename IP addresses/routes options
Diffstat (limited to 'nixos/tests/networking.nix')
| -rw-r--r-- | nixos/tests/networking.nix | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index 72dbf38ea3a..18f3e1c548b 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -21,8 +21,8 @@ let firewall.allowedUDPPorts = [ 547 ]; interfaces = mkOverride 0 (listToAttrs (flip map vlanIfs (n: nameValuePair "eth${toString n}" { - ipv4.addresses = [ { address = "192.168.${toString n}.1"; prefixLength = 24;} ]; - ipv6.addresses = [ { address = "fd00:1234:5678:${toString n}::1"; prefixLength = 64;} ]; + ipv4.addresses = [ { address = "192.168.${toString n}.1"; prefixLength = 24; } ]; + ipv6.addresses = [ { address = "fd00:1234:5678:${toString n}::1"; prefixLength = 64; } ]; }))); }; services.dhcpd4 = { @@ -435,13 +435,13 @@ let name = "Virtual"; machine = { networking.interfaces."tap0" = { - ip4 = [ { address = "192.168.1.1"; prefixLength = 24; } ]; - ip6 = [ { address = "2001:1470:fffd:2096::"; prefixLength = 64; } ]; + ipv4.addresses = [ { address = "192.168.1.1"; prefixLength = 24; } ]; + ipv6.addresses = [ { address = "2001:1470:fffd:2096::"; prefixLength = 64; } ]; virtual = true; }; networking.interfaces."tun0" = { - ip4 = [ { address = "192.168.1.2"; prefixLength = 24; } ]; - ip6 = [ { address = "2001:1470:fffd:2097::"; prefixLength = 64; } ]; + ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ]; + ipv6.addresses = [ { address = "2001:1470:fffd:2097::"; prefixLength = 64; } ]; virtual = true; }; }; @@ -481,9 +481,9 @@ let boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = true; networking = { useNetworkd = networkd; - interfaces.eth1 = { - ipv6Address = "fd00:1234:5678:1::1"; - ipv6PrefixLength = 64; + interfaces.eth1.ipv6.addresses = singleton { + address = "fd00:1234:5678:1::1"; + prefixLength = 64; }; }; services.radvd = { @@ -509,8 +509,8 @@ let useDHCP = true; interfaces.eth1 = { preferTempAddress = true; - ip4 = mkOverride 0 [ ]; - ip6 = mkOverride 0 [ ]; + ipv4.addresses = mkOverride 0 [ ]; + ipv6.addresses = mkOverride 0 [ ]; }; }; }; |