From 19161b72ea9d06327e75360e121753b5f9a754c8 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 27 Dec 2020 13:00:13 +0100 Subject: xml: fix valueHelp format strings A pre-defined list of common format strings to be used inside the node of is available from [1]. Adjust all currently in use nodes to re-use the predefined strings over writing them on their own by even encapsulating the <> signs as < and >. [1]: https://github.com/vyos/vyatta-cfg/blob/5aec1a0429f2f/etc/bash_completion.d/vyatta-cfg#L515-L566 --- interface-definitions/cron.xml.in | 2 +- interface-definitions/dhcp-server.xml.in | 2 +- interface-definitions/flow-accounting-conf.xml.in | 10 ++-- .../include/accel-client-ipv6-pool.xml.i | 4 +- .../bgp-afi-redistribute-metric-route-map.xml.i | 2 +- .../include/bgp-neighbor-afi-ipv4-unicast.xml.i | 10 ++-- .../include/bgp-neighbor-afi-ipv6-unicast.xml.i | 10 ++-- .../include/bgp-peer-group-afi-ipv4-unicast.xml.i | 10 ++-- .../include/bgp-peer-group-afi-ipv6-unicast.xml.i | 10 ++-- .../include/isis-redistribute-ipv4.xml.i | 4 +- .../include/nat-translation-port.xml.i | 2 +- .../include/rip-redistribute.xml.i | 4 +- interface-definitions/interfaces-bonding.xml.in | 4 +- interface-definitions/interfaces-tunnel.xml.in | 2 +- interface-definitions/interfaces-wireless.xml.in | 20 +++---- interface-definitions/lldp.xml.in | 2 +- interface-definitions/policy-local-route.xml.in | 4 +- interface-definitions/protocols-bgp.xml.in | 70 +++++++++++----------- interface-definitions/protocols-isis.xml.in | 46 +++++++------- interface-definitions/protocols-mpls.xml.in | 54 ++++++++--------- interface-definitions/protocols-rip.xml.in | 44 +++++++------- interface-definitions/salt-minion.xml.in | 2 +- .../service-ids-ddos-protection.xml.in | 6 +- interface-definitions/service_router-advert.xml.in | 2 +- interface-definitions/vpn_ipsec.xml.in | 38 ++++++------ interface-definitions/vpn_l2tp.xml.in | 14 ++--- interface-definitions/vpn_openconnect.xml.in | 8 +-- interface-definitions/vrrp.xml.in | 66 ++++++++++++-------- 28 files changed, 235 insertions(+), 217 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 @@ Scheduled task - <string> + txt Task name 999 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 @@ Lease timeout in seconds (default: 86400) - 0-4294967295 + u32 DHCP lease time in seconds 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 @@ Buffer size - 0-4294967295 + u32 Buffer size in MiB @@ -158,7 +158,7 @@ NetFlow engine-id for v5 - 0-4294967295 + u32 NetFlow engine-id for v9 / IPFIX @@ -170,7 +170,7 @@ NetFlow maximum flows - 0-4294967295 + u32 NetFlow maximum flows @@ -182,7 +182,7 @@ NetFlow sampling-rate - 0-4294967295 + u32 Sampling rate (1 in N packets) @@ -389,7 +389,7 @@ sFlow sampling-rate - 0-4294967295 + u32 Sampling rate (1 in N packets) 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 @@ Prefix length used for individual client - <48-128> + u32:48-128 Client prefix length (default: 64) @@ -46,7 +46,7 @@ Prefix length delegated to client - <32-64> + u32:32-64 Delegated prefix length 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 @@ Metric for redistributed routes - <1-4294967295> + u32:1-4294967295 Metric for redistributed routes 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 @@ Number of occurrences of AS number - <1-10> + u32:1-10 Number of times AS is allowed in path @@ -114,7 +114,7 @@ policy access-list - <1-65535> + u32:1-65535 Access-list to filter outgoing IPv4-route updates to this neighbor @@ -129,7 +129,7 @@ policy access-list - <1-65535> + u32:1-65535 Access-list to filter incoming IPv4-route updates from this neighbor @@ -166,7 +166,7 @@ Maximum number of IPv4-prefixes to accept from this neighbor - <1-4294967295> + u32:1-4294967295 Prefix limit @@ -273,7 +273,7 @@ Default weight for routes from this neighbor - <1-65535> + u32:1-65535 Weight for routes from this neighbor 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 @@ Number of occurrences of AS number - <1-10> + u32:1-10 Number of times AS is allowed in path @@ -140,7 +140,7 @@ policy access-list6 - <1-65535> + u32:1-65535 Access-list to filter outgoing route updates to this neighbor @@ -155,7 +155,7 @@ policy access-list6 - <1-65535> + u32:1-65535 Access-list to filter incoming route updates from this neighbor @@ -192,7 +192,7 @@ Maximum number of prefixes to accept from this neighbor - <1-4294967295> + u32:1-4294967295 Prefix limit @@ -318,7 +318,7 @@ Default weight for routes from this neighbor - <1-65535> + u32:1-65535 Weight for routes from this neighbor 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 @@ Number of occurrences of AS number - <1-10> + u32:1-10 Number of times AS is allowed in path @@ -130,7 +130,7 @@ policy access-list - <1-65535> + u32:1-65535 Access-list to filter outgoing route updates to this peer-group @@ -145,7 +145,7 @@ policy access-list - <1-65535> + u32:1-65535 Access-list to filter incoming route updates from this peer-group @@ -182,7 +182,7 @@ Maximum number of prefixes to accept from this peer-group - <1-4294967295> + u32:1-4294967295 Prefix limit @@ -290,7 +290,7 @@ Default weight for routes from this peer-group - <1-65535> + u32:1-65535 Weight for routes from this peer-group 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 @@ Number of occurrences of AS number - <1-10> + u32:1-10 Number of times AS is allowed in path @@ -133,7 +133,7 @@ policy access-list6 - <1-65535> + u32:1-65535 Access-list to filter outgoing route updates to this peer-group @@ -148,7 +148,7 @@ policy access-list6 - <1-65535> + u32:1-65535 Access-list to filter incoming route updates from this peer-group @@ -185,7 +185,7 @@ Maximum number of prefixes to accept from this peer-group - <1-4294967295> + u32:1-4294967295 Prefix limit @@ -306,7 +306,7 @@ Default weight for routes from this peer-group - <1-65535> + u32:1-65535 Weight for routes from this peer-group 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 @@ Metric for redistributed routes - <0-16777215> + u32:0-16777215 ISIS default metric @@ -35,7 +35,7 @@ Metric for redistributed routes - <0-16777215> + u32:0-16777215 ISIS default metric 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 @@ Numeric IP port - <start>-<end> + range Numbered port range (e.g., 1001-1005) 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 @@ Metric for redistributed routes - <1-16> + u32:1-16 Redistribute route metric @@ -15,7 +15,7 @@ Route map reference - <text> + txt Route map reference 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 @@ ARP link monitoring interval - 0-4294967295 + u32 Specifies the ARP link monitoring frequency in milliseconds @@ -88,7 +88,7 @@ Minimum number of member interfaces required up before enabling bond - <0-16> + u32:0-16 Minimum number of member interfaces required up before enabling bond 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 @@ Tunnel key - 0-4294967295 + u32 Tunnel key 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 @@ VHT operating channel center frequency - center freq 1 (for use with 80, 80+80 and 160 modes) - <34-173> + u32:34-173 5Ghz (802.11 a/h/j/n/ac) center channel index (use 42 for primary 80MHz channel 36) @@ -270,7 +270,7 @@ VHT operating channel center frequency - center freq 2 (for use with the 80+80 mode) - 34-173 + u32:34-173 5Ghz (802.11 a/h/j/n/ac) center channel index (use 58 for primary 80MHz channel 52) @@ -338,7 +338,7 @@ Set the maximum length of A-MPDU pre-EOF padding that the station can receive - <0-7> + u32:0-7 Maximum length of A-MPDU pre-EOF padding = 2 pow(13 + x) -1 octets @@ -435,11 +435,11 @@ Automatic Channel Selection (ACS) - <1-14> + u32:1-14 2.4Ghz (802.11 b/g/n) Channel - <34-173> + u32:34-173 5Ghz (802.11 a/h/j/n/ac) Channel @@ -455,7 +455,7 @@ us eu jp de uk cn es fr ru - <code%gt; + txt ISO/IEC 3166-1 Country Code @@ -496,7 +496,7 @@ Maximum number of wireless radio stations. Excess stations will be rejected upon authentication request. - <1-2007> + u32:1-2007 Number of allowed stations @@ -576,7 +576,7 @@ Transmission power reduction in dBm - <0-255> + u32:0-255 TX power reduction in dBm @@ -599,7 +599,7 @@ WEP encryption key - <hexdigits> + txt Wired Equivalent Privacy key @@ -713,7 +713,7 @@ using special characters in the WPA passphrase then single quotes are required. - <text> + txt Passphrase of at least 8 but not more than 63 printable characters 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 @@ Location data all interfaces - <intf> + txt Location data for a specific interface 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 @@ Policy local-route rule set number - <1-32765> + u32:1-32765 Local-route rule number (1-219) @@ -30,7 +30,7 @@ Routing table to forward packet with - <1-200> + u32:1-200 Table number 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 @@ Border Gateway Protocol (BGP) parameters - <1-4294967294> + u32:1-4294967294 AS number @@ -159,7 +159,7 @@ AS-path hopcount limit - <0-255> + u32:0-255 AS path hop count limit @@ -242,7 +242,7 @@ Maximum ebgp multipaths - <1-255> + u32:1-255 EBGP multipaths @@ -254,7 +254,7 @@ Maximum ibgp multipaths - <1-255> + u32:1-255 EBGP multipaths @@ -276,7 +276,7 @@ BGP neighbor IPv6 address - <interface> + txt Interface name @@ -299,7 +299,7 @@ Minimum interval for sending routing updates - <0-600> + u32:0-600 Advertisement interval in seconds @@ -379,7 +379,7 @@ Allow this EBGP neighbor to not be on a directly connected network - <1-255> + u32:1-255 Number of hops @@ -404,7 +404,7 @@ external internal - <1-4294967294> + u32:1-4294967294 Neighbor AS number @@ -439,7 +439,7 @@ external internal - <1-4294967294> + u32:1-4294967294 Neighbor AS number @@ -465,7 +465,7 @@ Local AS number - <1-4294967294> + u32:1-4294967294 Local AS number @@ -522,7 +522,7 @@ external internal - <1-4294967294> + u32:1-4294967294 Neighbor AS number @@ -561,7 +561,7 @@ BGP connect timer for this neighbor - <1-65535> + u32:1-65535 Connect timer in seconds @@ -577,7 +577,7 @@ BGP hold timer for this neighbor - <1-65535> + u32:1-65535 Hold timer in seconds @@ -593,7 +593,7 @@ BGP keepalive interval for this neighbor - <1-65535> + u32:1-65535 Keepalive interval in seconds (default 60) @@ -612,7 +612,7 @@ Number of the maximum number of hops to the BGP peer - <1-254> + u32:1-254 Number of hops @@ -635,7 +635,7 @@ IPv6 address of route source - <interface> + txt Interface as route source @@ -736,7 +736,7 @@ Confederation AS identifier [REQUIRED] - <1-4294967294> + u32:1-4294967294 Confederation AS id @@ -748,7 +748,7 @@ Peer ASs in the BGP confederation - <1-4294967294> + u32:1-4294967294 Peer AS number @@ -767,7 +767,7 @@ Half-life time for dampening [REQUIRED] - <1-45> + u32:1-45 Half-life penalty in seconds @@ -779,7 +779,7 @@ Maximum duration to suppress a stable route [REQUIRED] - <1-255> + u32:1-255 Maximum suppress duration in seconds @@ -791,7 +791,7 @@ Time to start reusing a route [REQUIRED] - <1-20000> + u32:1-20000 Re-use time in seconds @@ -803,7 +803,7 @@ When to start suppressing a route [REQUIRED] - <1-20000> + u32:1-20000 Start-suppress-time @@ -822,7 +822,7 @@ Default local preference - <0-4294967295> + u32 Local preference @@ -858,7 +858,7 @@ Administrative distance for external BGP routes - <1-255> + u32:1-255 Administrative distance for external BGP routes @@ -870,7 +870,7 @@ Administrative distance for internal BGP routes - <1-255> + u32:1-255 Administrative distance for internal BGP routes @@ -882,7 +882,7 @@ Administrative distance for local BGP routes - <1-255> + u32:1-255 Administrative distance for internal BGP routes @@ -908,7 +908,7 @@ Administrative distance for prefix - <1-255> + u32:1-255 Administrative distance for external BGP routes @@ -929,7 +929,7 @@ Maximum time to hold onto restarting neighbors stale paths - <1-3600> + u32:1-3600 Hold time in seconds @@ -1038,7 +1038,7 @@ Allow this EBGP peer-group to not be on a directly connected network - <1-255> + u32:1-255 Number of hops @@ -1050,7 +1050,7 @@ Local AS number [REQUIRED] - <1-4294967294> + u32:1-4294967294 Local AS number @@ -1090,7 +1090,7 @@ external internal - <1-4294967294> + u32:1-4294967294 Neighbor AS number @@ -1123,7 +1123,7 @@ Number of the maximum number of hops to the BGP peer - <1-254> + u32:1-254 Number of hops @@ -1146,7 +1146,7 @@ IPv6 address of route source - <interface> + txt Interface as route source @@ -1175,7 +1175,7 @@ BGP holdtime interval - <4-65535> + u32:4-65535 Hold-time in seconds (default 180) @@ -1191,7 +1191,7 @@ Keepalive interval - <1-65535> + u32:1-65535 Keep-alive time in seconds (default 60) 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 @@ Plain-text authentication type - <text> + txt Level-wide password @@ -30,7 +30,7 @@ MD5 authentication type - <md5> + txt Level-wide password @@ -110,20 +110,22 @@ Plain-text authentication type - <text> + txt Level-wide password - + +--> @@ -159,7 +161,7 @@ Minimum interval between regenerating same LSP - <1-120> + u32:1-120 Minimum interval in seconds @@ -171,7 +173,7 @@ Configure the maximum size of generated LSPs - <128-4352> + u32:128-4352 Maximum size of generated LSPs @@ -183,7 +185,7 @@ LSP refresh interval - <1-65235> + u32:1-65235 LSP refresh interval in seconds @@ -195,7 +197,7 @@ Maximum LSP lifetime - <350-65535> + u32:350-65535 LSP lifetime in seconds @@ -327,7 +329,7 @@ Delay used while in QUIET state - <0-60000> + u32:0-60000 Delay used while in QUIET state (in ms) @@ -339,7 +341,7 @@ Delay used while in SHORT_WAIT state - <0-60000> + u32:0-60000 Delay used while in SHORT_WAIT state (in ms) @@ -351,7 +353,7 @@ Delay used while in LONG_WAIT - <0-60000> + u32:0-60000 Delay used while in LONG_WAIT state (in ms) @@ -363,7 +365,7 @@ Time with no received IGP events before considering IGP stable - <0-60000> + u32:0-60000 Time with no received IGP events before considering IGP stable (in ms) @@ -375,7 +377,7 @@ Maximum duration needed to learn all the events related to a single failure - <0-60000> + u32:0-60000 Maximum duration needed to learn all the events related to a single failure (in ms) @@ -389,7 +391,7 @@ Minimum interval between SPF calculations - <1-120> + u32:1-120 Minimum interval between consecutive SPFs in seconds @@ -446,7 +448,7 @@ Set Hello interval - <1-600> + u32:1-600 Set Hello interval @@ -458,7 +460,7 @@ Set Hello interval - <2-100> + u32:2-100 Set multiplier for Hello holding time @@ -470,7 +472,7 @@ Set default metric for circuit - <0-16777215> + u32:0-16777215 Default metric value @@ -506,7 +508,7 @@ Plain-text authentication type - <text> + txt Circuit password @@ -517,7 +519,7 @@ Set priority for Designated Router election - <0-127> + u32:0-127 Priority value @@ -529,7 +531,7 @@ Set PSNP interval in seconds - <0-127> + u32:0-127 Priority value 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 @@ Access-list number - 1-2699 + u32:1-2699 Access list number @@ -59,7 +59,7 @@ Access-list6 number - 1-2699 + u32:1-2699 Access list number @@ -95,7 +95,7 @@ disable - <1-254> + u32:1-254 TTL @@ -108,7 +108,7 @@ Session IPv4 hold time - 15-65535 + u32:15-65535 Time in seconds @@ -131,7 +131,7 @@ Hello IPv4 hold time - 1-65535 + u32:1-65535 Time in seconds @@ -143,7 +143,7 @@ Hello IPv4 interval - 1-65535 + u32:1-65535 Time in seconds @@ -155,7 +155,7 @@ Hello IPv6 hold time - 1-65535 + u32:1-65535 Time in seconds @@ -167,7 +167,7 @@ Hello IPv6 interval - 1-65535 + u32:1-65535 Time in seconds @@ -179,7 +179,7 @@ Session IPv4 hold time - 15-65535 + u32:15-65535 Time in seconds @@ -191,7 +191,7 @@ Session IPv6 hold time - 15-65535 + u32:15-65535 Time in seconds @@ -258,7 +258,7 @@ Hello interval - 1-65535 + u32:1-65535 Time in seconds @@ -270,7 +270,7 @@ Hello hold time - 1-65535 + u32:1-65535 Time in seconds @@ -308,7 +308,7 @@ Hello interval - 1-65535 + u32:1-65535 Time in seconds @@ -320,7 +320,7 @@ Hello hold time - 1-65535 + u32:1-65535 Time in seconds @@ -382,7 +382,7 @@ Access-list number to apply FEC filtering - 1-2699 + u32:1-2699 Access list number @@ -394,7 +394,7 @@ Access-list number for IPv4 neighbor selection to apply filtering - 1-2699 + u32:1-2699 Access list number @@ -403,7 +403,7 @@ - + @@ -426,7 +426,7 @@ Access-list6 number to apply FEC filtering - 1-2699 + u32:1-2699 Access list number @@ -438,7 +438,7 @@ Access-list6 number for IPv6 neighbor selection to apply filtering - 1-2699 + u32:1-2699 Access list number @@ -447,7 +447,7 @@ - + @@ -471,7 +471,7 @@ Access-list number to apply FEC filtering - 1-2699 + u32:1-2699 Access list number @@ -483,7 +483,7 @@ Access-list number for IPv4 neighbor selection to apply filtering - 1-2699 + u32:1-2699 Access list number @@ -492,7 +492,7 @@ - + @@ -509,7 +509,7 @@ Access-list6 number to apply FEC filtering - 1-2699 + u32:1-2699 Access list number @@ -521,7 +521,7 @@ Access-list6 number for IPv6 neighbor selection to apply filtering - 1-2699 + u32:1-2699 Access list number @@ -530,7 +530,7 @@ - + @@ -561,7 +561,7 @@ Maximum TTL for MPLS packets - 1-255 + u32:1-255 Maximum hops allowed 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 @@ Administrative distance - <1-255> + u32:1-255 Administrative distance @@ -36,7 +36,7 @@ Metric of redistributed routes - <1-16> + u32:1-16 Redistributed routes metric @@ -58,7 +58,7 @@ Access list to apply to input packets - <0-4294967295> + u32 Access list to apply to input packets @@ -73,7 +73,7 @@ Access list to apply to output packets - <0-4294967295> + u32 Access list to apply to output packets @@ -90,7 +90,7 @@ Apply filtering to an interface - <text> + txt Apply filtering to an interface @@ -107,7 +107,7 @@ Access list to apply to input packets - <0-4294967295> + u32 Access list to apply to input packets @@ -122,7 +122,7 @@ Access list to apply to output packets - <0-4294967295> + u32 Access list to apply to output packets @@ -144,7 +144,7 @@ Prefix-list to apply to input packets - <text> + txt Prefix-list to apply to input packets @@ -156,7 +156,7 @@ Prefix-list to apply to output packets - <text> + txt Prefix-list to apply to output packets @@ -177,7 +177,7 @@ Prefix-list to apply to input packets - <text> + txt Prefix-list to apply to input packets @@ -189,7 +189,7 @@ Prefix-list to apply to output packets - <text> + txt Prefix-list to apply to output packets @@ -205,7 +205,7 @@ Interface name - <text> + txt Apply filtering to an interface @@ -218,7 +218,7 @@ Neighbor router - ipv4 + ipv4 Neighbor router @@ -231,7 +231,7 @@ RIP network - ipv4net + ipv4net RIP network @@ -244,7 +244,7 @@ Source network - ipv4net + ipv4net Source network @@ -256,7 +256,7 @@ Access list - <text> + txt Access list @@ -268,7 +268,7 @@ Administrative distance for network - <1-255> + u32:1-255 Administrative distance @@ -282,7 +282,7 @@ Passive interface - <text> + txt Suppress routing updates on interface @@ -347,7 +347,7 @@ RIP static route - ipv4net + ipv4net RIP static route @@ -365,7 +365,7 @@ Garbage collection timer - <5-2147483647> + u32:5-2147483647 Garbage colletion time (default 120) @@ -377,7 +377,7 @@ Routing information timeout timer - <5-2147483647> + u32:5-2147483647 Routing information timeout timer (default 180) @@ -389,7 +389,7 @@ Routing table update timer - <5-2147483647> + u32:5-2147483647 Routing table update timer in seconds (default 30) 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 @@ Interval in minutes between updates (default: 60) - <1-1440> + u32:1-1440 Update interval in minutes 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 @@ Flows per second - <0-4294967294> + u32:0-4294967294 Flows per second @@ -87,7 +87,7 @@ Megabits per second - <0-4294967294> + u32:0-4294967294 Megabits per second @@ -99,7 +99,7 @@ Packets per second - <0-4294967294> + u32:0-4294967294 Packets per second 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 @@ infinity - 0-4294967295 + u32 Time in seconds that the prefix will remain preferred 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 @@ Set auto-update interval for IPsec daemon - 30-65535 + u32:30-65535 Auto-update interval (s) @@ -53,7 +53,7 @@ ESP lifetime - 30-86400 + u32:30-86400 ESP lifetime in seconds (default 3600) @@ -191,7 +191,7 @@ ESP-group proposal [REQUIRED] - <1-65535> + u32:1-65535 ESP-group proposal number @@ -266,7 +266,7 @@ Keep-alive interval - <2-86400> + u32:2-86400 Keep-alive interval in seconds (default 30) @@ -278,7 +278,7 @@ Dead-Peer-Detection keep-alive timeout (IKEv1 only) - <2-86400> + u32:2-86400 Keep-alive timeout in seconds (default 120) @@ -330,7 +330,7 @@ IKE lifetime - <30-86400> + u32:30-86400 IKE lifetime in seconds (default 28800) @@ -380,7 +380,7 @@ proposal_help - <1-65535> + u32:1-65535 IKE-group proposal @@ -525,7 +525,7 @@ strongSwan Logger Level - <0-2> + u32:0-2 Logger Verbosity Level (default 0) @@ -712,7 +712,7 @@ Pre-shared secret key - <text> + txt Pre-shared secret key @@ -767,7 +767,7 @@ IPv6 address of the peer - <text> + txt Hostname of the peer @@ -785,7 +785,7 @@ ID for peer authentication - <text> + txt ID used for peer authentication @@ -817,7 +817,7 @@ Pre-shared secret key - <text> + txt Pre-shared secret key @@ -826,7 +826,7 @@ ID for remote authentication - <text> + txt ID used for peer authentication @@ -851,7 +851,7 @@ File containing the X.509 certificate for the Certificate Authority (CA) - <text> + txt File in /config/auth @@ -860,7 +860,7 @@ File containing the X.509 certificate for this host - <text> + txt File in /config/auth @@ -869,7 +869,7 @@ File containing the X.509 Certificate Revocation List (CRL) - <text> + txt File in /config/auth @@ -883,7 +883,7 @@ File containing the private key for the X.509 certificate for this host - <text> + txt File in /config/auth @@ -892,7 +892,7 @@ Password that protects the private key - <text> + txt Password that protects the private key @@ -1018,7 +1018,7 @@ Peer tunnel [REQUIRED] - <0-4294967295> + u32 Peer tunnel [REQUIRED] 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 @@ File containing the X.509 certificate for the Certificate Authority (CA) - <text> + txt File in /config/auth @@ -93,7 +93,7 @@ File containing the X.509 Certificate Revocation List (CRL) - <text> + txt File in /config/auth @@ -102,7 +102,7 @@ File containing the X.509 certificate for the remote access VPN server (this host) - <text> + txt File in /config/auth @@ -111,7 +111,7 @@ File containing the private key for the X.509 certificate for the remote access VPN server (this host) - <text> + txt File in /config/auth @@ -129,7 +129,7 @@ IKE lifetime - <30-86400> + u32:30-86400 IKE lifetime in seconds (default 3600) @@ -141,7 +141,7 @@ ESP lifetime - <30-86400> + u32:30-86400 IKE lifetime in seconds (default 3600) @@ -176,7 +176,7 @@ PPP idle timeout - <30-86400> + u32:30-86400 PPP idle timeout in seconds (default 1800) 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 @@ Session timeout - 1-30 + u32:1-30 Session timeout in seconds (default: 2) @@ -87,7 +87,7 @@ tcp port number to accept connections (default: 443) - 1-65535 + u32:1-65535 Numeric IP port (default: 443) @@ -100,7 +100,7 @@ udp port number to accept connections (default: 443) - 1-65535 + u32:1-65535 Numeric IP port (default: 443) @@ -220,7 +220,7 @@ Prefix length used for individual client - <48-128> + u32:48-128 Client prefix length (default: 64) 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 @@ Advertise interval - 1-255 + u32:1-255 Advertise interval in seconds (default: 1) @@ -112,28 +112,36 @@ - VRRP hello source address (IPv4 or IPv6) + VRRP hello source address + + ipv4 + IPv4 hello source address + + + ipv6 + IPv6 hello source address + - - <IPv4|IPv6> - IPv4 or IPv6 hello source address - - Unicast VRRP peer address (IPv4 or IPv6) + Unicast VRRP peer address + + ipv4 + IPv4 unicast peer address + + + ipv6 + IPv6 unicast peer address + - - <IPv4|IPv6> - IPv4 or IPv6 unicast peer address - @@ -145,6 +153,10 @@ Preempt delay (in seconds) + + u32:0-1000 + preempt delay + @@ -152,14 +164,14 @@ - Router priority + Router priority (default: 100) + + u32:1-255 + Router priority + - - 1-255 - Router priority (default: 100) - @@ -209,17 +221,21 @@ - Virtual address (IPv4 or IPv6, but they must not be mixed in one group) + + ipv4 + IPv4 virtual address + + + ipv6 + IPv6 virtual address + 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) - - <IPv4|IPv6> - IPv4 or IPv6 virtual address - + @@ -244,13 +260,13 @@ Virtual router identifier - - - - 1-255 + u32:1-255 Virtual router identifier + + + -- cgit v1.2.3