summaryrefslogtreecommitdiff
path: root/interface-definitions/dhcp-server.xml
diff options
context:
space:
mode:
authorJernej Jakob <jernej.jakob@gmail.com>2019-07-04 12:15:52 +0200
committerJernej Jakob <jernej.jakob@gmail.com>2019-07-04 12:15:52 +0200
commit377c04cbd7c11f3288664f9e64a95ee8fda23457 (patch)
treec20c957642e5441a465f23a900ba64beb9b6123a /interface-definitions/dhcp-server.xml
parent5a20fd657f1d4603eb5f49a01b9f3ae30278d0fd (diff)
downloadvyos-1x-377c04cbd7c11f3288664f9e64a95ee8fda23457.tar.gz
vyos-1x-377c04cbd7c11f3288664f9e64a95ee8fda23457.zip
T1435 plus other dhcp/dhcpv6-server enhancements
- T1435: dhcp-server: make ip-address optional in static-mapping - remove [REQUIRED] from dhcpv6-server static-mapping identifier and ipv6-address - verify if static-mapping ipv6-address is in subnet - make help and error messages in conf-mode more descriptive - remove regex ^$ anchors (implied in re.fullmatch)
Diffstat (limited to 'interface-definitions/dhcp-server.xml')
-rw-r--r--interface-definitions/dhcp-server.xml41
1 files changed, 23 insertions, 18 deletions
diff --git a/interface-definitions/dhcp-server.xml b/interface-definitions/dhcp-server.xml
index 87999f496..7d42294e8 100644
--- a/interface-definitions/dhcp-server.xml
+++ b/interface-definitions/dhcp-server.xml
@@ -46,9 +46,9 @@
<properties>
<help>DHCP shared network name [REQUIRED]</help>
<constraint>
- <regex>^[-_a-zA-Z0-9.]+$</regex>
+ <regex>[-_a-zA-Z0-9.]+</regex>
</constraint>
- <constraintErrorMessage>Invalid DHCP pool name</constraintErrorMessage>
+ <constraintErrorMessage>Invalid shared network name. May only contain letters, numbers and .-_</constraintErrorMessage>
</properties>
<children>
<leafNode name="authoritative">
@@ -151,7 +151,7 @@
</leafNode>
<leafNode name="exclude">
<properties>
- <help>IP address that needs to be excluded from DHCP lease range</help>
+ <help>IP address to exclude from DHCP lease range</help>
<valueHelp>
<format>ipv4</format>
<description>IPv4 address to exclude from lease range</description>
@@ -183,9 +183,9 @@
<properties>
<help>DHCP failover peer name [REQUIRED]</help>
<constraint>
- <regex>^[-_a-zA-Z0-9.]+$</regex>
+ <regex>[-_a-zA-Z0-9.]+</regex>
</constraint>
- <constraintErrorMessage>Invalid failover peer name</constraintErrorMessage>
+ <constraintErrorMessage>Invalid failover peer name. May only contain letters, numbers and .-_</constraintErrorMessage>
</properties>
</leafNode>
<leafNode name="peer-address">
@@ -193,7 +193,7 @@
<help>IP address of failover peer [REQUIRED]</help>
<valueHelp>
<format>ipv4</format>
- <description>IPv4 address to exclude from lease range</description>
+ <description>IPv4 address of failover peer</description>
</valueHelp>
<constraint>
<validator name="ipv4-address"/>
@@ -225,12 +225,12 @@
<help>Lease timeout in seconds (default: 86400)</help>
<valueHelp>
<format>0-4294967295</format>
- <description>DHCP lease time in seconds must be between 0 and 4294967295 (49 days)</description>
+ <description>DHCP lease time in seconds</description>
</valueHelp>
<constraint>
<validator name="numeric" argument="--range 0-4294967295"/>
</constraint>
- <constraintErrorMessage>DHCP lease time must be 0 to 4294967295</constraintErrorMessage>
+ <constraintErrorMessage>DHCP lease time must be between 0 and 4294967295 (49 days)</constraintErrorMessage>
</properties>
</leafNode>
<leafNode name="ntp-server">
@@ -288,9 +288,9 @@
<properties>
<help>DHCP lease range</help>
<constraint>
- <regex>^[-_a-zA-Z0-9.]+$</regex>
+ <regex>[-_a-zA-Z0-9.]+</regex>
</constraint>
- <constraintErrorMessage>Invalid DHCP lease range name</constraintErrorMessage>
+ <constraintErrorMessage>Invalid DHCP lease range name. May only contain letters, numbers and .-_</constraintErrorMessage>
</properties>
<children>
<leafNode name="start">
@@ -321,22 +321,22 @@
</tagNode>
<tagNode name="static-mapping">
<properties>
- <help>Static mapping for specified address type</help>
+ <help>Name of static mapping</help>
<constraint>
- <regex>^[-_a-zA-Z0-9.]+$</regex>
+ <regex>[-_a-zA-Z0-9.]+</regex>
</constraint>
- <constraintErrorMessage>Invalid static-mapping name</constraintErrorMessage>
+ <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="ip-address">
<properties>
- <help>Static mapping for specified IP address [REQUIRED]</help>
+ <help>Fixed IP address of static mapping</help>
<valueHelp>
<format>ipv4</format>
<description>IPv4 address used in static mapping</description>
@@ -348,7 +348,7 @@
</leafNode>
<leafNode name="mac-address">
<properties>
- <help>Static mapping for specified MAC address [REQUIRED]</help>
+ <help>MAC address of static mapping [REQUIRED]</help>
<valueHelp>
<format>h:h:h:h:h:h</format>
<description>MAC address used in static mapping [REQUIRED]</description>
@@ -358,6 +358,7 @@
<leafNode name="static-mapping-parameters">
<properties>
<help>Additional static-mapping parameters for DHCP server.
+ Will be placed inside the "host" block of the mapping.
You must use the syntax of dhcpd.conf in this text-field.
Using this without proper knowledge may result in a crashed
DHCP server. Check system log to look for errors.</help>
@@ -414,10 +415,14 @@
<leafNode name="time-offset">
<properties>
<help>Offset of the client's subnet in seconds from Coordinated Universal Time (UTC)</help>
+ <valueHelp>
+ <format>[-]N</format>
+ <description>Time offset (number, may be negative)</description>
+ </valueHelp>
<constraint>
- <regex>^-?[0-9]+$</regex>
+ <regex>-?[0-9]+</regex>
</constraint>
- <constraintErrorMessage>Invalid time offset valuee</constraintErrorMessage>
+ <constraintErrorMessage>Invalid time offset value</constraintErrorMessage>
</properties>
</leafNode>
<leafNode name="time-server">