commit ce81231420ec3499ac4e8f31076cc9425dbf90f3 · pyrox.dev/nixpkgs

+44

nixos/modules/system/boot/networkd.nix

···

       821
       821
        
               (assertValueOneOf "OnLink" boolValues)

     

       822
       822
        
             ];

     

       823
       823
        
       

     

       824
       824
       +
             sectionDHCPServerStaticLease = checkUnitConfig "DHCPServerStaticLease" [

     

       825
       825
       +
               (assertOnlyFields [

     

       826
       826
       +
                 "MACAddress"

     

       827
       827
       +
                 "Address"

     

       828
       828
       +
               ])

     

       829
       829
       +
               (assertHasField "MACAddress")

     

       830
       830
       +
               (assertHasField "Address")

     

       831
       831
       +
               (assertMacAddress "MACAddress")

     

       832
       832
       +
             ];

     

       833
       833
       +
       

     

       824
       834
        
           };

     

       825
       835
        
         };

     

       826
       836
        
       

     
···

       1161
       1171
        
           };

     

       1162
       1172
        
         };

     

       1163
       1173
        
       

     

       1174
       1174
       +
         dhcpServerStaticLeaseOptions = {

     

       1175
       1175
       +
           options = {

     

       1176
       1176
       +
             dhcpServerStaticLeaseConfig = mkOption {

     

       1177
       1177
       +
               default = {};

     

       1178
       1178
       +
               example = { MACAddress = "65:43:4a:5b:d8:5f"; Address = "192.168.1.42"; };

     

       1179
       1179
       +
               type = types.addCheck (types.attrsOf unitOption) check.network.sectionDHCPServerStaticLease;

     

       1180
       1180
       +
               description = ''

     

       1181
       1181
       +
                 Each attribute in this set specifies an option in the

     

       1182
       1182
       +
                 <literal>[DHCPServerStaticLease]</literal> section of the unit.  See

     

       1183
       1183
       +
                 <citerefentry><refentrytitle>systemd.network</refentrytitle>

     

       1184
       1184
       +
                 <manvolnum>5</manvolnum></citerefentry> for details.

     

       1185
       1185
       +
       

     

       1186
       1186
       +
                 Make sure to configure the corresponding client interface to use

     

       1187
       1187
       +
                 <literal>ClientIdentifier=mac</literal>.

     

       1188
       1188
       +
               '';

     

       1189
       1189
       +
             };

     

       1190
       1190
       +
           };

     

       1191
       1191
       +
         };

     

       1192
       1192
       +
       

     

       1164
       1193
        
         networkOptions = commonNetworkOptions // {

     

       1165
       1194
        
       

     

       1166
       1195
        
           linkConfig = mkOption {

     
···

       1268
       1297
        
             description = ''

     

       1269
       1298
        
               Each attribute in this set specifies an option in the

     

       1270
       1299
        
               <literal>[IPv6SendRA]</literal> section of the unit.  See

     

       1300
       1300
       +
               <citerefentry><refentrytitle>systemd.network</refentrytitle>

     

       1301
       1301
       +
               <manvolnum>5</manvolnum></citerefentry> for details.

     

       1302
       1302
       +
             '';

     

       1303
       1303
       +
           };

     

       1304
       1304
       +
       

     

       1305
       1305
       +
           dhcpServerStaticLeases = mkOption {

     

       1306
       1306
       +
             default = [];

     

       1307
       1307
       +
             example = [ { MACAddress = "65:43:4a:5b:d8:5f"; Address = "192.168.1.42"; } ];

     

       1308
       1308
       +
             type = with types; listOf (submodule dhcpServerStaticLeaseOptions);

     

       1309
       1309
       +
             description = ''

     

       1310
       1310
       +
               A list of DHCPServerStaticLease sections to be added to the unit.  See

     

       1271
       1311
        
               <citerefentry><refentrytitle>systemd.network</refentrytitle>

     

       1272
       1312
        
               <manvolnum>5</manvolnum></citerefentry> for details.

     

       1273
       1313
        
             '';

     
···

       1643
       1683
        
               + flip concatMapStrings def.ipv6Prefixes (x: ''

     

       1644
       1684
        
                 [IPv6Prefix]

     

       1645
       1685
        
                 ${attrsToSection x.ipv6PrefixConfig}

     

       1686
       1686
       +
               '')

     

       1687
       1687
       +
               + flip concatMapStrings def.dhcpServerStaticLeases (x: ''

     

       1688
       1688
       +
                 [DHCPServerStaticLease]

     

       1689
       1689
       +
                 ${attrsToSection x.dhcpServerStaticLeaseConfig}

     

       1646
       1690
        
               '')

     

       1647
       1691
        
               + def.extraConfig;

     

       1648
       1692
        
           };

nixos/tests/all-tests.nix

···

       449
       449
        
         systemd-journal = handleTest ./systemd-journal.nix {};

     

       450
       450
        
         systemd-networkd = handleTest ./systemd-networkd.nix {};

     

       451
       451
        
         systemd-networkd-dhcpserver = handleTest ./systemd-networkd-dhcpserver.nix {};

     

       452
       452
       +
         systemd-networkd-dhcpserver-static-leases = handleTest ./systemd-networkd-dhcpserver-static-leases.nix {};

     

       452
       453
        
         systemd-networkd-ipv6-prefix-delegation = handleTest ./systemd-networkd-ipv6-prefix-delegation.nix {};

     

       453
       454
        
         systemd-networkd-vrf = handleTest ./systemd-networkd-vrf.nix {};

     

       454
       455
        
         systemd-nspawn = handleTest ./systemd-nspawn.nix {};

