diff options
| author | Daniil Baturin <daniil@baturin.org> | 2019-06-17 14:42:26 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2019-06-17 14:42:26 +0200 |
| commit | d6d42f5a2729b5efb839de48b2ebd52b792dfa84 (patch) | |
| tree | 35b6028c139b37c6463dfebf64798dd839717a14 | |
| parent | 8d70134d1adba4d787476ded970ee40ab18d1622 (diff) | |
| parent | 03c09b1b0d7dfdab9fc87bc7b017455c45141ced (diff) | |
| download | vyos-1x-d6d42f5a2729b5efb839de48b2ebd52b792dfa84.tar.gz vyos-1x-d6d42f5a2729b5efb839de48b2ebd52b792dfa84.zip | |
Merge branch 'current' of https://github.com/vyos/vyos-1x into current
| -rw-r--r-- | interface-definitions/dhcpv6-server.xml | 21 | ||||
| -rwxr-xr-x | src/conf_mode/dhcpv6_server.py | 2 |
2 files changed, 17 insertions, 6 deletions
diff --git a/interface-definitions/dhcpv6-server.xml b/interface-definitions/dhcpv6-server.xml index e63eb2242..e18a58608 100644 --- a/interface-definitions/dhcpv6-server.xml +++ b/interface-definitions/dhcpv6-server.xml @@ -268,7 +268,7 @@ </leafNode> <leafNode name="sntp-server"> <properties> - <help>IPv6 address of an SNTP Server for client to use</help> + <help>IPv6 address of an SNTP server for client to use</help> <constraint> <validator name="ipv6-address"/> </constraint> @@ -278,25 +278,36 @@ <tagNode name="static-mapping"> <properties> <help>Name of static mapping</help> + <constraint> + <regex>[-_a-zA-Z0-9.]+</regex> + </constraint> + <constraintErrorMessage>Invalid static-mapping name. May only contain letters, numbers and .-_</constraintErrorMessage> </properties> <children> <leafNode name="disable"> <properties> - <help>Option to disable static-mapping</help> + <help>Option to disable static mapping</help> <valueless/> </properties> </leafNode> <leafNode name="identifier"> <properties> - <help>Client identifier for this static mapping</help> + <help>Client identifier (DUID) for this static mapping [REQUIRED]</help> + <valueHelp> + <format>h[[:h]...]</format> + <description>DUID: colon-separated hex list (as used by isc-dhcp option dhcpv6.client-id)</description> + </valueHelp> + <constraint> + <regex>([0-9A-Fa-f]{1,2}[:])*([0-9A-Fa-f]{1,2})</regex> + </constraint> </properties> </leafNode> <leafNode name="ipv6-address"> <properties> - <help>Client IPv5 address for this static mapping</help> + <help>Client IPv6 address for this static mapping [REQUIRED]</help> <valueHelp> <format>ipv6</format> - <description>IPv6 address for this tatic mapping</description> + <description>IPv6 address for this static mapping [REQUIRED]</description> </valueHelp> <constraint> <validator name="ipv6-address"/> diff --git a/src/conf_mode/dhcpv6_server.py b/src/conf_mode/dhcpv6_server.py index 5430097de..aa9c35fa1 100755 --- a/src/conf_mode/dhcpv6_server.py +++ b/src/conf_mode/dhcpv6_server.py @@ -94,7 +94,7 @@ shared-network {{ network.name }} { {%- for host in subnet.static_mapping %} {% if not host.disabled -%} host {{ network.name }}_{{ host.name }} { - host-identifier option dhcp6.client-id "{{ host.client_identifier }}"; + host-identifier option dhcp6.client-id {{ host.client_identifier }}; fixed-address6 {{ host.ipv6_address }}; } {%- endif %} |