Unverified Commit 132c2250 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #315866 from NixOS/backport-315855-to-release-24.05 

[Backport release-24.05] nixos/tests/networkd: make client reliable in dhcpserver-static-leases test
parents 3d1db4d7 8e89e58c

nixos/tests/systemd-networkd-dhcpserver-static-leases.nix

+22 −10
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ import ./make-test-python.nix ({ lib, ... }: { 
          "01-eth1" = {

            name = "eth1";

            networkConfig = {

              # IPForward prevents dynamic address configuration

              IPForward = true;

              DHCPServer = true;

              Address = "10.0.0.1/24";

            };
@@ -41,20 +43,30 @@ import ./make-test-python.nix ({ lib, ... }: { 
    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";

      systemd.network = {

        enable = true;

        links."10-eth1" = {

          matchConfig.OriginalName = "eth1";

          linkConfig.MACAddress = "02:de:ad:be:ef:01";

        };

        networks."40-eth1" = {

          matchConfig.Name = "eth1";

          networkConfig = {

            DHCP = "ipv4";

            IPv6AcceptRA = false;

          };



          # 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";

          dhcpV4Config.ClientIdentifier = "mac";

          linkConfig.RequiredForOnline = "routable";

        };

      };

      networking = {

        useDHCP = false;

        firewall.enable = false;

        interfaces.eth1 = lib.mkForce {};

      };

    };

  };

  testScript = ''