summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--interface-definitions/cron.xml.in2
-rw-r--r--interface-definitions/dhcp-server.xml.in2
-rw-r--r--interface-definitions/flow-accounting-conf.xml.in10
-rw-r--r--interface-definitions/include/accel-client-ipv6-pool.xml.i4
-rw-r--r--interface-definitions/include/bgp-afi-redistribute-metric-route-map.xml.i2
-rw-r--r--interface-definitions/include/bgp-neighbor-afi-ipv4-unicast.xml.i10
-rw-r--r--interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i10
-rw-r--r--interface-definitions/include/bgp-peer-group-afi-ipv4-unicast.xml.i10
-rw-r--r--interface-definitions/include/bgp-peer-group-afi-ipv6-unicast.xml.i10
-rw-r--r--interface-definitions/include/isis-redistribute-ipv4.xml.i4
-rw-r--r--interface-definitions/include/nat-translation-port.xml.i2
-rw-r--r--interface-definitions/include/rip-redistribute.xml.i4
-rw-r--r--interface-definitions/interfaces-bonding.xml.in4
-rw-r--r--interface-definitions/interfaces-tunnel.xml.in2
-rw-r--r--interface-definitions/interfaces-wireless.xml.in20
-rw-r--r--interface-definitions/lldp.xml.in2
-rw-r--r--interface-definitions/ntp.xml.in19
-rw-r--r--interface-definitions/policy-local-route.xml.in4
-rw-r--r--interface-definitions/protocols-bgp.xml.in70
-rw-r--r--interface-definitions/protocols-isis.xml.in46
-rw-r--r--interface-definitions/protocols-mpls.xml.in54
-rw-r--r--interface-definitions/protocols-rip.xml.in44
-rw-r--r--interface-definitions/salt-minion.xml.in2
-rw-r--r--interface-definitions/service-ids-ddos-protection.xml.in6
-rw-r--r--interface-definitions/service_router-advert.xml.in2
-rw-r--r--interface-definitions/vpn_ipsec.xml.in38
-rw-r--r--interface-definitions/vpn_l2tp.xml.in14
-rw-r--r--interface-definitions/vpn_openconnect.xml.in8
-rw-r--r--interface-definitions/vrrp.xml.in66
29 files changed, 253 insertions, 218 deletions
diff --git a/interface-definitions/cron.xml.in b/interface-definitions/cron.xml.in
index 2d4921bf0..ad2cb36ad 100644
--- a/interface-definitions/cron.xml.in
+++ b/interface-definitions/cron.xml.in
@@ -14,7 +14,7 @@
<properties>
<help>Scheduled task</help>
<valueHelp>
- <format>&lt;string&gt;</format>
+ <format>txt</format>
<description>Task name</description>
</valueHelp>
<priority>999</priority>
diff --git a/interface-definitions/dhcp-server.xml.in b/interface-definitions/dhcp-server.xml.in
index 161eeed28..26b803fcb 100644
--- a/interface-definitions/dhcp-server.xml.in
+++ b/interface-definitions/dhcp-server.xml.in
@@ -225,7 +225,7 @@
<properties>
<help>Lease timeout in seconds (default: 86400)</help>
<valueHelp>
- <format>0-4294967295</format>
+ <format>u32</format>
<description>DHCP lease time in seconds</description>
</valueHelp>
<constraint>
diff --git a/interface-definitions/flow-accounting-conf.xml.in b/interface-definitions/flow-accounting-conf.xml.in
index 585322125..830078abe 100644
--- a/interface-definitions/flow-accounting-conf.xml.in
+++ b/interface-definitions/flow-accounting-conf.xml.in
@@ -13,7 +13,7 @@
<properties>
<help>Buffer size</help>
<valueHelp>
- <format>0-4294967295</format>
+ <format>u32</format>
<description>Buffer size in MiB</description>
</valueHelp>
<constraint>
@@ -158,7 +158,7 @@
<description>NetFlow engine-id for v5</description>
</valueHelp>
<valueHelp>
- <format>0-4294967295</format>
+ <format>u32</format>
<description>NetFlow engine-id for v9 / IPFIX</description>
</valueHelp>
<constraint>
@@ -170,7 +170,7 @@
<properties>
<help>NetFlow maximum flows</help>
<valueHelp>
- <format>0-4294967295</format>
+ <format>u32</format>
<description>NetFlow maximum flows</description>
</valueHelp>
<constraint>
@@ -182,7 +182,7 @@
<properties>
<help>NetFlow sampling-rate</help>
<valueHelp>
- <format>0-4294967295</format>
+ <format>u32</format>
<description>Sampling rate (1 in N packets)</description>
</valueHelp>
<constraint>
@@ -389,7 +389,7 @@
<properties>
<help>sFlow sampling-rate</help>
<valueHelp>
- <format>0-4294967295</format>
+ <format>u32</format>
<description>Sampling rate (1 in N packets)</description>
</valueHelp>
<constraint>
diff --git a/interface-definitions/include/accel-client-ipv6-pool.xml.i b/interface-definitions/include/accel-client-ipv6-pool.xml.i
index 471ff714c..d15ff35d4 100644
--- a/interface-definitions/include/accel-client-ipv6-pool.xml.i
+++ b/interface-definitions/include/accel-client-ipv6-pool.xml.i
@@ -20,7 +20,7 @@
<properties>
<help>Prefix length used for individual client</help>
<valueHelp>
- <format>&lt;48-128&gt;</format>
+ <format>u32:48-128</format>
<description>Client prefix length (default: 64)</description>
</valueHelp>
<constraint>
@@ -46,7 +46,7 @@
<properties>
<help>Prefix length delegated to client</help>
<valueHelp>
- <format>&lt;32-64&gt;</format>
+ <format>u32:32-64</format>
<description>Delegated prefix length</description>
</valueHelp>
<constraint>
diff --git a/interface-definitions/include/bgp-afi-redistribute-metric-route-map.xml.i b/interface-definitions/include/bgp-afi-redistribute-metric-route-map.xml.i
index f35f13e8d..afd56eff3 100644
--- a/interface-definitions/include/bgp-afi-redistribute-metric-route-map.xml.i
+++ b/interface-definitions/include/bgp-afi-redistribute-metric-route-map.xml.i
@@ -3,7 +3,7 @@
<properties>
<help>Metric for redistributed routes</help>
<valueHelp>
- <format>&lt;1-4294967295&gt;</format>
+ <format>u32:1-4294967295</format>
<description>Metric for redistributed routes</description>
</valueHelp>
</properties>
diff --git a/interface-definitions/include/bgp-neighbor-afi-ipv4-unicast.xml.i b/interface-definitions/include/bgp-neighbor-afi-ipv4-unicast.xml.i
index 155817838..c5a83f045 100644
--- a/interface-definitions/include/bgp-neighbor-afi-ipv4-unicast.xml.i
+++ b/interface-definitions/include/bgp-neighbor-afi-ipv4-unicast.xml.i
@@ -13,7 +13,7 @@
<properties>
<help>Number of occurrences of AS number</help>
<valueHelp>
- <format>&lt;1-10&gt;</format>
+ <format>u32:1-10</format>
<description>Number of times AS is allowed in path</description>
</valueHelp>
<constraint>
@@ -114,7 +114,7 @@
<path>policy access-list</path>
</completionHelp>
<valueHelp>
- <format>&lt;1-65535&gt;</format>
+ <format>u32:1-65535</format>
<description>Access-list to filter outgoing IPv4-route updates to this neighbor</description>
</valueHelp>
<constraint>
@@ -129,7 +129,7 @@
<path>policy access-list</path>
</completionHelp>
<valueHelp>
- <format>&lt;1-65535&gt;</format>
+ <format>u32:1-65535</format>
<description>Access-list to filter incoming IPv4-route updates from this neighbor</description>
</valueHelp>
<constraint>
@@ -166,7 +166,7 @@
<properties>
<help>Maximum number of IPv4-prefixes to accept from this neighbor</help>
<valueHelp>
- <format>&lt;1-4294967295&gt;</format>
+ <format>u32:1-4294967295</format>
<description>Prefix limit</description>
</valueHelp>
<constraint>
@@ -273,7 +273,7 @@
<properties>
<help>Default weight for routes from this neighbor</help>
<valueHelp>
- <format>&lt;1-65535&gt;</format>
+ <format>u32:1-65535</format>
<description>Weight for routes from this neighbor</description>
</valueHelp>
<constraint>
diff --git a/interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i b/interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i
index 63bf582db..61cdc6a1c 100644
--- a/interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i
+++ b/interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i
@@ -13,7 +13,7 @@
<properties>
<help>Number of occurrences of AS number</help>
<valueHelp>
- <format>&lt;1-10&gt;</format>
+ <format>u32:1-10</format>
<description>Number of times AS is allowed in path</description>
</valueHelp>
<constraint>
@@ -140,7 +140,7 @@
<path>policy access-list6</path>
</completionHelp>
<valueHelp>
- <format>&lt;1-65535&gt;</format>
+ <format>u32:1-65535</format>
<description>Access-list to filter outgoing route updates to this neighbor</description>
</valueHelp>
<constraint>
@@ -155,7 +155,7 @@
<path>policy access-list6</path>
</completionHelp>
<valueHelp>
- <format>&lt;1-65535&gt;</format>
+ <format>u32:1-65535</format>
<description>Access-list to filter incoming route updates from this neighbor</description>
</valueHelp>
<constraint>
@@ -192,7 +192,7 @@
<properties>
<help>Maximum number of prefixes to accept from this neighbor</help>
<valueHelp>
- <format>&lt;1-4294967295&gt;</format>
+ <format>u32:1-4294967295</format>
<description>Prefix limit</description>
</valueHelp>
<constraint>
@@ -318,7 +318,7 @@
<properties>
<help>Default weight for routes from this neighbor</help>
<valueHelp>
- <format>&lt;1-65535&gt;</format>
+ <format>u32:1-65535</format>
<description>Weight for routes from this neighbor</description>
</valueHelp>
<constraint>
diff --git a/interface-definitions/include/bgp-peer-group-afi-ipv4-unicast.xml.i b/interface-definitions/include/bgp-peer-group-afi-ipv4-unicast.xml.i
index c6ba2630f..e34d9f774 100644
--- a/interface-definitions/include/bgp-peer-group-afi-ipv4-unicast.xml.i
+++ b/interface-definitions/include/bgp-peer-group-afi-ipv4-unicast.xml.i
@@ -13,7 +13,7 @@
<properties>
<help>Number of occurrences of AS number</help>
<valueHelp>
- <format>&lt;1-10&gt;</format>
+ <format>u32:1-10</format>
<description>Number of times AS is allowed in path</description>
</valueHelp>
<constraint>
@@ -130,7 +130,7 @@
<path>policy access-list</path>
</completionHelp>
<valueHelp>
- <format>&lt;1-65535&gt;</format>
+ <format>u32:1-65535</format>
<description>Access-list to filter outgoing route updates to this peer-group</description>
</valueHelp>
<constraint>
@@ -145,7 +145,7 @@
<path>policy access-list</path>
</completionHelp>
<valueHelp>
- <format>&lt;1-65535&gt;</format>
+ <format>u32:1-65535</format>
<description>Access-list to filter incoming route updates from this peer-group</description>
</valueHelp>
<constraint>
@@ -182,7 +182,7 @@
<properties>
<help>Maximum number of prefixes to accept from this peer-group</help>
<valueHelp>
- <format>&lt;1-4294967295&gt;</format>
+ <format>u32:1-4294967295</format>
<description>Prefix limit</description>
</valueHelp>
<constraint>
@@ -290,7 +290,7 @@
<properties>
<help>Default weight for routes from this peer-group</help>
<valueHelp>
- <format>&lt;1-65535&gt;</format>
+ <format>u32:1-65535</format>
<description>Weight for routes from this peer-group</description>
</valueHelp>
<constraint>
diff --git a/interface-definitions/include/bgp-peer-group-afi-ipv6-unicast.xml.i b/interface-definitions/include/bgp-peer-group-afi-ipv6-unicast.xml.i
index 933065dde..400193b7b 100644
--- a/interface-definitions/include/bgp-peer-group-afi-ipv6-unicast.xml.i
+++ b/interface-definitions/include/bgp-peer-group-afi-ipv6-unicast.xml.i
@@ -13,7 +13,7 @@
<properties>
<help>Number of occurrences of AS number</help>
<valueHelp>
- <format>&lt;1-10&gt;</format>
+ <format>u32:1-10</format>
<description>Number of times AS is allowed in path</description>
</valueHelp>
<constraint>
@@ -133,7 +133,7 @@
<path>policy access-list6</path>
</completionHelp>
<valueHelp>
- <format>&lt;1-65535&gt;</format>
+ <format>u32:1-65535</format>
<description>Access-list to filter outgoing route updates to this peer-group</description>
</valueHelp>
<constraint>
@@ -148,7 +148,7 @@
<path>policy access-list6</path>
</completionHelp>
<valueHelp>
- <format>&lt;1-65535&gt;</format>
+ <format>u32:1-65535</format>
<description>Access-list to filter incoming route updates from this peer-group</description>
</valueHelp>
<constraint>
@@ -185,7 +185,7 @@
<properties>
<help>Maximum number of prefixes to accept from this peer-group</help>
<valueHelp>
- <format>&lt;1-4294967295&gt;</format>
+ <format>u32:1-4294967295</format>
<description>Prefix limit</description>
</valueHelp>
<constraint>
@@ -306,7 +306,7 @@
<properties>
<help>Default weight for routes from this peer-group</help>
<valueHelp>
- <format>&lt;1-65535&gt;</format>
+ <format>u32:1-65535</format>
<description>Weight for routes from this peer-group</description>
</valueHelp>
<constraint>
diff --git a/interface-definitions/include/isis-redistribute-ipv4.xml.i b/interface-definitions/include/isis-redistribute-ipv4.xml.i
index fd5e75918..97ab64250 100644
--- a/interface-definitions/include/isis-redistribute-ipv4.xml.i
+++ b/interface-definitions/include/isis-redistribute-ipv4.xml.i
@@ -8,7 +8,7 @@
<properties>
<help>Metric for redistributed routes</help>
<valueHelp>
- <format>&lt;0-16777215&gt;</format>
+ <format>u32:0-16777215</format>
<description>ISIS default metric</description>
</valueHelp>
<constraint>
@@ -35,7 +35,7 @@
<properties>
<help>Metric for redistributed routes</help>
<valueHelp>
- <format>&lt;0-16777215&gt;</format>
+ <format>u32:0-16777215</format>
<description>ISIS default metric</description>
</valueHelp>
<constraint>
diff --git a/interface-definitions/include/nat-translation-port.xml.i b/interface-definitions/include/nat-translation-port.xml.i
index e3ea42e4d..a3e05316f 100644
--- a/interface-definitions/include/nat-translation-port.xml.i
+++ b/interface-definitions/include/nat-translation-port.xml.i
@@ -7,7 +7,7 @@
<description>Numeric IP port</description>
</valueHelp>
<valueHelp>
- <format>&lt;start&gt;-&lt;end&gt;</format>
+ <format>range</format>
<description>Numbered port range (e.g., 1001-1005)</description>
</valueHelp>
</properties>
diff --git a/interface-definitions/include/rip-redistribute.xml.i b/interface-definitions/include/rip-redistribute.xml.i
index d287c1c2b..f9dba3ffe 100644
--- a/interface-definitions/include/rip-redistribute.xml.i
+++ b/interface-definitions/include/rip-redistribute.xml.i
@@ -3,7 +3,7 @@
<properties>
<help>Metric for redistributed routes</help>
<valueHelp>
- <format>&lt;1-16&gt;</format>
+ <format>u32:1-16</format>
<description>Redistribute route metric</description>
</valueHelp>
<constraint>
@@ -15,7 +15,7 @@
<properties>
<help>Route map reference</help>
<valueHelp>
- <format>&lt;text&gt;</format>
+ <format>txt</format>
<description>Route map reference</description>
</valueHelp>
<completionHelp>
diff --git a/interface-definitions/interfaces-bonding.xml.in b/interface-definitions/interfaces-bonding.xml.in
index 720daba4d..f6ceefcaa 100644
--- a/interface-definitions/interfaces-bonding.xml.in
+++ b/interface-definitions/interfaces-bonding.xml.in
@@ -26,7 +26,7 @@
<properties>
<help>ARP link monitoring interval</help>
<valueHelp>
- <format>0-4294967295</format>
+ <format>u32</format>
<description>Specifies the ARP link monitoring frequency in milliseconds</description>
</valueHelp>
<constraint>
@@ -88,7 +88,7 @@
<properties>
<help>Minimum number of member interfaces required up before enabling bond</help>
<valueHelp>
- <format>&lt;0-16&gt;</format>
+ <format>u32:0-16</format>
<description>Minimum number of member interfaces required up before enabling bond</description>
</valueHelp>
<constraint>
diff --git a/interface-definitions/interfaces-tunnel.xml.in b/interface-definitions/interfaces-tunnel.xml.in
index b322374b3..574a7d0a4 100644
--- a/interface-definitions/interfaces-tunnel.xml.in
+++ b/interface-definitions/interfaces-tunnel.xml.in
@@ -209,7 +209,7 @@
<properties>
<help>Tunnel key</help>
<valueHelp>
- <format>0-4294967295</format>
+ <format>u32</format>
<description>Tunnel key</description>
</valueHelp>
<constraint>
diff --git a/interface-definitions/interfaces-wireless.xml.in b/interface-definitions/interfaces-wireless.xml.in
index ce211b9ce..86f529278 100644
--- a/interface-definitions/interfaces-wireless.xml.in
+++ b/interface-definitions/interfaces-wireless.xml.in
@@ -257,7 +257,7 @@
<properties>
<help>VHT operating channel center frequency - center freq 1 (for use with 80, 80+80 and 160 modes)</help>
<valueHelp>
- <format>&lt;34-173&gt;</format>
+ <format>u32:34-173</format>
<description>5Ghz (802.11 a/h/j/n/ac) center channel index (use 42 for primary 80MHz channel 36)</description>
</valueHelp>
<constraint>
@@ -270,7 +270,7 @@
<properties>
<help>VHT operating channel center frequency - center freq 2 (for use with the 80+80 mode)</help>
<valueHelp>
- <format>34-173</format>
+ <format>u32:34-173</format>
<description>5Ghz (802.11 a/h/j/n/ac) center channel index (use 58 for primary 80MHz channel 52)</description>
</valueHelp>
<constraint>
@@ -338,7 +338,7 @@
<properties>
<help>Set the maximum length of A-MPDU pre-EOF padding that the station can receive</help>
<valueHelp>
- <format>&lt;0-7&gt;</format>
+ <format>u32:0-7</format>
<description>Maximum length of A-MPDU pre-EOF padding = 2 pow(13 + x) -1 octets</description>
</valueHelp>
<constraint>
@@ -435,11 +435,11 @@
<description>Automatic Channel Selection (ACS)</description>
</valueHelp>
<valueHelp>
- <format>&lt;1-14&gt;</format>
+ <format>u32:1-14</format>
<description>2.4Ghz (802.11 b/g/n) Channel</description>
</valueHelp>
<valueHelp>
- <format>&lt;34-173&gt;</format>
+ <format>u32:34-173</format>
<description>5Ghz (802.11 a/h/j/n/ac) Channel</description>
</valueHelp>
<constraint>
@@ -455,7 +455,7 @@
<list>us eu jp de uk cn es fr ru</list>
</completionHelp>
<valueHelp>
- <format>&lt;code%gt;</format>
+ <format>txt</format>
<description>ISO/IEC 3166-1 Country Code</description>
</valueHelp>
<constraint>
@@ -496,7 +496,7 @@
<properties>
<help>Maximum number of wireless radio stations. Excess stations will be rejected upon authentication request.</help>
<valueHelp>
- <format>&lt;1-2007&gt;</format>
+ <format>u32:1-2007</format>
<description>Number of allowed stations</description>
</valueHelp>
<constraint>
@@ -576,7 +576,7 @@
<properties>
<help>Transmission power reduction in dBm</help>
<valueHelp>
- <format>&lt;0-255&gt;</format>
+ <format>u32:0-255</format>
<description>TX power reduction in dBm</description>
</valueHelp>
<constraint>
@@ -599,7 +599,7 @@
<properties>
<help>WEP encryption key</help>
<valueHelp>
- <format>&lt;hexdigits&gt;</format>
+ <format>txt</format>
<description>Wired Equivalent Privacy key</description>
</valueHelp>
<constraint>
@@ -713,7 +713,7 @@
using special characters in the WPA passphrase then single
quotes are required.</help>
<valueHelp>
- <format>&lt;text&gt;</format>
+ <format>txt</format>
<description>Passphrase of at least 8 but not more than 63 printable characters</description>
</valueHelp>
<constraint>
diff --git a/interface-definitions/lldp.xml.in b/interface-definitions/lldp.xml.in
index 8f6629d81..950b267ef 100644
--- a/interface-definitions/lldp.xml.in
+++ b/interface-definitions/lldp.xml.in
@@ -16,7 +16,7 @@
<description>Location data all interfaces</description>
</valueHelp>
<valueHelp>
- <format>&lt;intf&gt;</format>
+ <format>txt</format>
<description>Location data for a specific interface</description>
</valueHelp>
<completionHelp>
diff --git a/interface-definitions/ntp.xml.in b/interface-definitions/ntp.xml.in
index 6a8eb0818..b939d9dc6 100644
--- a/interface-definitions/ntp.xml.in
+++ b/interface-definitions/ntp.xml.in
@@ -5,13 +5,30 @@
<children>
<node name="ntp" owner="${vyos_conf_scripts_dir}/ntp.py">
<properties>
- <help>Network Time Protocol (NTP) configuration</help>
<priority>400</priority>
+ <help>Network Time Protocol (NTP) configuration</help>
</properties>
<children>
<tagNode name="server">
<properties>
<help>Network Time Protocol (NTP) server</help>
+ <valueHelp>
+ <format>ipv4</format>
+ <description>IP address of NTP server</description>
+ </valueHelp>
+ <valueHelp>
+ <format>ipv6</format>
+ <description>IPv6 address of NTP server</description>
+ </valueHelp>
+ <valueHelp>
+ <format>hostname</format>
+ <description>Fully qualified domain name of NTP server</description>
+ </valueHelp>
+ <constraint>
+ <validator name="ipv4-address"/>
+ <validator name="ipv6-address"/>
+ <validator name="fqdn"/>
+ </constraint>
</properties>
<children>
<leafNode name="noselect">
diff --git a/interface-definitions/policy-local-route.xml.in b/interface-definitions/policy-local-route.xml.in
index 5536c71c8..3769c3748 100644
--- a/interface-definitions/policy-local-route.xml.in
+++ b/interface-definitions/policy-local-route.xml.in
@@ -13,7 +13,7 @@
<help>Policy local-route rule set number</help>
<valueHelp>
<!-- table main with prio 32766 -->
- <format>&lt;1-32765&gt;</format>
+ <format>u32:1-32765</format>
<description>Local-route rule number (1-219)</description>
</valueHelp>
<constraint>
@@ -30,7 +30,7 @@
<properties>
<help>Routing table to forward packet with</help>
<valueHelp>
- <format>&lt;1-200&gt;</format>
+ <format>u32:1-200</format>
<description>Table number</description>
</valueHelp>
<completionHelp>
diff --git a/interface-definitions/protocols-bgp.xml.in b/interface-definitions/protocols-bgp.xml.in
index 38a0469bd..27cbc919a 100644
--- a/interface-definitions/protocols-bgp.xml.in
+++ b/interface-definitions/protocols-bgp.xml.in
@@ -7,7 +7,7 @@
<properties>
<help>Border Gateway Protocol (BGP) parameters</help>
<valueHelp>
- <format>&lt;1-4294967294&gt;</format>
+ <format>u32:1-4294967294</format>
<description>AS number</description>
</valueHelp>
<constraint>
@@ -159,7 +159,7 @@
<properties>
<help>AS-path hopcount limit</help>
<valueHelp>
- <format>&lt;0-255&gt;</format>
+ <format>u32:0-255</format>
<description>AS path hop count limit</description>
</valueHelp>
<constraint>
@@ -242,7 +242,7 @@
<properties>
<help>Maximum ebgp multipaths</help>
<valueHelp>
- <format>&lt;1-255&gt;</format>
+ <format>u32:1-255</format>
<description>EBGP multipaths</description>
</valueHelp>
<constraint>
@@ -254,7 +254,7 @@
<properties>
<help>Maximum ibgp multipaths</help>
<valueHelp>
- <format>&lt;1-255&gt;</format>
+ <format>u32:1-255</format>
<description>EBGP multipaths</description>
</valueHelp>
<constraint>
@@ -276,7 +276,7 @@
<description>BGP neighbor IPv6 address</description>
</valueHelp>
<valueHelp>
- <format>&lt;interface&gt;</format>
+ <format>txt</format>
<description>Interface name</description>
</valueHelp>
<constraint>
@@ -299,7 +299,7 @@
<properties>
<help>Minimum interval for sending routing updates</help>
<valueHelp>
- <format>&lt;0-600&gt;</format>
+ <format>u32:0-600</format>
<description>Advertisement interval in seconds</description>
</valueHelp>
<constraint>
@@ -379,7 +379,7 @@
<properties>
<help>Allow this EBGP neighbor to not be on a directly connected network</help>
<valueHelp>
- <format>&lt;1-255&gt;</format>
+ <format>u32:1-255</format>
<description>Number of hops</description>
</valueHelp>
<constraint>
@@ -404,7 +404,7 @@
<list>external internal</list>
</completionHelp>
<valueHelp>
- <format>&lt;1-4294967294&gt;</format>
+ <format>u32:1-4294967294</format>
<description>Neighbor AS number</description>
</valueHelp>
<valueHelp>
@@ -439,7 +439,7 @@
<list>external internal</list>
</completionHelp>
<valueHelp>
- <format>&lt;1-4294967294&gt;</format>
+ <format>u32:1-4294967294</format>
<description>Neighbor AS number</description>
</valueHelp>
<valueHelp>
@@ -465,7 +465,7 @@
<properties>
<help>Local AS number</help>
<valueHelp>
- <format>&lt;1-4294967294&gt;</format>
+ <format>u32:1-4294967294</format>
<description>Local AS number</description>
</valueHelp>
<constraint>
@@ -522,7 +522,7 @@
<list>external internal</list>
</completionHelp>
<valueHelp>
- <format>&lt;1-4294967294&gt;</format>
+ <format>u32:1-4294967294</format>
<description>Neighbor AS number</description>
</valueHelp>
<valueHelp>
@@ -561,7 +561,7 @@
<properties>
<help>BGP connect timer for this neighbor</help>
<valueHelp>
- <format>&lt;1-65535&gt;</format>
+ <format>u32:1-65535</format>
<description>Connect timer in seconds</description>
</valueHelp>
<valueHelp>
@@ -577,7 +577,7 @@
<properties>
<help>BGP hold timer for this neighbor</help>
<valueHelp>
- <format>&lt;1-65535&gt;</format>
+ <format>u32:1-65535</format>
<description>Hold timer in seconds</description>
</valueHelp>
<valueHelp>
@@ -593,7 +593,7 @@
<properties>
<help>BGP keepalive interval for this neighbor</help>
<valueHelp>
- <format>&lt;1-65535&gt;</format>
+ <format>u32:1-65535</format>
<description>Keepalive interval in seconds (default 60)</description>
</valueHelp>
<constraint>
@@ -612,7 +612,7 @@
<properties>
<help>Number of the maximum number of hops to the BGP peer</help>
<valueHelp>
- <format>&lt;1-254&gt;</format>
+ <format>u32:1-254</format>
<description>Number of hops</description>
</valueHelp>
<constraint>
@@ -635,7 +635,7 @@
<description>IPv6 address of route source</description>
</valueHelp>
<valueHelp>
- <format>&lt;interface&gt;</format>
+ <format>txt</format>
<description>Interface as route source</description>
</valueHelp>
<constraint>
@@ -736,7 +736,7 @@
<properties>
<help>Confederation AS identifier [REQUIRED]</help>
<valueHelp>
- <format>&lt;1-4294967294&gt;</format>
+ <format>u32:1-4294967294</format>
<description>Confederation AS id</description>
</valueHelp>
<constraint>
@@ -748,7 +748,7 @@
<properties>
<help>Peer ASs in the BGP confederation</help>
<valueHelp>
- <format>&lt;1-4294967294&gt;</format>
+ <format>u32:1-4294967294</format>
<description>Peer AS number</description>
</valueHelp>
<constraint>
@@ -767,7 +767,7 @@
<properties>
<help>Half-life time for dampening [REQUIRED]</help>
<valueHelp>
- <format>&lt;1-45&gt;</format>
+ <format>u32:1-45</format>
<description>Half-life penalty in seconds</description>
</valueHelp>
<constraint>
@@ -779,7 +779,7 @@
<properties>
<help>Maximum duration to suppress a stable route [REQUIRED]</help>
<valueHelp>
- <format>&lt;1-255&gt;</format>
+ <format>u32:1-255</format>
<description>Maximum suppress duration in seconds</description>
</valueHelp>
<constraint>
@@ -791,7 +791,7 @@
<properties>
<help>Time to start reusing a route [REQUIRED]</help>
<valueHelp>
- <format>&lt;1-20000&gt;</format>
+ <format>u32:1-20000</format>
<description>Re-use time in seconds</description>
</valueHelp>
<constraint>
@@ -803,7 +803,7 @@
<properties>
<help>When to start suppressing a route [REQUIRED]</help>
<valueHelp>
- <format>&lt;1-20000&gt;</format>
+ <format>u32:1-20000</format>
<description>Start-suppress-time</description>
</valueHelp>
<constraint>
@@ -822,7 +822,7 @@
<properties>
<help>Default local preference</help>
<valueHelp>
- <format>&lt;0-4294967295&gt;</format>
+ <format>u32</format>
<description>Local preference</description>
</valueHelp>
<constraint>
@@ -858,7 +858,7 @@
<properties>
<help>Administrative distance for external BGP routes</help>
<valueHelp>
- <format>&lt;1-255&gt;</format>
+ <format>u32:1-255</format>
<description>Administrative distance for external BGP routes</description>
</valueHelp>
<constraint>
@@ -870,7 +870,7 @@
<properties>
<help>Administrative distance for internal BGP routes</help>
<valueHelp>
- <format>&lt;1-255&gt;</format>
+ <format>u32:1-255</format>
<description>Administrative distance for internal BGP routes</description>
</valueHelp>
<constraint>
@@ -882,7 +882,7 @@
<properties>
<help>Administrative distance for local BGP routes</help>
<valueHelp>
- <format>&lt;1-255&gt;</format>
+ <format>u32:1-255</format>
<description>Administrative distance for internal BGP routes</description>
</valueHelp>
<constraint>
@@ -908,7 +908,7 @@
<properties>
<help>Administrative distance for prefix</help>
<valueHelp>
- <format>&lt;1-255&gt;</format>
+ <format>u32:1-255</format>
<description>Administrative distance for external BGP routes</description>
</valueHelp>
<constraint>
@@ -929,7 +929,7 @@
<properties>
<help>Maximum time to hold onto restarting neighbors stale paths</help>
<valueHelp>
- <format>&lt;1-3600&gt;</format>
+ <format>u32:1-3600</format>
<description>Hold time in seconds</description>
</valueHelp>
<constraint>
@@ -1038,7 +1038,7 @@
<properties>
<help>Allow this EBGP peer-group to not be on a directly connected network</help>
<valueHelp>
- <format>&lt;1-255&gt;</format>
+ <format>u32:1-255</format>
<description>Number of hops</description>
</valueHelp>
<constraint>
@@ -1050,7 +1050,7 @@
<properties>
<help>Local AS number [REQUIRED]</help>
<valueHelp>
- <format>&lt;1-4294967294&gt;</format>
+ <format>u32:1-4294967294</format>
<description>Local AS number</description>
</valueHelp>
<constraint>
@@ -1090,7 +1090,7 @@
<list>external internal</list>
</completionHelp>
<valueHelp>
- <format>&lt;1-4294967294&gt;</format>
+ <format>u32:1-4294967294</format>
<description>Neighbor AS number</description>
</valueHelp>
<valueHelp>
@@ -1123,7 +1123,7 @@
<properties>
<help>Number of the maximum number of hops to the BGP peer</help>
<valueHelp>
- <format>&lt;1-254&gt;</format>
+ <format>u32:1-254</format>
<description>Number of hops</description>
</valueHelp>
<constraint>
@@ -1146,7 +1146,7 @@
<description>IPv6 address of route source</description>
</valueHelp>
<valueHelp>
- <format>&lt;interface&gt;</format>
+ <format>txt</format>
<description>Interface as route source</description>
</valueHelp>
<constraint>
@@ -1175,7 +1175,7 @@
<properties>
<help>BGP holdtime interval</help>
<valueHelp>
- <format>&lt;4-65535&gt;</format>
+ <format>u32:4-65535</format>
<description>Hold-time in seconds (default 180)</description>
</valueHelp>
<valueHelp>
@@ -1191,7 +1191,7 @@
<properties>
<help>Keepalive interval</help>
<valueHelp>
- <format>&lt;1-65535&gt;</format>
+ <format>u32:1-65535</format>
<description>Keep-alive time in seconds (default 60)</description>
</valueHelp>
<constraint>
diff --git a/interface-definitions/protocols-isis.xml.in b/interface-definitions/protocols-isis.xml.in
index c98b04220..2ceb05180 100644
--- a/interface-definitions/protocols-isis.xml.in
+++ b/interface-definitions/protocols-isis.xml.in
@@ -21,7 +21,7 @@
<properties>
<help>Plain-text authentication type</help>
<valueHelp>
- <format>&lt;text&gt;</format>
+ <format>txt</format>
<description>Level-wide password</description>
</valueHelp>
</properties>
@@ -30,7 +30,7 @@
<properties>
<help>MD5 authentication type</help>
<valueHelp>
- <format>&lt;md5&gt;</format>
+ <format>txt</format>
<description>Level-wide password</description>
</valueHelp>
</properties>
@@ -110,20 +110,22 @@
<properties>
<help>Plain-text authentication type</help>
<valueHelp>
- <format>&lt;text&gt;</format>
+ <format>txt</format>
<description>Level-wide password</description>
</valueHelp>
</properties>
</leafNode>
- <!-- <leafNode name="md5">
+<!--
+ <leafNode name="md5">
<properties>
<help>MD5 authentication type</help>
<valueHelp>
- <format>&lt;md5&gt;</format>
+ <format>txt</format>
<description>Level-wide password</description>
</valueHelp>
</properties>
- </leafNode> -->
+ </leafNode>
+-->
</children>
</node>
<leafNode name="dynamic-hostname">
@@ -159,7 +161,7 @@
<properties>
<help>Minimum interval between regenerating same LSP</help>
<valueHelp>
- <format>&lt;1-120&gt;</format>
+ <format>u32:1-120</format>
<description>Minimum interval in seconds</description>
</valueHelp>
<constraint>
@@ -171,7 +173,7 @@
<properties>
<help>Configure the maximum size of generated LSPs</help>
<valueHelp>
- <format>&lt;128-4352&gt;</format>
+ <format>u32:128-4352</format>
<description>Maximum size of generated LSPs</description>
</valueHelp>
<constraint>
@@ -183,7 +185,7 @@
<properties>
<help>LSP refresh interval</help>
<valueHelp>
- <format>&lt;1-65235&gt;</format>
+ <format>u32:1-65235</format>
<description>LSP refresh interval in seconds</description>
</valueHelp>
<constraint>
@@ -195,7 +197,7 @@
<properties>
<help>Maximum LSP lifetime</help>
<valueHelp>
- <format>&lt;350-65535&gt;</format>
+ <format>u32:350-65535</format>
<description>LSP lifetime in seconds</description>
</valueHelp>
<constraint>
@@ -327,7 +329,7 @@
<properties>
<help>Delay used while in QUIET state</help>
<valueHelp>
- <format>&lt;0-60000&gt;</format>
+ <format>u32:0-60000</format>
<description>Delay used while in QUIET state (in ms)</description>
</valueHelp>
<constraint>
@@ -339,7 +341,7 @@
<properties>
<help>Delay used while in SHORT_WAIT state</help>
<valueHelp>
- <format>&lt;0-60000&gt;</format>
+ <format>u32:0-60000</format>
<description>Delay used while in SHORT_WAIT state (in ms)</description>
</valueHelp>
<constraint>
@@ -351,7 +353,7 @@
<properties>
<help>Delay used while in LONG_WAIT</help>
<valueHelp>
- <format>&lt;0-60000&gt;</format>
+ <format>u32:0-60000</format>
<description>Delay used while in LONG_WAIT state (in ms)</description>
</valueHelp>
<constraint>
@@ -363,7 +365,7 @@
<properties>
<help>Time with no received IGP events before considering IGP stable</help>
<valueHelp>
- <format>&lt;0-60000&gt;</format>
+ <format>u32:0-60000</format>
<description>Time with no received IGP events before considering IGP stable (in ms)</description>
</valueHelp>
<constraint>
@@ -375,7 +377,7 @@
<properties>
<help>Maximum duration needed to learn all the events related to a single failure</help>
<valueHelp>
- <format>&lt;0-60000&gt;</format>
+ <format>u32:0-60000</format>
<description>Maximum duration needed to learn all the events related to a single failure (in ms)</description>
</valueHelp>
<constraint>
@@ -389,7 +391,7 @@
<properties>
<help>Minimum interval between SPF calculations</help>
<valueHelp>
- <format>&lt;1-120&gt;</format>
+ <format>u32:1-120</format>
<description>Minimum interval between consecutive SPFs in seconds</description>
</valueHelp>
<constraint>
@@ -446,7 +448,7 @@
<properties>
<help>Set Hello interval</help>
<valueHelp>
- <format>&lt;1-600&gt;</format>
+ <format>u32:1-600</format>
<description>Set Hello interval</description>
</valueHelp>
<constraint>
@@ -458,7 +460,7 @@
<properties>
<help>Set Hello interval</help>
<valueHelp>
- <format>&lt;2-100&gt;</format>
+ <format>u32:2-100</format>
<description>Set multiplier for Hello holding time</description>
</valueHelp>
<constraint>
@@ -470,7 +472,7 @@
<properties>
<help>Set default metric for circuit</help>
<valueHelp>
- <format>&lt;0-16777215&gt;</format>
+ <format>u32:0-16777215</format>
<description>Default metric value</description>
</valueHelp>
<constraint>
@@ -506,7 +508,7 @@
<properties>
<help>Plain-text authentication type</help>
<valueHelp>
- <format>&lt;text&gt;</format>
+ <format>txt</format>
<description>Circuit password</description>
</valueHelp>
</properties>
@@ -517,7 +519,7 @@
<properties>
<help>Set priority for Designated Router election</help>
<valueHelp>
- <format>&lt;0-127&gt;</format>
+ <format>u32:0-127</format>
<description>Priority value</description>
</valueHelp>
<constraint>
@@ -529,7 +531,7 @@
<properties>
<help>Set PSNP interval in seconds</help>
<valueHelp>
- <format>&lt;0-127&gt;</format>
+ <format>u32:0-127</format>
<description>Priority value</description>
</valueHelp>
<constraint>
diff --git a/interface-definitions/protocols-mpls.xml.in b/interface-definitions/protocols-mpls.xml.in
index 284d4d7f3..de1aa436d 100644
--- a/interface-definitions/protocols-mpls.xml.in
+++ b/interface-definitions/protocols-mpls.xml.in
@@ -40,7 +40,7 @@
<properties>
<help>Access-list number</help>
<valueHelp>
- <format>1-2699</format>
+ <format>u32:1-2699</format>
<description>Access list number</description>
</valueHelp>
<constraint>
@@ -59,7 +59,7 @@
<properties>
<help>Access-list6 number</help>
<valueHelp>
- <format>1-2699</format>
+ <format>u32:1-2699</format>
<description>Access list number</description>
</valueHelp>
<constraint>
@@ -95,7 +95,7 @@
<list>disable</list>
</completionHelp>
<valueHelp>
- <format>&lt;1-254&gt;</format>
+ <format>u32:1-254</format>
<description>TTL</description>
</valueHelp>
<valueHelp>
@@ -108,7 +108,7 @@
<properties>
<help>Session IPv4 hold time</help>
<valueHelp>
- <format>15-65535</format>
+ <format>u32:15-65535</format>
<description>Time in seconds</description>
</valueHelp>
<constraint>
@@ -131,7 +131,7 @@
<properties>
<help>Hello IPv4 hold time</help>
<valueHelp>
- <format>1-65535</format>
+ <format>u32:1-65535</format>
<description>Time in seconds</description>
</valueHelp>
<constraint>
@@ -143,7 +143,7 @@
<properties>
<help>Hello IPv4 interval</help>
<valueHelp>
- <format>1-65535</format>
+ <format>u32:1-65535</format>
<description>Time in seconds</description>
</valueHelp>
<constraint>
@@ -155,7 +155,7 @@
<properties>
<help>Hello IPv6 hold time</help>
<valueHelp>
- <format>1-65535</format>
+ <format>u32:1-65535</format>
<description>Time in seconds</description>
</valueHelp>
<constraint>
@@ -167,7 +167,7 @@
<properties>
<help>Hello IPv6 interval</help>
<valueHelp>
- <format>1-65535</format>
+ <format>u32:1-65535</format>
<description>Time in seconds</description>
</valueHelp>
<constraint>
@@ -179,7 +179,7 @@
<properties>
<help>Session IPv4 hold time</help>
<valueHelp>
- <format>15-65535</format>
+ <format>u32:15-65535</format>
<description>Time in seconds</description>
</valueHelp>
<constraint>
@@ -191,7 +191,7 @@
<properties>
<help>Session IPv6 hold time</help>
<valueHelp>
- <format>15-65535</format>
+ <format>u32:15-65535</format>
<description>Time in seconds</description>
</valueHelp>
<constraint>
@@ -258,7 +258,7 @@
<properties>
<help>Hello interval</help>
<valueHelp>
- <format>1-65535</format>
+ <format>u32:1-65535</format>
<description>Time in seconds</description>
</valueHelp>
<constraint>
@@ -270,7 +270,7 @@
<properties>
<help>Hello hold time</help>
<valueHelp>
- <format>1-65535</format>
+ <format>u32:1-65535</format>
<description>Time in seconds</description>
</valueHelp>
<constraint>
@@ -308,7 +308,7 @@
<properties>
<help>Hello interval</help>
<valueHelp>
- <format>1-65535</format>
+ <format>u32:1-65535</format>
<description>Time in seconds</description>
</valueHelp>
<constraint>
@@ -320,7 +320,7 @@
<properties>
<help>Hello hold time</help>
<valueHelp>
- <format>1-65535</format>
+ <format>u32:1-65535</format>
<description>Time in seconds</description>
</valueHelp>
<constraint>
@@ -382,7 +382,7 @@
<properties>
<help>Access-list number to apply FEC filtering</help>
<valueHelp>
- <format>1-2699</format>
+ <format>u32:1-2699</format>
<description>Access list number</description>
</valueHelp>
<constraint>
@@ -394,7 +394,7 @@
<properties>
<help>Access-list number for IPv4 neighbor selection to apply filtering</help>
<valueHelp>
- <format>1-2699</format>
+ <format>u32:1-2699</format>
<description>Access list number</description>
</valueHelp>
<constraint>
@@ -403,7 +403,7 @@
</properties>
</leafNode>
</children>
- </node>
+ </node>
</children>
</node>
<node name="ipv6">
@@ -426,7 +426,7 @@
<properties>
<help>Access-list6 number to apply FEC filtering</help>
<valueHelp>
- <format>1-2699</format>
+ <format>u32:1-2699</format>
<description>Access list number</description>
</valueHelp>
<constraint>
@@ -438,7 +438,7 @@
<properties>
<help>Access-list6 number for IPv6 neighbor selection to apply filtering</help>
<valueHelp>
- <format>1-2699</format>
+ <format>u32:1-2699</format>
<description>Access list number</description>
</valueHelp>
<constraint>
@@ -447,7 +447,7 @@
</properties>
</leafNode>
</children>
- </node>
+ </node>
</children>
</node>
</children>
@@ -471,7 +471,7 @@
<properties>
<help>Access-list number to apply FEC filtering</help>
<valueHelp>
- <format>1-2699</format>
+ <format>u32:1-2699</format>
<description>Access list number</description>
</valueHelp>
<constraint>
@@ -483,7 +483,7 @@
<properties>
<help>Access-list number for IPv4 neighbor selection to apply filtering</help>
<valueHelp>
- <format>1-2699</format>
+ <format>u32:1-2699</format>
<description>Access list number</description>
</valueHelp>
<constraint>
@@ -492,7 +492,7 @@
</properties>
</leafNode>
</children>
- </node>
+ </node>
</children>
</node>
<node name="ipv6">
@@ -509,7 +509,7 @@
<properties>
<help>Access-list6 number to apply FEC filtering</help>
<valueHelp>
- <format>1-2699</format>
+ <format>u32:1-2699</format>
<description>Access list number</description>
</valueHelp>
<constraint>
@@ -521,7 +521,7 @@
<properties>
<help>Access-list6 number for IPv6 neighbor selection to apply filtering</help>
<valueHelp>
- <format>1-2699</format>
+ <format>u32:1-2699</format>
<description>Access list number</description>
</valueHelp>
<constraint>
@@ -530,7 +530,7 @@
</properties>
</leafNode>
</children>
- </node>
+ </node>
</children>
</node>
</children>
@@ -561,7 +561,7 @@
<properties>
<help>Maximum TTL for MPLS packets</help>
<valueHelp>
- <format>1-255</format>
+ <format>u32:1-255</format>
<description>Maximum hops allowed</description>
</valueHelp>
<constraint>
diff --git a/interface-definitions/protocols-rip.xml.in b/interface-definitions/protocols-rip.xml.in
index 107f0e0d5..34d0a5a10 100644
--- a/interface-definitions/protocols-rip.xml.in
+++ b/interface-definitions/protocols-rip.xml.in
@@ -11,7 +11,7 @@
<properties>
<help>Administrative distance</help>
<valueHelp>
- <format>&lt;1-255&gt;</format>
+ <format>u32:1-255</format>
<description>Administrative distance</description>
</valueHelp>
<constraint>
@@ -36,7 +36,7 @@
<properties>
<help>Metric of redistributed routes</help>
<valueHelp>
- <format>&lt;1-16&gt;</format>
+ <format>u32:1-16</format>
<description>Redistributed routes metric</description>
</valueHelp>
<constraint>
@@ -58,7 +58,7 @@
<properties>
<help>Access list to apply to input packets</help>
<valueHelp>
- <format>&lt;0-4294967295&gt;</format>
+ <format>u32</format>
<description>Access list to apply to input packets</description>
</valueHelp>
<completionHelp>
@@ -73,7 +73,7 @@
<properties>
<help>Access list to apply to output packets</help>
<valueHelp>
- <format>&lt;0-4294967295&gt;</format>
+ <format>u32</format>
<description>Access list to apply to output packets</description>
</valueHelp>
<completionHelp>
@@ -90,7 +90,7 @@
<properties>
<help>Apply filtering to an interface</help>
<valueHelp>
- <format>&lt;text&gt;</format>
+ <format>txt</format>
<description>Apply filtering to an interface</description>
</valueHelp>
<completionHelp>
@@ -107,7 +107,7 @@
<properties>
<help>Access list to apply to input packets</help>
<valueHelp>
- <format>&lt;0-4294967295&gt;</format>
+ <format>u32</format>
<description>Access list to apply to input packets</description>
</valueHelp>
<completionHelp>
@@ -122,7 +122,7 @@
<properties>
<help>Access list to apply to output packets</help>
<valueHelp>
- <format>&lt;0-4294967295&gt;</format>
+ <format>u32</format>
<description>Access list to apply to output packets</description>
</valueHelp>
<completionHelp>
@@ -144,7 +144,7 @@
<properties>
<help>Prefix-list to apply to input packets</help>
<valueHelp>
- <format>&lt;text&gt;</format>
+ <format>txt</format>
<description>Prefix-list to apply to input packets</description>
</valueHelp>
<completionHelp>
@@ -156,7 +156,7 @@
<properties>
<help>Prefix-list to apply to output packets</help>
<valueHelp>
- <format>&lt;text&gt;</format>
+ <format>txt</format>
<description>Prefix-list to apply to output packets</description>
</valueHelp>
<completionHelp>
@@ -177,7 +177,7 @@
<properties>
<help>Prefix-list to apply to input packets</help>
<valueHelp>
- <format>&lt;text&gt;</format>
+ <format>txt</format>
<description>Prefix-list to apply to input packets</description>
</valueHelp>
<completionHelp>
@@ -189,7 +189,7 @@
<properties>
<help>Prefix-list to apply to output packets</help>
<valueHelp>
- <format>&lt;text&gt;</format>
+ <format>txt</format>
<description>Prefix-list to apply to output packets</description>
</valueHelp>
<completionHelp>
@@ -205,7 +205,7 @@
<properties>
<help>Interface name</help>
<valueHelp>
- <format>&lt;text&gt;</format>
+ <format>txt</format>
<description>Apply filtering to an interface</description>
</valueHelp>
<completionHelp>
@@ -218,7 +218,7 @@
<properties>
<help>Neighbor router</help>
<valueHelp>
- <format>ipv4</format>
+ <format>ipv4</format>
<description>Neighbor router</description>
</valueHelp>
<constraint>
@@ -231,7 +231,7 @@
<properties>
<help>RIP network</help>
<valueHelp>
- <format>ipv4net</format>
+ <format>ipv4net</format>
<description>RIP network</description>
</valueHelp>
<constraint>
@@ -244,7 +244,7 @@
<properties>
<help>Source network</help>
<valueHelp>
- <format>ipv4net</format>
+ <format>ipv4net</format>
<description>Source network</description>
</valueHelp>
<constraint>
@@ -256,7 +256,7 @@
<properties>
<help>Access list</help>
<valueHelp>
- <format>&lt;text&gt;</format>
+ <format>txt</format>
<description>Access list</description>
</valueHelp>
<completionHelp>
@@ -268,7 +268,7 @@
<properties>
<help>Administrative distance for network</help>
<valueHelp>
- <format>&lt;1-255&gt;</format>
+ <format>u32:1-255</format>
<description>Administrative distance</description>
</valueHelp>
<constraint>
@@ -282,7 +282,7 @@
<properties>
<help>Passive interface</help>
<valueHelp>
- <format>&lt;text&gt;</format>
+ <format>txt</format>
<description>Suppress routing updates on interface</description>
</valueHelp>
<valueHelp>
@@ -347,7 +347,7 @@
<properties>
<help>RIP static route</help>
<valueHelp>
- <format>ipv4net</format>
+ <format>ipv4net</format>
<description>RIP static route</description>
</valueHelp>
<constraint>
@@ -365,7 +365,7 @@
<properties>
<help>Garbage collection timer</help>
<valueHelp>
- <format>&lt;5-2147483647&gt;</format>
+ <format>u32:5-2147483647</format>
<description>Garbage colletion time (default 120)</description>
</valueHelp>
<constraint>
@@ -377,7 +377,7 @@
<properties>
<help>Routing information timeout timer</help>
<valueHelp>
- <format>&lt;5-2147483647&gt;</format>
+ <format>u32:5-2147483647</format>
<description>Routing information timeout timer (default 180)</description>
</valueHelp>
<constraint>
@@ -389,7 +389,7 @@
<properties>
<help>Routing table update timer</help>
<valueHelp>
- <format>&lt;5-2147483647&gt;</format>
+ <format>u32:5-2147483647</format>
<description>Routing table update timer in seconds (default 30)</description>
</valueHelp>
<constraint>
diff --git a/interface-definitions/salt-minion.xml.in b/interface-definitions/salt-minion.xml.in
index 97f882a6a..c43374a0a 100644
--- a/interface-definitions/salt-minion.xml.in
+++ b/interface-definitions/salt-minion.xml.in
@@ -47,7 +47,7 @@
<properties>
<help>Interval in minutes between updates (default: 60)</help>
<valueHelp>
- <format>&lt;1-1440&gt;</format>
+ <format>u32:1-1440</format>
<description>Update interval in minutes</description>
</valueHelp>
<constraint>
diff --git a/interface-definitions/service-ids-ddos-protection.xml.in b/interface-definitions/service-ids-ddos-protection.xml.in
index 93d4cc682..5e65d3106 100644
--- a/interface-definitions/service-ids-ddos-protection.xml.in
+++ b/interface-definitions/service-ids-ddos-protection.xml.in
@@ -75,7 +75,7 @@
<properties>
<help>Flows per second</help>
<valueHelp>
- <format>&lt;0-4294967294&gt;</format>
+ <format>u32:0-4294967294</format>
<description>Flows per second</description>
</valueHelp>
<constraint>
@@ -87,7 +87,7 @@
<properties>
<help>Megabits per second</help>
<valueHelp>
- <format>&lt;0-4294967294&gt;</format>
+ <format>u32:0-4294967294</format>
<description>Megabits per second</description>
</valueHelp>
<constraint>
@@ -99,7 +99,7 @@
<properties>
<help>Packets per second</help>
<valueHelp>
- <format>&lt;0-4294967294&gt;</format>
+ <format>u32:0-4294967294</format>
<description>Packets per second</description>
</valueHelp>
<constraint>
diff --git a/interface-definitions/service_router-advert.xml.in b/interface-definitions/service_router-advert.xml.in
index 5a472fc9a..94255aeb2 100644
--- a/interface-definitions/service_router-advert.xml.in
+++ b/interface-definitions/service_router-advert.xml.in
@@ -185,7 +185,7 @@
<list>infinity</list>
</completionHelp>
<valueHelp>
- <format>0-4294967295</format>
+ <format>u32</format>
<description>Time in seconds that the prefix will remain preferred</description>
</valueHelp>
<valueHelp>
diff --git a/interface-definitions/vpn_ipsec.xml.in b/interface-definitions/vpn_ipsec.xml.in
index e03483a85..c804c1683 100644
--- a/interface-definitions/vpn_ipsec.xml.in
+++ b/interface-definitions/vpn_ipsec.xml.in
@@ -11,7 +11,7 @@
<properties>
<help>Set auto-update interval for IPsec daemon</help>
<valueHelp>
- <format>30-65535</format>
+ <format>u32:30-65535</format>
<description>Auto-update interval (s)</description>
</valueHelp>
<constraint>
@@ -53,7 +53,7 @@
<properties>
<help>ESP lifetime</help>
<valueHelp>
- <format>30-86400</format>
+ <format>u32:30-86400</format>
<description>ESP lifetime in seconds (default 3600)</description>
</valueHelp>
<constraint>
@@ -191,7 +191,7 @@
<properties>
<help>ESP-group proposal [REQUIRED]</help>
<valueHelp>
- <format>&lt;1-65535&gt;</format>
+ <format>u32:1-65535</format>
<description>ESP-group proposal number</description>
</valueHelp>
</properties>
@@ -266,7 +266,7 @@
<properties>
<help>Keep-alive interval</help>
<valueHelp>
- <format>&lt;2-86400&gt;</format>
+ <format>u32:2-86400</format>
<description>Keep-alive interval in seconds (default 30)</description>
</valueHelp>
<constraint>
@@ -278,7 +278,7 @@
<properties>
<help>Dead-Peer-Detection keep-alive timeout (IKEv1 only)</help>
<valueHelp>
- <format>&lt;2-86400&gt;</format>
+ <format>u32:2-86400</format>
<description>Keep-alive timeout in seconds (default 120)</description>
</valueHelp>
<constraint>
@@ -330,7 +330,7 @@
<properties>
<help>IKE lifetime</help>
<valueHelp>
- <format>&lt;30-86400&gt;</format>
+ <format>u32:30-86400</format>
<description>IKE lifetime in seconds (default 28800)</description>
</valueHelp>
<constraint>
@@ -380,7 +380,7 @@
<properties>
<help>proposal_help</help>
<valueHelp>
- <format>&lt;1-65535&gt;</format>
+ <format>u32:1-65535</format>
<description>IKE-group proposal</description>
</valueHelp>
</properties>
@@ -525,7 +525,7 @@
<properties>
<help>strongSwan Logger Level</help>
<valueHelp>
- <format>&lt;0-2&gt;</format>
+ <format>u32:0-2</format>
<description>Logger Verbosity Level (default 0)</description>
</valueHelp>
<constraint>
@@ -712,7 +712,7 @@
<properties>
<help>Pre-shared secret key</help>
<valueHelp>
- <format>&lt;text&gt;</format>
+ <format>txt</format>
<description>Pre-shared secret key</description>
</valueHelp>
</properties>
@@ -767,7 +767,7 @@
<description>IPv6 address of the peer</description>
</valueHelp>
<valueHelp>
- <format>&lt;text&gt;</format>
+ <format>txt</format>
<description>Hostname of the peer</description>
</valueHelp>
<valueHelp>
@@ -785,7 +785,7 @@
<properties>
<help>ID for peer authentication</help>
<valueHelp>
- <format>&lt;text&gt;</format>
+ <format>txt</format>
<description>ID used for peer authentication</description>
</valueHelp>
</properties>
@@ -817,7 +817,7 @@
<properties>
<help>Pre-shared secret key</help>
<valueHelp>
- <format>&lt;text&gt;</format>
+ <format>txt</format>
<description>Pre-shared secret key</description>
</valueHelp>
</properties>
@@ -826,7 +826,7 @@
<properties>
<help>ID for remote authentication</help>
<valueHelp>
- <format>&lt;text&gt;</format>
+ <format>txt</format>
<description>ID used for peer authentication</description>
</valueHelp>
</properties>
@@ -851,7 +851,7 @@
<properties>
<help>File containing the X.509 certificate for the Certificate Authority (CA)</help>
<valueHelp>
- <format>&lt;text&gt;</format>
+ <format>txt</format>
<description>File in /config/auth</description>
</valueHelp>
</properties>
@@ -860,7 +860,7 @@
<properties>
<help>File containing the X.509 certificate for this host</help>
<valueHelp>
- <format>&lt;text&gt;</format>
+ <format>txt</format>
<description>File in /config/auth</description>
</valueHelp>
</properties>
@@ -869,7 +869,7 @@
<properties>
<help>File containing the X.509 Certificate Revocation List (CRL)</help>
<valueHelp>
- <format>&lt;text&gt;</format>
+ <format>txt</format>
<description>File in /config/auth</description>
</valueHelp>
</properties>
@@ -883,7 +883,7 @@
<properties>
<help>File containing the private key for the X.509 certificate for this host</help>
<valueHelp>
- <format>&lt;text&gt;</format>
+ <format>txt</format>
<description>File in /config/auth</description>
</valueHelp>
</properties>
@@ -892,7 +892,7 @@
<properties>
<help>Password that protects the private key</help>
<valueHelp>
- <format>&lt;text&gt;</format>
+ <format>txt</format>
<description>Password that protects the private key</description>
</valueHelp>
</properties>
@@ -1018,7 +1018,7 @@
<properties>
<help>Peer tunnel [REQUIRED]</help>
<valueHelp>
- <format>&lt;0-4294967295&gt;</format>
+ <format>u32</format>
<description>Peer tunnel [REQUIRED]</description>
</valueHelp>
</properties>
diff --git a/interface-definitions/vpn_l2tp.xml.in b/interface-definitions/vpn_l2tp.xml.in
index 82af86470..5b31235b1 100644
--- a/interface-definitions/vpn_l2tp.xml.in
+++ b/interface-definitions/vpn_l2tp.xml.in
@@ -84,7 +84,7 @@
<properties>
<help>File containing the X.509 certificate for the Certificate Authority (CA)</help>
<valueHelp>
- <format>&lt;text&gt;</format>
+ <format>txt</format>
<description>File in /config/auth</description>
</valueHelp>
</properties>
@@ -93,7 +93,7 @@
<properties>
<help>File containing the X.509 Certificate Revocation List (CRL)</help>
<valueHelp>
- <format>&lt;text&gt;</format>
+ <format>txt</format>
<description>File in /config/auth</description>
</valueHelp>
</properties>
@@ -102,7 +102,7 @@
<properties>
<help>File containing the X.509 certificate for the remote access VPN server (this host)</help>
<valueHelp>
- <format>&lt;text&gt;</format>
+ <format>txt</format>
<description>File in /config/auth</description>
</valueHelp>
</properties>
@@ -111,7 +111,7 @@
<properties>
<help>File containing the private key for the X.509 certificate for the remote access VPN server (this host)</help>
<valueHelp>
- <format>&lt;text&gt;</format>
+ <format>txt</format>
<description>File in /config/auth</description>
</valueHelp>
</properties>
@@ -129,7 +129,7 @@
<properties>
<help>IKE lifetime</help>
<valueHelp>
- <format>&lt;30-86400&gt;</format>
+ <format>u32:30-86400</format>
<description>IKE lifetime in seconds (default 3600)</description>
</valueHelp>
<constraint>
@@ -141,7 +141,7 @@
<properties>
<help>ESP lifetime</help>
<valueHelp>
- <format>&lt;30-86400&gt;</format>
+ <format>u32:30-86400</format>
<description>IKE lifetime in seconds (default 3600)</description>
</valueHelp>
<constraint>
@@ -176,7 +176,7 @@
<properties>
<help>PPP idle timeout</help>
<valueHelp>
- <format>&lt;30-86400&gt;</format>
+ <format>u32:30-86400</format>
<description>PPP idle timeout in seconds (default 1800)</description>
</valueHelp>
<constraint>
diff --git a/interface-definitions/vpn_openconnect.xml.in b/interface-definitions/vpn_openconnect.xml.in
index 203f85bbc..791efcd80 100644
--- a/interface-definitions/vpn_openconnect.xml.in
+++ b/interface-definitions/vpn_openconnect.xml.in
@@ -64,7 +64,7 @@
<properties>
<help>Session timeout</help>
<valueHelp>
- <format>1-30</format>
+ <format>u32:1-30</format>
<description>Session timeout in seconds (default: 2)</description>
</valueHelp>
<constraint>
@@ -87,7 +87,7 @@
<properties>
<help>tcp port number to accept connections (default: 443)</help>
<valueHelp>
- <format>1-65535</format>
+ <format>u32:1-65535</format>
<description>Numeric IP port (default: 443)</description>
</valueHelp>
<constraint>
@@ -100,7 +100,7 @@
<properties>
<help>udp port number to accept connections (default: 443)</help>
<valueHelp>
- <format>1-65535</format>
+ <format>u32:1-65535</format>
<description>Numeric IP port (default: 443)</description>
</valueHelp>
<constraint>
@@ -220,7 +220,7 @@
<properties>
<help>Prefix length used for individual client</help>
<valueHelp>
- <format>&lt;48-128&gt;</format>
+ <format>u32:48-128</format>
<description>Client prefix length (default: 64)</description>
</valueHelp>
<constraint>
diff --git a/interface-definitions/vrrp.xml.in b/interface-definitions/vrrp.xml.in
index ec0a71a95..c6a32930f 100644
--- a/interface-definitions/vrrp.xml.in
+++ b/interface-definitions/vrrp.xml.in
@@ -28,7 +28,7 @@
<properties>
<help>Advertise interval</help>
<valueHelp>
- <format>1-255</format>
+ <format>u32:1-255</format>
<description>Advertise interval in seconds (default: 1)</description>
</valueHelp>
<constraint>
@@ -112,28 +112,36 @@
</node>
<leafNode name="hello-source-address">
<properties>
- <help>VRRP hello source address (IPv4 or IPv6)</help>
+ <help>VRRP hello source address</help>
+ <valueHelp>
+ <format>ipv4</format>
+ <description>IPv4 hello source address</description>
+ </valueHelp>
+ <valueHelp>
+ <format>ipv6</format>
+ <description>IPv6 hello source address</description>
+ </valueHelp>
<constraint>
<validator name="ipv4-address"/>
<validator name="ipv6-address"/>
</constraint>
- <valueHelp>
- <format>&lt;IPv4|IPv6&gt;</format>
- <description>IPv4 or IPv6 hello source address</description>
- </valueHelp>
</properties>
</leafNode>
<leafNode name="peer-address">
<properties>
- <help>Unicast VRRP peer address (IPv4 or IPv6)</help>
+ <help>Unicast VRRP peer address</help>
+ <valueHelp>
+ <format>ipv4</format>
+ <description>IPv4 unicast peer address</description>
+ </valueHelp>
+ <valueHelp>
+ <format>ipv6</format>
+ <description>IPv6 unicast peer address</description>
+ </valueHelp>
<constraint>
<validator name="ipv4-address"/>
<validator name="ipv6-address"/>
</constraint>
- <valueHelp>
- <format>&lt;IPv4|IPv6&gt;</format>
- <description>IPv4 or IPv6 unicast peer address</description>
- </valueHelp>
</properties>
</leafNode>
<leafNode name="no-preempt">
@@ -145,6 +153,10 @@
<leafNode name="preempt-delay">
<properties>
<help>Preempt delay (in seconds)</help>
+ <valueHelp>
+ <format>u32:0-1000</format>
+ <description>preempt delay</description>
+ </valueHelp>
<constraint>
<validator name="numeric" argument="--range 0-1000"/>
</constraint>
@@ -152,14 +164,14 @@
</leafNode>
<leafNode name="priority">
<properties>
- <help>Router priority</help>
+ <help>Router priority (default: 100)</help>
+ <valueHelp>
+ <format>u32:1-255</format>
+ <description>Router priority</description>
+ </valueHelp>
<constraint>
<validator name="numeric" argument="--range 1-255"/>
</constraint>
- <valueHelp>
- <format>1-255</format>
- <description>Router priority (default: 100)</description>
- </valueHelp>
</properties>
</leafNode>
<leafNode name="rfc3768-compatibility">
@@ -209,17 +221,21 @@
</node>
<leafNode name="virtual-address">
<properties>
- <multi/>
<help>Virtual address (IPv4 or IPv6, but they must not be mixed in one group)</help>
+ <valueHelp>
+ <format>ipv4</format>
+ <description>IPv4 virtual address</description>
+ </valueHelp>
+ <valueHelp>
+ <format>ipv6</format>
+ <description>IPv6 virtual address</description>
+ </valueHelp>
<constraint>
<validator name="ipv4-host"/>
<validator name="ipv6-host"/>
</constraint>
<constraintErrorMessage>Virtual address must be a valid IPv4 or IPv6 address with prefix length (e.g. 192.0.2.3/24 or 2001:db8:ff::10/64)</constraintErrorMessage>
- <valueHelp>
- <format>&lt;IPv4|IPv6&gt;</format>
- <description>IPv4 or IPv6 virtual address</description>
- </valueHelp>
+ <multi/>
</properties>
</leafNode>
<leafNode name="virtual-address-excluded">
@@ -244,13 +260,13 @@
<leafNode name="vrid">
<properties>
<help>Virtual router identifier</help>
- <constraint>
- <validator name="numeric" argument="--range 1-255"/>
- </constraint>
<valueHelp>
- <format>1-255</format>
+ <format>u32:1-255</format>
<description>Virtual router identifier</description>
</valueHelp>
+ <constraint>
+ <validator name="numeric" argument="--range 1-255"/>
+ </constraint>
</properties>
</leafNode>
</children>