mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-14 08:54:46 +00:00
c4fd7cf16d
This patch is about removing `wireguardPeerConfig`, `dhcpServerStaticLeaseConfig` - a.k.a. the AbstractSingletonProxyFactoryBean of nixpkgs - and friends. As a former colleague said > worst abstraction ever I second that. I've written enough networkd config for NixOS systems so far to have a strong dislike. In fact, these don't even make sense: `netdevs.wireguardPeers._.wireguardPeerConfig` will be rendered into the key `[WireGuardPeer]` and every key from `wireguardPeerConfig` is in there. Since it's INI, there's no place where sections on the same level as wireguardPeerConfig fit into. Hence, get rid of it all. For the transition, using the old way is still allowed, but gives a warning. I think we could drop this after one release. The tests of rosenpass and systemd-networkd-dhcpserver-static-leases were broken on the rev before, hence they were updated, but are still not building.
80 lines
2.9 KiB
Nix
80 lines
2.9 KiB
Nix
# In contrast to systemd-networkd-dhcpserver, this test configures
|
|
# the router with a static DHCP lease for the client's MAC address.
|
|
import ./make-test-python.nix ({ lib, ... }: {
|
|
name = "systemd-networkd-dhcpserver-static-leases";
|
|
meta = with lib.maintainers; {
|
|
maintainers = [ veehaitch ];
|
|
};
|
|
nodes = {
|
|
router = {
|
|
virtualisation.vlans = [ 1 ];
|
|
systemd.services.systemd-networkd.environment.SYSTEMD_LOG_LEVEL = "debug";
|
|
networking = {
|
|
useNetworkd = true;
|
|
useDHCP = false;
|
|
firewall.enable = false;
|
|
};
|
|
systemd.network = {
|
|
networks = {
|
|
# systemd-networkd will load the first network unit file
|
|
# that matches, ordered lexiographically by filename.
|
|
# /etc/systemd/network/{40-eth1,99-main}.network already
|
|
# exists. This network unit must be loaded for the test,
|
|
# however, hence why this network is named such.
|
|
"01-eth1" = {
|
|
name = "eth1";
|
|
networkConfig = {
|
|
DHCPServer = true;
|
|
Address = "10.0.0.1/24";
|
|
};
|
|
dhcpServerStaticLeases = [{
|
|
MACAddress = "02:de:ad:be:ef:01";
|
|
Address = "10.0.0.10";
|
|
}];
|
|
};
|
|
};
|
|
};
|
|
};
|
|
|
|
client = {
|
|
virtualisation.vlans = [ 1 ];
|
|
systemd.services.systemd-networkd.environment.SYSTEMD_LOG_LEVEL = "debug";
|
|
networking = {
|
|
useNetworkd = true;
|
|
useDHCP = false;
|
|
firewall.enable = false;
|
|
interfaces.eth1 = {
|
|
useDHCP = true;
|
|
macAddress = "02:de:ad:be:ef:01";
|
|
};
|
|
};
|
|
|
|
# This setting is important to have the router assign the
|
|
# configured lease based on the client's MAC address. Also see:
|
|
# https://github.com/systemd/systemd/issues/21368#issuecomment-982193546
|
|
systemd.network.networks."40-eth1".dhcpV4Config.ClientIdentifier = "mac";
|
|
};
|
|
};
|
|
testScript = ''
|
|
start_all()
|
|
|
|
with subtest("check router network configuration"):
|
|
router.wait_for_unit("systemd-networkd-wait-online.service")
|
|
eth1_status = router.succeed("networkctl status eth1")
|
|
assert "Network File: /etc/systemd/network/01-eth1.network" in eth1_status, \
|
|
"The router interface eth1 is not using the expected network file"
|
|
assert "10.0.0.1" in eth1_status, "Did not find expected router IPv4"
|
|
|
|
with subtest("check client network configuration"):
|
|
client.wait_for_unit("systemd-networkd-wait-online.service")
|
|
eth1_status = client.succeed("networkctl status eth1")
|
|
assert "Network File: /etc/systemd/network/40-eth1.network" in eth1_status, \
|
|
"The client interface eth1 is not using the expected network file"
|
|
assert "10.0.0.10" in eth1_status, "Did not find expected client IPv4"
|
|
|
|
with subtest("router and client can reach each other"):
|
|
client.wait_until_succeeds("ping -c 5 10.0.0.1")
|
|
router.wait_until_succeeds("ping -c 5 10.0.0.10")
|
|
'';
|
|
})
|