diff options
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/firewall-options.xml.in | 2 | ||||
| -rw-r--r-- | interface-definitions/include/bgp-afi-aggregate-address.xml.i | 12 | ||||
| -rw-r--r-- | interface-definitions/include/dhcpv6-options.xml.i | 85 | ||||
| -rw-r--r-- | interface-definitions/interfaces-openvpn.xml.in | 1 | ||||
| -rw-r--r-- | interface-definitions/interfaces-wirelessmodem.xml.in | 3 | ||||
| -rw-r--r-- | interface-definitions/nat.xml.in | 2 | ||||
| -rw-r--r-- | interface-definitions/protocols-bgp.xml.in | 44 | ||||
| -rw-r--r-- | interface-definitions/vrf.xml.in | 2 |
8 files changed, 82 insertions, 69 deletions
diff --git a/interface-definitions/firewall-options.xml.in b/interface-definitions/firewall-options.xml.in index 2936cc703..defd44f06 100644 --- a/interface-definitions/firewall-options.xml.in +++ b/interface-definitions/firewall-options.xml.in @@ -8,7 +8,7 @@ <priority>990</priority> </properties> <children> - <tagNode name="interface" owner="sudo ${vyos_conf_scripts_dir}/firewall_options.py"> + <tagNode name="interface" owner="${vyos_conf_scripts_dir}/firewall_options.py"> <properties> <help>Interface clamping options</help> <completionHelp> diff --git a/interface-definitions/include/bgp-afi-aggregate-address.xml.i b/interface-definitions/include/bgp-afi-aggregate-address.xml.i new file mode 100644 index 000000000..40c030fc1 --- /dev/null +++ b/interface-definitions/include/bgp-afi-aggregate-address.xml.i @@ -0,0 +1,12 @@ +<leafNode name="as-set">
+ <properties>
+ <help>Generate AS-set path information for this aggregate address</help>
+ <valueless/>
+ </properties>
+</leafNode>
+<leafNode name="summary-only">
+ <properties>
+ <help>Announce the aggregate summary network only</help>
+ <valueless/>
+ </properties>
+</leafNode>
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/interfaces-openvpn.xml.in b/interface-definitions/interfaces-openvpn.xml.in index b5da8cf76..bdf5aeddb 100644 --- a/interface-definitions/interfaces-openvpn.xml.in +++ b/interface-definitions/interfaces-openvpn.xml.in @@ -800,6 +800,7 @@ <valueless/> </properties> </leafNode> + #include <include/interface-vrf.xml.i> </children> </tagNode> </children> diff --git a/interface-definitions/interfaces-wirelessmodem.xml.in b/interface-definitions/interfaces-wirelessmodem.xml.in index 6bec34b56..91eee56ab 100644 --- a/interface-definitions/interfaces-wirelessmodem.xml.in +++ b/interface-definitions/interfaces-wirelessmodem.xml.in @@ -47,6 +47,9 @@ <leafNode name="device"> <properties> <help>System device name (default: ttyUSB0)</help> + <completionHelp> + <script>ls -1 /dev | grep ttyUSB</script> + </completionHelp> <valueHelp> <format>ttyXXX</format> <description>System TTY device name</description> diff --git a/interface-definitions/nat.xml.in b/interface-definitions/nat.xml.in index a0b3b815b..7998bd660 100644 --- a/interface-definitions/nat.xml.in +++ b/interface-definitions/nat.xml.in @@ -1,6 +1,6 @@ <?xml version="1.0"?> <interfaceDefinition> - <node name="nat" owner="sudo ${vyos_conf_scripts_dir}/nat.py"> + <node name="nat" owner="${vyos_conf_scripts_dir}/nat.py"> <properties> <help>Network Address Translation (NAT) parameters</help> <priority>220</priority> diff --git a/interface-definitions/protocols-bgp.xml.in b/interface-definitions/protocols-bgp.xml.in index 2932d890e..3a4600753 100644 --- a/interface-definitions/protocols-bgp.xml.in +++ b/interface-definitions/protocols-bgp.xml.in @@ -38,18 +38,7 @@ </constraint> </properties> <children> - <leafNode name="as-set"> - <properties> - <help>Generate AS-set path information for this aggregate address</help> - <valueless/> - </properties> - </leafNode> - <leafNode name="summary-only"> - <properties> - <help>Announce the aggregate summary network only</help> - <valueless/> - </properties> - </leafNode> + #include <include/bgp-afi-aggregate-address.xml.i> </children> </tagNode> <tagNode name="network"> @@ -151,18 +140,7 @@ </constraint> </properties> <children> - <leafNode name="as-set"> - <properties> - <help>Generate AS-set path information for this aggregate address</help> - <valueless/> - </properties> - </leafNode> - <leafNode name="summary-only"> - <properties> - <help>Announce the aggregate summary network only</help> - <valueless/> - </properties> - </leafNode> + #include <include/bgp-afi-aggregate-address.xml.i> </children> </tagNode> <tagNode name="network"> @@ -375,7 +353,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 +506,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 +583,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 +640,7 @@ <regex>(en|eth|br|bond|gnv|vxlan|wg|tun)[0-9]+</regex> </constraint> </properties> - </leafNode> + </leafNode> </children> </tagNode> <node name="parameters"> @@ -940,7 +918,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 +929,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 +961,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 +1032,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 +1177,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"/> diff --git a/interface-definitions/vrf.xml.in b/interface-definitions/vrf.xml.in index 7c75bf824..9b9828ddd 100644 --- a/interface-definitions/vrf.xml.in +++ b/interface-definitions/vrf.xml.in @@ -19,7 +19,7 @@ <constraint> <validator name="vrf-name"/> </constraint> - <constraintErrorMessage>VRF instance name must be 16 characters or less and can not\nbe named as regular network interfaces</constraintErrorMessage> + <constraintErrorMessage>VRF instance name must be 15 characters or less and can not\nbe named as regular network interfaces.\n</constraintErrorMessage> <valueHelp> <format>name</format> <description>Instance name</description> |