colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #247109 from helsinki-systems/fix/networking-test

Browse Source 
nixos/tests/networking: dhcpd -> kea
This commit is contained in:
Martin Weinelt 2023-08-04 16:48:45 +02:00 committed by GitHub
commit 3d36620b0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 49 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
nixos/tests/networking.nix
View File

@ -29,23 +29,49 @@ let
ipv6.addresses = [ { address = "fd00:1234:5678:${toString n}::1"; prefixLength = 64; } ]; ipv6.addresses = [ { address = "fd00:1234:5678:${toString n}::1"; prefixLength = 64; } ];
}))); })));
}; };
services.dhcpd4 = { services.kea = {
dhcp4 = {
enable = true; enable = true;
settings = {
interfaces-config = {
interfaces = map (n: "eth${toString n}") vlanIfs; interfaces = map (n: "eth${toString n}") vlanIfs;
extraConfig = flip concatMapStrings vlanIfs (n: '' dhcp-socket-type = "raw";
subnet 192.168.${toString n}.0 netmask 255.255.255.0 { service-sockets-require-all = true;
option routers 192.168.${toString n}.1; service-sockets-max-retries = 5;
range 192.168.${toString n}.3 192.168.${toString n}.254; service-sockets-retry-wait-time = 2500;
} };
'') subnet4 = map (n: {
; id = n;
machines = flip map vlanIfs (vlan: subnet = "192.168.${toString n}.0/24";
{ pools = [{ pool = "192.168.${toString n}.3 - 192.168.${toString n}.254"; }];
hostName = "client${toString vlan}"; option-data = [{ name = "routers"; data = "192.168.${toString n}.1"; }];
ethernetAddress = qemu-common.qemuNicMac vlan 1;
ipAddress = "192.168.${toString vlan}.2"; reservations = [{
} hw-address = qemu-common.qemuNicMac n 1;
); hostname = "client${toString n}";
ip-address = "192.168.${toString n}.2";
}];
}) vlanIfs;
};
};
dhcp6 = {
enable = true;
settings = {
interfaces-config = {
interfaces = map (n: "eth${toString n}") vlanIfs;
service-sockets-require-all = true;
service-sockets-max-retries = 5;
service-sockets-retry-wait-time = 2500;
};
subnet6 = map (n: {
id = n;
subnet = "fd00:1234:5678:${toString n}::/64";
interface = "eth${toString n}";
pools = [{ pool = "fd00:1234:5678:${toString n}::2-fd00:1234:5678:${toString n}::2"; }];
}) vlanIfs;
};
};
}; };
services.radvd = { services.radvd = {
enable = true; enable = true;
@ -61,17 +87,6 @@ let
}; };
''); '');
}; };
services.dhcpd6 = {
enable = true;
interfaces = map (n: "eth${toString n}") vlanIfs;
extraConfig = ''
authoritative;
'' + flip concatMapStrings vlanIfs (n: ''
subnet6 fd00:1234:5678:${toString n}::/64 {
range6 fd00:1234:5678:${toString n}::2 fd00:1234:5678:${toString n}::2;
}
'');
};
}; };
testCases = { testCases = {
@ -117,8 +132,9 @@ let
client.wait_for_unit("network.target") client.wait_for_unit("network.target")
router.wait_for_unit("network-online.target") router.wait_for_unit("network-online.target")
with subtest("Make sure dhcpcd is not started"): with subtest("Make sure DHCP server is not started"):
client.fail("systemctl status dhcpcd.service") client.fail("systemctl status kea-dhcp4-server.service")
client.fail("systemctl status kea-dhcp6-server.service")
with subtest("Test vlan 1"): with subtest("Test vlan 1"):
client.wait_until_succeeds("ping -c 1 192.168.1.1") client.wait_until_succeeds("ping -c 1 192.168.1.1")
@ -1035,7 +1051,7 @@ let
testScript = '' testScript = ''
machine.succeed("udevadm settle") machine.succeed("udevadm settle")
print(machine.succeed("ip link show dev enCustom")) print(machine.succeed("ip link show dev enCustom"))
machine.wait_until_succeeds("ip link show dev enCustom | grep -q '52:54:00:12:0b:01") machine.wait_until_succeeds("ip link show dev enCustom | grep -q 52:54:00:12:0b:01")
''; '';
}; };
}; };

2
pkgs/tools/networking/kea/default.nix
View File

@ -80,6 +80,8 @@ stdenv.mkDerivation rec {
kea = nixosTests.kea; kea = nixosTests.kea;
prefix-delegation = nixosTests.systemd-networkd-ipv6-prefix-delegation; prefix-delegation = nixosTests.systemd-networkd-ipv6-prefix-delegation;
prometheus-exporter = nixosTests.prometheus-exporters.kea; prometheus-exporter = nixosTests.prometheus-exporters.kea;
networking-scripted = lib.recurseIntoAttrs { inherit (nixosTests.networking.scripted) dhcpDefault dhcpSimple dhcpOneIf; };
networking-networkd = lib.recurseIntoAttrs { inherit (nixosTests.networking.networkd) dhcpDefault dhcpSimple dhcpOneIf; };
}; };
meta = with lib; { meta = with lib; {