Correct support for multiple-item arguments.

Author: kpfleming

CHANGELOG.md

@@ -16,6 +16,16 @@ for emergencies or non-content releases).
 
 ## [Unreleased]
 
+### Changed
+
+- Corrected support for arguments which must appear multiple times in
+  the generated unit files to represent a list of values:
+  - 'network.bind_carrier'
+  - 'network.dns'
+  - 'network.ipv6_proxy_ndp_address'
+  - 'network.ntp'
+  - 'wireguard.allowed_ips'
+
 ## [25.7.1] - 2025-08-18
 
 ### Changed

workflow-support/parameter_mapping.yml

@@ -53,26 +53,26 @@ global_network_arguments:
   ipv6_forwarding: IPv6Forwarding
 
 network_arguments:
-  bind_carrier: BindCarrier
+  bind_carrier: '*BindCarrier'
   bridge: Bridge
   configure_without_carrier: ConfigureWithoutCarrier
   dhcp: DHCP
   dhcp_prefix_delegation: DHCPPrefixDelegation
   dhcp_server: DHCPServer
-  dns: DNS
+  dns: '*DNS'
   emit_lldp: EmitLLDP
   ip_forward: IPForward
   ipv4_forwarding: IPv4Forwarding
   ipv6_accept_ra: IPv6AcceptRA
   ipv6_duplicate_address_detection: IPv6DuplicateAddressDetection
   ipv6_forwarding: IPv6Forwarding
   ipv6_proxy_ndp: IPv6ProxyNDP
-  ipv6_proxy_ndp_address: IPv6ProxyNDPAddress
+  ipv6_proxy_ndp_address: '*IPv6ProxyNDPAddress'
   ipv6_send_ra: IPv6SendRA
   keep_configuration: KeepConfiguration
   link_local_addressing: LinkLocalAddressing
   lldp: LLDP
-  ntp: NTP
+  ntp: '*NTP'
 
 network_link_arguments:
   activation_policy: ActivationPolicy
@@ -214,7 +214,7 @@ wireguard_arguments:
   route_table: RouteTable
 
 wireguard_peer_arguments:
-  allowed_ips: AllowedIPs
+  allowed_ips: '*AllowedIPs'
   endpoint: Endpoint
   persistent_keepalive: PersistentKeepalive
   preshared_key: PresharedKey

workflow-support/templates/macros.j2

@@ -1,11 +1,18 @@
 {% macro generate_mapped_arguments(arg_map, args) %}
   {% for arg, value in args.items() %}
     {% if value is string or value is integer  %}
-{{ arg_map[arg] }}={{ value }}
+{{ arg_map[arg] ~ '=' ~ value }}
     {% elif value is boolean %}
-{{ arg_map[arg] }}={{ value|ternary('yes','no') }}
+{{ arg_map[arg] ~ '=' ~ value | ternary('yes','no') }}
     {% else %}
-{{ arg_map[arg] }}={{ value|join(' ') }}
+      {% set mapped_arg = arg_map[arg] %}
+      {% if mapped_arg.startswith('*') %}
+        {% for v in value %}
+{{ mapped_arg[1:] ~ '=' ~ v }}
+        {% endfor %}
+      {% else %}
+{{ mapped_arg ~ '=' ~ value | join(' ') }}
+      {% endif %}
     {% endif %}
   {% endfor %}
 {% endmacro %}