+81

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

···

       1
       1
       +
       # In contrast to systemd-networkd-dhcpserver, this test configures

     

       2
       2
       +
       # the router with a static DHCP lease for the client's MAC address.

     

       3
       3
       +
       import ./make-test-python.nix ({ lib, ... }: {

     

       4
       4
       +
         name = "systemd-networkd-dhcpserver-static-leases";

     

       5
       5
       +
         meta = with lib.maintainers; {

     

       6
       6
       +
           maintainers = [ veehaitch tomfitzhenry ];

     

       7
       7
       +
         };

     

       8
       8
       +
         nodes = {

     

       9
       9
       +
           router = {

     

       10
       10
       +
             virtualisation.vlans = [ 1 ];

     

       11
       11
       +
             systemd.services.systemd-networkd.environment.SYSTEMD_LOG_LEVEL = "debug";

     

       12
       12
       +
             networking = {

     

       13
       13
       +
               useNetworkd = true;

     

       14
       14
       +
               useDHCP = false;

     

       15
       15
       +
               firewall.enable = false;

     

       16
       16
       +
             };

     

       17
       17
       +
             systemd.network = {

     

       18
       18
       +
               networks = {

     

       19
       19
       +
                 # systemd-networkd will load the first network unit file

     

       20
       20
       +
                 # that matches, ordered lexiographically by filename.

     

       21
       21
       +
                 # /etc/systemd/network/{40-eth1,99-main}.network already

     

       22
       22
       +
                 # exists. This network unit must be loaded for the test,

     

       23
       23
       +
                 # however, hence why this network is named such.

     

       24
       24
       +
                 "01-eth1" = {

     

       25
       25
       +
                   name = "eth1";

     

       26
       26
       +
                   networkConfig = {

     

       27
       27
       +
                     DHCPServer = true;

     

       28
       28
       +
                     Address = "10.0.0.1/24";

     

       29
       29
       +
                   };

     

       30
       30
       +
                   dhcpServerStaticLeases = [{

     

       31
       31
       +
                     dhcpServerStaticLeaseConfig = {

     

       32
       32
       +
                       MACAddress = "02:de:ad:be:ef:01";

     

       33
       33
       +
                       Address = "10.0.0.10";

     

       34
       34
       +
                     };

     

       35
       35
       +
                   }];

     

       36
       36
       +
                 };

     

       37
       37
       +
               };

     

       38
       38
       +
             };

     

       39
       39
       +
           };

     

       40
       40
       +
       

     

       41
       41
       +
           client = {

     

       42
       42
       +
             virtualisation.vlans = [ 1 ];

     

       43
       43
       +
             systemd.services.systemd-networkd.environment.SYSTEMD_LOG_LEVEL = "debug";

     

       44
       44
       +
             networking = {

     

       45
       45
       +
               useNetworkd = true;

     

       46
       46
       +
               useDHCP = false;

     

       47
       47
       +
               firewall.enable = false;

     

       48
       48
       +
               interfaces.eth1 = {

     

       49
       49
       +
                 useDHCP = true;

     

       50
       50
       +
                 macAddress = "02:de:ad:be:ef:01";

     

       51
       51
       +
               };

     

       52
       52
       +
             };

     

       53
       53
       +
       

     

       54
       54
       +
             # This setting is important to have the router assign the

     

       55
       55
       +
             # configured lease based on the client's MAC address. Also see:

     

       56
       56
       +
             # https://github.com/systemd/systemd/issues/21368#issuecomment-982193546

     

       57
       57
       +
             systemd.network.networks."40-eth1".dhcpV4Config.ClientIdentifier = "mac";

     

       58
       58
       +
           };

     

       59
       59
       +
         };

     

       60
       60
       +
         testScript = ''

     

       61
       61
       +
           start_all()

     

       62
       62
       +
       

     

       63
       63
       +
           with subtest("check router network configuration"):

     

       64
       64
       +
             router.wait_for_unit("systemd-networkd-wait-online.service")

     

       65
       65
       +
             eth1_status = router.succeed("networkctl status eth1")

     

       66
       66
       +
             assert "Network File: /etc/systemd/network/01-eth1.network" in eth1_status, \

     

       67
       67
       +
               "The router interface eth1 is not using the expected network file"

     

       68
       68
       +
             assert "10.0.0.1" in eth1_status, "Did not find expected router IPv4"

     

       69
       69
       +
       

     

       70
       70
       +
           with subtest("check client network configuration"):

     

       71
       71
       +
             client.wait_for_unit("systemd-networkd-wait-online.service")

     

       72
       72
       +
             eth1_status = client.succeed("networkctl status eth1")

     

       73
       73
       +
             assert "Network File: /etc/systemd/network/40-eth1.network" in eth1_status, \

     

       74
       74
       +
               "The client interface eth1 is not using the expected network file"

     

       75
       75
       +
             assert "10.0.0.10" in eth1_status, "Did not find expected client IPv4"

     

       76
       76
       +
       

     

       77
       77
       +
           with subtest("router and client can reach each other"):

     

       78
       78
       +
             client.wait_until_succeeds("ping -c 5 10.0.0.1")

     

       79
       79
       +
             router.wait_until_succeeds("ping -c 5 10.0.0.10")

     

       80
       80
       +
         '';

     

       81
       81
       +
       })