From 8eca34dd167e9a116d9a24ef890c65ce4a749c2a Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sun, 26 Jul 2020 10:03:38 +0200 Subject: nixos/tests/networking: fix macvlan tests The range option still needs to be defined in dhcpd4 to be able to give out static IP addresses --- nixos/tests/networking.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nixos/tests/networking.nix') diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index ebebbf90eb1..83d4f6465b6 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -32,14 +32,14 @@ let services.dhcpd4 = { enable = true; interfaces = map (n: "eth${toString n}") vlanIfs; - extraConfig = '' - '' + flip concatMapStrings vlanIfs (n: '' + extraConfig = flip concatMapStrings vlanIfs (n: '' subnet 192.168.${toString n}.0 netmask 255.255.255.0 { option routers 192.168.${toString n}.1; + range 192.168.${toString n}.2 192.168.${toString n}.254; } '') ; - machines = lib.flip map vlanIfs (vlan: + machines = flip map vlanIfs (vlan: { hostName = "client${toString vlan}"; ethernetAddress = qemu-flags.qemuNicMac vlan 1; -- cgit 1.4.1