From 0d4d4dd840e06c18250d73f27de61261ff141944 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Tue, 3 Dec 2019 22:01:19 +0100 Subject: T1843: run interface-definitions though GCC preprocessor A lot of XML code is duplicated (VLAN, interface address) for instance. Such XML definitions should be moved to feature.xml.i files and then just pulled in via GCC preprocessor #include definition in e.g. bond or ethernet definitions. This will give us the ability to single-source repeating node definitions as: * Interface Address * Interface Description * Interface Disable * VLAN (both vif-s and vif-c) The .in suffix of the interface-definitions is a marker that those files are input files to the GCC preprocessor. They will be rendered into proper XML files in the build directory. Some node definitions have been reworder to remove escaped double quote occurances which would have been warned about by the GCC preprocessor. --- interface-definitions/dhcpv6-server.xml | 328 -------------------------------- 1 file changed, 328 deletions(-) delete mode 100644 interface-definitions/dhcpv6-server.xml (limited to 'interface-definitions/dhcpv6-server.xml') diff --git a/interface-definitions/dhcpv6-server.xml b/interface-definitions/dhcpv6-server.xml deleted file mode 100644 index 28b56a64d..000000000 --- a/interface-definitions/dhcpv6-server.xml +++ /dev/null @@ -1,328 +0,0 @@ - - - - - - - - DHCP for IPv6 (DHCPv6) server - 900 - - - - - Option to disable DHCPv6 server - - - - - - Preference of this DHCPv6 server compared with others - - 0-255 - DHCPv6 server preference (0-255) - - - - - Preference must be between 0 and 255 - - - - - DHCPv6 shared network name [REQUIRED] - - [-_a-zA-Z0-9.]+ - - Invalid DHCPv6 shared network name. May only contain letters, numbers and .-_ - - - - - Option to disable DHCPv6 configuration for shared-network - - - - - - IPv6 DHCP subnet for this shared network [REQUIRED] - - ipv6net - IPv6 address and prefix length - - - - - - - - - Parameters setting ranges for assigning IPv6 addresses - - - - - IPv6 prefix defining range of addresses to assign - - ipv6net - IPv6 address and prefix length - - - - - - - - - Address range will be used for temporary addresses - - - - - - - - First in range of consecutive IPv6 addresses to assign - - ipv6 - IPv6 address - - - - - - - - - Last in range of consecutive IPv6 addresses - - ipv6 - IPv6 address - - - - - - - - - - - - - Domain name for client to search - - [-_a-zA-Z0-9.]+ - - Invalid domain name. May only contain letters, numbers and .-_ - - - - - - Parameters relating to the lease time - - - - - Default time (in seconds) that will be assigned to a lease - - - - - Maximum time (in seconds) that will be assigned to a lease - - - - - Minimum time (in seconds) that will be assigned to a lease - - - - - - - IPv6 address of a Recursive DNS Server - - ipv6 - IPv6 address of DNS name server - - - - - - - - - - NIS domain name for client to use - - [-_a-zA-Z0-9.]+ - - Invalid NIS domain name - - - - - IPv6 address of a NIS Server - - ipv6 - IPv6 address of NIS server - - - - - - - - - - NIS+ domain name for client to use - - [-_a-zA-Z0-9.]+ - - Invalid NIS+ domain name. May only contain letters, numbers and .-_ - - - - - IPv6 address of a NIS+ Server - - ipv6 - IPv6 address of NIS+ server - - - - - - - - - - Parameters relating to IPv6 prefix delegation - - - - - First in range of IPv6 addresses to be used in prefix delegation - - ipv6 - IPv6 address used in prefix delegation - - - - - - - - - Length in bits of prefixes to be delegated - - 0-255 - DHCPv6 server preference (0-255) - - - - - Preference must be between 0 and 255 - - - - - Last in range of IPv6 addresses to be used in prefix delegation - - ipv6 - IPv6 address used in prefix delegation - - - - - - - - - - - - - IPv6 address of SIP server - - ipv6 - IPv6 address of SIP server - - - - - - - - - - SIP server name - - [-_a-zA-Z0-9.]+ - - Invalid SIP server name. May only contain letters, numbers and .-_ - - - - - - IPv6 address of an SNTP server for client to use - - - - - - - - - Name of static mapping - - [-_a-zA-Z0-9.]+ - - Invalid static mapping name. May only contain letters, numbers and .-_ - - - - - Option to disable static mapping - - - - - - Client identifier (DUID) for this static mapping - - h[[:h]...] - DUID: colon-separated hex list (as used by isc-dhcp option dhcpv6.client-id) - - - ([0-9A-Fa-f]{1,2}[:])*([0-9A-Fa-f]{1,2}) - - Invalid DUID. Must be in the format h[[:h]...] where each \"h\" is 1 to 2 hex characters. - - - - - Client IPv6 address for this static mapping - - ipv6 - IPv6 address for this static mapping - - - - - - - - - - - - - - - - - -- cgit v1.2.3