diff options
author | Christian Poessinger <christian@poessinger.com> | 2020-12-27 13:00:13 +0100 |
---|---|---|
committer | Christian Poessinger <christian@poessinger.com> | 2020-12-27 13:00:13 +0100 |
commit | 19161b72ea9d06327e75360e121753b5f9a754c8 (patch) | |
tree | 8e865ec47364b21af84691d4ddb1b886ad06d1bd /interface-definitions/include | |
parent | b32385f9acef1630771838a4e0baa9d0c40dd98e (diff) | |
download | vyos-1x-19161b72ea9d06327e75360e121753b5f9a754c8.tar.gz vyos-1x-19161b72ea9d06327e75360e121753b5f9a754c8.zip |
xml: fix valueHelp format strings
A pre-defined list of common format strings to be used inside the <format> node
of <valueHelp> is available from [1]. Adjust all currently in use <format> 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
Diffstat (limited to 'interface-definitions/include')
9 files changed, 28 insertions, 28 deletions
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><48-128></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><32-64></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><1-4294967295></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><1-10></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><1-65535></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><1-65535></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><1-4294967295></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><1-65535></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><1-10></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><1-65535></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><1-65535></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><1-4294967295></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><1-65535></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><1-10></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><1-65535></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><1-65535></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><1-4294967295></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><1-65535></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><1-10></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><1-65535></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><1-65535></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><1-4294967295></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><1-65535></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><0-16777215></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><0-16777215></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><start>-<end></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><1-16></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><text></format> + <format>txt</format> <description>Route map reference</description> </valueHelp> <completionHelp> |