diff options
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/include/dhcpv6-options.xml.i | 85 | ||||
| -rw-r--r-- | interface-definitions/protocols-bgp.xml.in | 18 |
2 files changed, 61 insertions, 42 deletions
diff --git a/interface-definitions/include/dhcpv6-options.xml.i b/interface-definitions/include/dhcpv6-options.xml.i index 2c5058d2c..98a87dba2 100644 --- a/interface-definitions/include/dhcpv6-options.xml.i +++ b/interface-definitions/include/dhcpv6-options.xml.i @@ -3,52 +3,71 @@ <help>DHCPv6 options</help> </properties> <children> - <tagNode name="delegate"> + <node name="prefix-delegation"> <properties> - <help>Delegate IPv6 prefix from provider to this interface</help> - <completionHelp> - <script>${vyos_completion_dir}/list_interfaces.py --broadcast</script> - </completionHelp> + <help>DHCPv6 Prefix Delegation Options</help> </properties> <children> - <leafNode name="interface-id"> + <leafNode name="length"> <properties> - <help>Interface address identifier</help> + <help>Request IPv6 prefix length from peer</help> <valueHelp> - <format>0-</format> - <description>Used to form IPv6 interface address (default: EUI-64)</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--non-negative"/> - </constraint> - </properties> - </leafNode> - <leafNode name="sla-id"> - <properties> - <help>Interface site-Level aggregator (SLA)</help> - <valueHelp> - <format>0-128</format> - <description>Decimal integer which fits in the length of SLA IDs</description> + <format>32-64</format> + <description>Length of delegated prefix</description> </valueHelp> <constraint> - <validator name="numeric" argument="--range 0-128"/> + <validator name="numeric" argument="--range 32-64"/> </constraint> </properties> </leafNode> - <leafNode name="sla-len"> + <tagNode name="interface"> <properties> - <help>Site-Level aggregator (SLA) length</help> - <valueHelp> - <format>0-128</format> - <description>Length of delegated prefix</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 0-128"/> - </constraint> + <help>Delegate IPv6 prefix from provider to this interface</help> + <completionHelp> + <script>${vyos_completion_dir}/list_interfaces.py --broadcast</script> + </completionHelp> </properties> - </leafNode> + <children> + <leafNode name="address"> + <properties> + <help>Local interface address assigned to interface</help> + <valueHelp> + <format>>0</format> + <description>Used to form IPv6 interface address (default: EUI-64)</description> + </valueHelp> + <constraint> + <validator name="numeric" argument="--non-negative"/> + </constraint> + </properties> + </leafNode> + <leafNode name="sla-id"> + <properties> + <help>Interface site-Level aggregator (SLA)</help> + <valueHelp> + <format>0-128</format> + <description>Decimal integer which fits in the length of SLA IDs</description> + </valueHelp> + <constraint> + <validator name="numeric" argument="--range 0-128"/> + </constraint> + </properties> + </leafNode> + <leafNode name="sla-len"> + <properties> + <help>Site-Level aggregator (SLA) length</help> + <valueHelp> + <format>0-128</format> + <description>Length of delegated prefix</description> + </valueHelp> + <constraint> + <validator name="numeric" argument="--range 0-128"/> + </constraint> + </properties> + </leafNode> + </children> + </tagNode> </children> - </tagNode> + </node> <leafNode name="parameters-only"> <properties> <help>Acquire only config parameters, no address</help> diff --git a/interface-definitions/protocols-bgp.xml.in b/interface-definitions/protocols-bgp.xml.in index 2932d890e..8cab34141 100644 --- a/interface-definitions/protocols-bgp.xml.in +++ b/interface-definitions/protocols-bgp.xml.in @@ -375,7 +375,7 @@ </leafNode> <leafNode name="disable-connected-check"> <properties> - <help>Disable check to see if EBGP peer's address is a connected route</help> + <help>Disable check to see if eBGP peer address is a connected route</help> <valueless/> </properties> </leafNode> @@ -528,7 +528,7 @@ </leafNode> <leafNode name="port"> <properties> - <help>Neighbor's BGP port</help> + <help>Neighbor BGP port</help> <valueHelp> <format><1-65535></format> <description>Neighbor BGP port number</description> @@ -605,7 +605,7 @@ </valueHelp> <valueHelp> <format>0</format> - <description>Don't hold timer</description> + <description>Hold timer disabled</description> </valueHelp> <constraint> <validator name="numeric" argument="--range 0-65535"/> @@ -662,7 +662,7 @@ <regex>(en|eth|br|bond|gnv|vxlan|wg|tun)[0-9]+</regex> </constraint> </properties> - </leafNode> + </leafNode> </children> </tagNode> <node name="parameters"> @@ -940,7 +940,7 @@ </node> <leafNode name="enforce-first-as"> <properties> - <help>Require first AS in the path to match peer's AS</help> + <help>Require first AS in the path to match peer AS number</help> <valueless/> </properties> </leafNode> @@ -951,7 +951,7 @@ <children> <leafNode name="stalepath-time"> <properties> - <help>Maximum time to hold onto restarting peer's stale paths</help> + <help>Maximum time to hold onto restarting neighbors stale paths</help> <valueHelp> <format><1-3600></format> <description>Hold time in seconds</description> @@ -983,7 +983,7 @@ </leafNode> <leafNode name="no-fast-external-failover"> <properties> - <help>Disable immediate session reset if peer's connected link goes down</help> + <help>Disable immediate session reset on peer link down event</help> <valueless/> </properties> </leafNode> @@ -1054,7 +1054,7 @@ </leafNode> <leafNode name="disable-connected-check"> <properties> - <help>Disable check to see if EBGP peer's address is a connected route</help> + <help>Disable check to see if eBGP peer address is a connected route</help> <valueless/> </properties> </leafNode> @@ -1199,7 +1199,7 @@ </valueHelp> <valueHelp> <format>0</format> - <description>Don't hold routes</description> + <description>Do not hold routes</description> </valueHelp> <constraint> <validator name="numeric" argument="--range 0-65535"/> |