diff options
Diffstat (limited to 'interface-definitions')
36 files changed, 459 insertions, 292 deletions
diff --git a/interface-definitions/dhcp-server.xml.in b/interface-definitions/dhcp-server.xml.in index ca8abc036..978118b31 100644 --- a/interface-definitions/dhcp-server.xml.in +++ b/interface-definitions/dhcp-server.xml.in @@ -87,6 +87,7 @@ <constraint> <validator name="ipv4-prefix"/> </constraint> + <constraintErrorMessage>Invalid IPv4 subnet definition</constraintErrorMessage> </properties> <children> <leafNode name="bootfile-name"> diff --git a/interface-definitions/include/accel-radius-additions-disable-accounting.xlm.in b/interface-definitions/include/accel-radius-additions-disable-accounting.xlm.in new file mode 100644 index 000000000..026f67453 --- /dev/null +++ b/interface-definitions/include/accel-radius-additions-disable-accounting.xlm.in @@ -0,0 +1,7 @@ +<leafNode name="disable-accounting"> + <properties> + <help>Disable accounting</help> + <valueless/> + </properties> +</leafNode> + diff --git a/interface-definitions/include/accel-radius-additions.xml.i b/interface-definitions/include/accel-radius-additions.xml.i index 598fb73f8..bf0f0ac94 100644 --- a/interface-definitions/include/accel-radius-additions.xml.i +++ b/interface-definitions/include/accel-radius-additions.xml.i @@ -29,6 +29,7 @@ </properties> <defaultValue>1813</defaultValue> </leafNode> + #include <include/accel-radius-additions-disable-accounting.xlm.in> <leafNode name="fail-time"> <properties> <help>Mark server unavailable for <n> seconds on failure</help> 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 f1a61d669..155817838 100644 --- a/interface-definitions/include/bgp-neighbor-afi-ipv4-unicast.xml.i +++ b/interface-definitions/include/bgp-neighbor-afi-ipv4-unicast.xml.i @@ -267,7 +267,6 @@ <leafNode name="unsuppress-map"> <properties> <help>Route-map to selectively unsuppress suppressed IPv4-routes</help> - <valueless/> </properties> </leafNode> <leafNode name="weight"> 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 dcdc0eb66..63bf582db 100644 --- a/interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i +++ b/interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i @@ -59,6 +59,13 @@ <help>Advertise capabilities to this neighbor (IPv6)</help> </properties> <children> + <!-- Capability dynamic in the afi ipv6 does nothing T3037 --> + <leafNode name="dynamic"> + <properties> + <help>Advertise dynamic capability to this neighbor</help> + <valueless/> + </properties> + </leafNode> <node name="orf"> <properties> <help>Advertise ORF capability to this neighbor</help> diff --git a/interface-definitions/include/dhcp-options.xml.i b/interface-definitions/include/dhcp-options.xml.i index e33022361..df9c7a97a 100644 --- a/interface-definitions/include/dhcp-options.xml.i +++ b/interface-definitions/include/dhcp-options.xml.i @@ -6,17 +6,23 @@ <children> <leafNode name="client-id"> <properties> - <help>DHCP client identifier</help> + <help>Identifier used by client to identify itself to the DHCP server</help> </properties> </leafNode> <leafNode name="host-name"> <properties> - <help>DHCP client host name (overrides system host name)</help> + <help>Override system host-name sent to DHCP server</help> </properties> </leafNode> <leafNode name="vendor-class-id"> <properties> - <help>DHCP client vendor type</help> + <help>Identify the vendor client type to the DHCP server</help> + </properties> + </leafNode> + <leafNode name="no-default-route"> + <properties> + <help>Do not request routers from DHCP server</help> + <valueless/> </properties> </leafNode> </children> diff --git a/interface-definitions/include/interface-ipv4.xml.i b/interface-definitions/include/interface-ipv4-options.xml.i index 66842ab9b..416e1adf5 100644 --- a/interface-definitions/include/interface-ipv4.xml.i +++ b/interface-definitions/include/interface-ipv4-options.xml.i @@ -1,14 +1,17 @@ -<!-- included start from interface-ipv4.xml.i --> +<!-- included start from interface-ipv4-options.xml.i --> <node name="ip"> <properties> <help>IPv4 routing parameters</help> </properties> <children> + #include <include/interface-arp-cache-timeout.xml.i> #include <include/interface-disable-arp-filter.xml.i> #include <include/interface-disable-forwarding.xml.i> #include <include/interface-enable-arp-accept.xml.i> #include <include/interface-enable-arp-announce.xml.i> #include <include/interface-enable-arp-ignore.xml.i> + #include <include/interface-enable-proxy-arp.xml.i> + #include <include/interface-proxy-arp-pvlan.xml.i> </children> </node> <!-- included end --> diff --git a/interface-definitions/include/interface-ipv6.xml.i b/interface-definitions/include/interface-ipv6-options.xml.i index c9299890b..a94c6572b 100644 --- a/interface-definitions/include/interface-ipv6.xml.i +++ b/interface-definitions/include/interface-ipv6-options.xml.i @@ -1,4 +1,4 @@ -<!-- included start from interface-ipv6.xml.i --> +<!-- included start from interface-ipv6-options.xml.i --> <node name="ipv6"> <properties> <help>IPv6 routing parameters</help> diff --git a/interface-definitions/include/interface-mtu-1200-16000.xml.i b/interface-definitions/include/interface-mtu-1200-16000.xml.i new file mode 100644 index 000000000..04b5ec8ac --- /dev/null +++ b/interface-definitions/include/interface-mtu-1200-16000.xml.i @@ -0,0 +1,16 @@ +<!-- included start from interface-mtu-1200-16000.xml.i --> +<leafNode name="mtu"> + <properties> + <help>Maximum Transmission Unit (MTU)</help> + <valueHelp> + <format>1200-16000</format> + <description>Maximum Transmission Unit in byte</description> + </valueHelp> + <constraint> + <validator name="numeric" argument="--range 1200-16000"/> + </constraint> + <constraintErrorMessage>MTU must be between 1200 and 16000</constraintErrorMessage> + </properties> + <defaultValue>1500</defaultValue> +</leafNode> +<!-- included end --> diff --git a/interface-definitions/include/interface-mtu-1200-9000.xml.i b/interface-definitions/include/interface-mtu-1200-9000.xml.i deleted file mode 100644 index 387e60fa5..000000000 --- a/interface-definitions/include/interface-mtu-1200-9000.xml.i +++ /dev/null @@ -1,16 +0,0 @@ -<!-- included start from interface-mtu-1200-9000.xml.i --> -<leafNode name="mtu"> - <properties> - <help>Maximum Transmission Unit (MTU)</help> - <valueHelp> - <format>1200-9000</format> - <description>Maximum Transmission Unit</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 1200-9000"/> - </constraint> - <constraintErrorMessage>MTU must be between 1200 and 9000</constraintErrorMessage> - </properties> - <defaultValue>1500</defaultValue> -</leafNode> -<!-- included end --> diff --git a/interface-definitions/include/interface-mtu-1450-16000.xml.i b/interface-definitions/include/interface-mtu-1450-16000.xml.i new file mode 100644 index 000000000..41dd5fb00 --- /dev/null +++ b/interface-definitions/include/interface-mtu-1450-16000.xml.i @@ -0,0 +1,16 @@ +<!-- included start from interface-mtu-1450-16000.xml.i --> +<leafNode name="mtu"> + <properties> + <help>Maximum Transmission Unit (MTU)</help> + <valueHelp> + <format>1450-16000</format> + <description>Maximum Transmission Unit in byte</description> + </valueHelp> + <constraint> + <validator name="numeric" argument="--range 1450-16000"/> + </constraint> + <constraintErrorMessage>MTU must be between 1450 and 16000</constraintErrorMessage> + </properties> + <defaultValue>1500</defaultValue> +</leafNode> +<!-- included end --> diff --git a/interface-definitions/include/interface-mtu-1450-9000.xml.i b/interface-definitions/include/interface-mtu-1450-9000.xml.i deleted file mode 100644 index 3fc961051..000000000 --- a/interface-definitions/include/interface-mtu-1450-9000.xml.i +++ /dev/null @@ -1,16 +0,0 @@ -<!-- included start from interface-mtu-1450-9000.xml.i --> -<leafNode name="mtu"> - <properties> - <help>Maximum Transmission Unit (MTU)</help> - <valueHelp> - <format>1450-9000</format> - <description>Maximum Transmission Unit</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 1450-9000"/> - </constraint> - <constraintErrorMessage>MTU must be between 1450 and 9000</constraintErrorMessage> - </properties> - <defaultValue>1500</defaultValue> -</leafNode> -<!-- included end --> diff --git a/interface-definitions/include/interface-mtu-64-8024.xml.i b/interface-definitions/include/interface-mtu-64-8024.xml.i index f51e098c1..0a455bc64 100644 --- a/interface-definitions/include/interface-mtu-64-8024.xml.i +++ b/interface-definitions/include/interface-mtu-64-8024.xml.i @@ -4,7 +4,7 @@ <help>Maximum Transmission Unit (MTU)</help> <valueHelp> <format>64-8024</format> - <description>Maximum Transmission Unit</description> + <description>Maximum Transmission Unit in byte</description> </valueHelp> <constraint> <validator name="numeric" argument="--range 64-8024"/> diff --git a/interface-definitions/include/interface-mtu-68-1500.xml.i b/interface-definitions/include/interface-mtu-68-1500.xml.i index 0563e0023..78c2c6920 100644 --- a/interface-definitions/include/interface-mtu-68-1500.xml.i +++ b/interface-definitions/include/interface-mtu-68-1500.xml.i @@ -4,7 +4,7 @@ <help>Maximum Transmission Unit (MTU)</help> <valueHelp> <format>68-1500</format> - <description>Maximum Transmission Unit</description> + <description>Maximum Transmission Unit in byte</description> </valueHelp> <constraint> <validator name="numeric" argument="--range 68-1500"/> diff --git a/interface-definitions/include/interface-mtu-68-16000.xml.i b/interface-definitions/include/interface-mtu-68-16000.xml.i new file mode 100644 index 000000000..9f18464bf --- /dev/null +++ b/interface-definitions/include/interface-mtu-68-16000.xml.i @@ -0,0 +1,16 @@ +<!-- included start from interface-mtu-68-16000.xml.i --> +<leafNode name="mtu"> + <properties> + <help>Maximum Transmission Unit (MTU)</help> + <valueHelp> + <format>68-16000</format> + <description>Maximum Transmission Unit in byte</description> + </valueHelp> + <constraint> + <validator name="numeric" argument="--range 68-16000"/> + </constraint> + <constraintErrorMessage>MTU must be between 68 and 16000</constraintErrorMessage> + </properties> + <defaultValue>1500</defaultValue> +</leafNode> +<!-- included end --> diff --git a/interface-definitions/include/interface-mtu-68-9000.xml.i b/interface-definitions/include/interface-mtu-68-9000.xml.i deleted file mode 100644 index 82d0ed82b..000000000 --- a/interface-definitions/include/interface-mtu-68-9000.xml.i +++ /dev/null @@ -1,16 +0,0 @@ -<!-- included start from interface-mtu-68-9000.xml.i --> -<leafNode name="mtu"> - <properties> - <help>Maximum Transmission Unit (MTU)</help> - <valueHelp> - <format>68-9000</format> - <description>Maximum Transmission Unit</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 68-9000"/> - </constraint> - <constraintErrorMessage>MTU must be between 68 and 9000</constraintErrorMessage> - </properties> - <defaultValue>1500</defaultValue> -</leafNode> -<!-- included end --> diff --git a/interface-definitions/include/vif-s.xml.i b/interface-definitions/include/vif-s.xml.i index 3a04b10d9..ab556489f 100644 --- a/interface-definitions/include/vif-s.xml.i +++ b/interface-definitions/include/vif-s.xml.i @@ -44,7 +44,7 @@ </children> </node> #include <include/interface-mac.xml.i> - #include <include/interface-mtu-68-9000.xml.i> + #include <include/interface-mtu-68-16000.xml.i> <tagNode name="vif-c"> <properties> <help>QinQ TAG-C Virtual Local Area Network (VLAN) ID</help> @@ -61,7 +61,7 @@ #include <include/interface-disable-link-detect.xml.i> #include <include/interface-disable.xml.i> #include <include/interface-mac.xml.i> - #include <include/interface-mtu-68-9000.xml.i> + #include <include/interface-mtu-68-16000.xml.i> #include <include/interface-vrf.xml.i> </children> </tagNode> diff --git a/interface-definitions/include/vif.xml.i b/interface-definitions/include/vif.xml.i index a0f7c0bc8..3369d0d7c 100644 --- a/interface-definitions/include/vif.xml.i +++ b/interface-definitions/include/vif.xml.i @@ -63,7 +63,7 @@ </children> </node> #include <include/interface-mac.xml.i> - #include <include/interface-mtu-68-9000.xml.i> + #include <include/interface-mtu-68-16000.xml.i> </children> </tagNode> <!-- included end --> diff --git a/interface-definitions/interfaces-bonding.xml.in b/interface-definitions/interfaces-bonding.xml.in index 4e2c61d07..66fc5f7a9 100644 --- a/interface-definitions/interfaces-bonding.xml.in +++ b/interface-definitions/interfaces-bonding.xml.in @@ -80,25 +80,8 @@ </properties> <defaultValue>layer2</defaultValue> </leafNode> - <node name="ip"> - <children> - #include <include/interface-arp-cache-timeout.xml.i> - #include <include/interface-disable-arp-filter.xml.i> - #include <include/interface-disable-forwarding.xml.i> - #include <include/interface-enable-arp-accept.xml.i> - #include <include/interface-enable-arp-announce.xml.i> - #include <include/interface-enable-arp-ignore.xml.i> - #include <include/interface-enable-proxy-arp.xml.i> - #include <include/interface-proxy-arp-pvlan.xml.i> - </children> - </node> - <node name="ipv6"> - <children> - #include <include/ipv6-address.xml.i> - #include <include/ipv6-disable-forwarding.xml.i> - #include <include/ipv6-dup-addr-detect-transmits.xml.i> - </children> - </node> + #include <include/interface-ipv4-options.xml.i> + #include <include/interface-ipv6-options.xml.i> #include <include/interface-mac.xml.i> <leafNode name="min-links"> <properties> @@ -170,7 +153,7 @@ </leafNode> </children> </node> - #include <include/interface-mtu-68-9000.xml.i> + #include <include/interface-mtu-68-16000.xml.i> <leafNode name="primary"> <properties> <help>Primary device interface</help> diff --git a/interface-definitions/interfaces-bridge.xml.in b/interface-definitions/interfaces-bridge.xml.in index 0a777865b..778acda78 100644 --- a/interface-definitions/interfaces-bridge.xml.in +++ b/interface-definitions/interfaces-bridge.xml.in @@ -40,6 +40,7 @@ #include <include/interface-disable-link-detect.xml.i> #include <include/interface-disable.xml.i> #include <include/interface-vrf.xml.i> + #include <include/interface-mtu-68-16000.xml.i> <leafNode name="forwarding-delay"> <properties> <help>Forwarding delay</help> @@ -81,23 +82,8 @@ </leafNode> </children> </node> - <node name="ip"> - <children> - #include <include/interface-arp-cache-timeout.xml.i> - #include <include/interface-enable-arp-accept.xml.i> - #include <include/interface-disable-forwarding.xml.i> - #include <include/interface-enable-arp-announce.xml.i> - #include <include/interface-enable-arp-ignore.xml.i> - #include <include/interface-disable-arp-filter.xml.i> - </children> - </node> - <node name="ipv6"> - <children> - #include <include/ipv6-address.xml.i> - #include <include/ipv6-disable-forwarding.xml.i> - #include <include/ipv6-dup-addr-detect-transmits.xml.i> - </children> - </node> + #include <include/interface-ipv4-options.xml.i> + #include <include/interface-ipv6-options.xml.i> #include <include/interface-mac.xml.i> <leafNode name="max-age"> <properties> @@ -126,6 +112,37 @@ </completionHelp> </properties> <children> + <leafNode name="native-vlan"> + <properties> + <help>Specify VLAN id which should natively be present on the link</help> + <valueHelp> + <format>1-4094</format> + <description>Virtual Local Area Network (VLAN) ID</description> + </valueHelp> + <constraint> + <validator name="numeric" argument="--range 1-4094"/> + </constraint> + <constraintErrorMessage>VLAN ID must be between 1 and 4094</constraintErrorMessage> + </properties> + </leafNode> + <leafNode name="allowed-vlan"> + <properties> + <help>Specify VLAN id which is allowed in this trunk interface</help> + <valueHelp> + <format><id></format> + <description>VLAN id allowed to pass this interface</description> + </valueHelp> + <valueHelp> + <format><idN>-<idM></format> + <description>VLAN id range allowed on this interface (use '-' as delimiter)</description> + </valueHelp> + <constraint> + <regex>^([0-9]{1,4}-[0-9]{1,4})|([0-9]{1,4})$</regex> + </constraint> + <constraintErrorMessage>not a valid VLAN ID value or range</constraintErrorMessage> + <multi/> + </properties> + </leafNode> <leafNode name="cost"> <properties> <help>Bridge port cost</help> @@ -178,6 +195,8 @@ <valueless/> </properties> </leafNode> + #include <include/vif-s.xml.i> + #include <include/vif.xml.i> </children> </tagNode> </children> diff --git a/interface-definitions/interfaces-ethernet.xml.in b/interface-definitions/interfaces-ethernet.xml.in index a19a766d3..83f3d9e46 100644 --- a/interface-definitions/interfaces-ethernet.xml.in +++ b/interface-definitions/interfaces-ethernet.xml.in @@ -14,10 +14,6 @@ <format>ethN</format> <description>Ethernet interface name</description> </valueHelp> - <valueHelp> - <format>en[ospx]N</format> - <description>Ethernet interface name</description> - </valueHelp> </properties> <children> #include <include/address-ipv4-ipv6-dhcp.xml.i> @@ -59,27 +55,10 @@ <defaultValue>auto</defaultValue> </leafNode> #include <include/interface-hw-id.xml.i> - <node name="ip"> - <children> - #include <include/interface-arp-cache-timeout.xml.i> - #include <include/interface-disable-arp-filter.xml.i> - #include <include/interface-disable-forwarding.xml.i> - #include <include/interface-enable-arp-accept.xml.i> - #include <include/interface-enable-arp-announce.xml.i> - #include <include/interface-enable-arp-ignore.xml.i> - #include <include/interface-enable-proxy-arp.xml.i> - #include <include/interface-proxy-arp-pvlan.xml.i> - </children> - </node> - <node name="ipv6"> - <children> - #include <include/ipv6-address.xml.i> - #include <include/ipv6-disable-forwarding.xml.i> - #include <include/ipv6-dup-addr-detect-transmits.xml.i> - </children> - </node> + #include <include/interface-ipv4-options.xml.i> + #include <include/interface-ipv6-options.xml.i> #include <include/interface-mac.xml.i> - #include <include/interface-mtu-68-9000.xml.i> + #include <include/interface-mtu-68-16000.xml.i> <node name="offload-options"> <properties> <help>Configurable offload options</help> diff --git a/interface-definitions/interfaces-geneve.xml.in b/interface-definitions/interfaces-geneve.xml.in index 320dfd64d..0c776e3c3 100644 --- a/interface-definitions/interfaces-geneve.xml.in +++ b/interface-definitions/interfaces-geneve.xml.in @@ -19,23 +19,10 @@ #include <include/address-ipv4-ipv6.xml.i> #include <include/interface-description.xml.i> #include <include/interface-disable.xml.i> - <node name="ip"> - <properties> - <help>IPv4 routing parameters</help> - </properties> - <children> - #include <include/interface-arp-cache-timeout.xml.i> - #include <include/interface-enable-proxy-arp.xml.i> - </children> - </node> - <node name="ipv6"> - <children> - #include <include/ipv6-disable-forwarding.xml.i> - #include <include/ipv6-dup-addr-detect-transmits.xml.i> - </children> - </node> + #include <include/interface-ipv4-options.xml.i> + #include <include/interface-ipv6-options.xml.i> #include <include/interface-mac.xml.i> - #include <include/interface-mtu-1450-9000.xml.i> + #include <include/interface-mtu-1450-16000.xml.i> <leafNode name="remote"> <properties> <help>Remote address of GENEVE tunnel</help> diff --git a/interface-definitions/interfaces-l2tpv3.xml.in b/interface-definitions/interfaces-l2tpv3.xml.in index 3a878ad76..a8ddb74fb 100644 --- a/interface-definitions/interfaces-l2tpv3.xml.in +++ b/interface-definitions/interfaces-l2tpv3.xml.in @@ -53,13 +53,8 @@ </properties> <defaultValue>udp</defaultValue> </leafNode> - <node name="ipv6"> - <children> - #include <include/ipv6-address.xml.i> - #include <include/ipv6-disable-forwarding.xml.i> - #include <include/ipv6-dup-addr-detect-transmits.xml.i> - </children> - </node> + #include <include/interface-ipv4-options.xml.i> + #include <include/interface-ipv6-options.xml.i> <leafNode name="local-ip"> <properties> <help>Local IP address for L2TPv3 tunnel</help> @@ -76,7 +71,7 @@ </constraint> </properties> </leafNode> - #include <include/interface-mtu-68-9000.xml.i> + #include <include/interface-mtu-68-16000.xml.i> <leafNode name="peer-session-id"> <properties> <help>Peer session identifier</help> diff --git a/interface-definitions/interfaces-macsec.xml.in b/interface-definitions/interfaces-macsec.xml.in index 068e31449..4d2581906 100644 --- a/interface-definitions/interfaces-macsec.xml.in +++ b/interface-definitions/interfaces-macsec.xml.in @@ -17,6 +17,8 @@ </properties> <children> #include <include/address-ipv4-ipv6.xml.i> + #include <include/interface-ipv4-options.xml.i> + #include <include/interface-ipv6-options.xml.i> <node name="security"> <properties> <help>Security/Encryption Settings</help> @@ -107,7 +109,7 @@ </node> #include <include/interface-description.xml.i> #include <include/interface-disable.xml.i> - #include <include/interface-mtu-68-9000.xml.i> + #include <include/interface-mtu-68-16000.xml.i> #include <include/source-interface-ethernet.xml.i> #include <include/interface-vrf.xml.i> </children> diff --git a/interface-definitions/interfaces-openvpn.xml.in b/interface-definitions/interfaces-openvpn.xml.in index 5675379d5..56a35e537 100644 --- a/interface-definitions/interfaces-openvpn.xml.in +++ b/interface-definitions/interfaces-openvpn.xml.in @@ -36,7 +36,7 @@ #include <include/interface-description.xml.i> <leafNode name="device-type"> <properties> - <help>OpenVPN interface device-type</help> + <help>OpenVPN interface device-type (default: tun)</help> <completionHelp> <list>tun tap</list> </completionHelp> @@ -49,9 +49,10 @@ <description>TAP device, required for OSI layer 2</description> </valueHelp> <constraint> - <regex>(tun|tap)</regex> + <regex>^(tun|tap)$</regex> </constraint> </properties> + <defaultValue>tun</defaultValue> </leafNode> #include <include/interface-disable.xml.i> <node name="encryption"> @@ -110,7 +111,7 @@ <description>AES algorithm with 256-bit key GCM</description> </valueHelp> <constraint> - <regex>(none|des|3des|bf128|bf256|aes128|aes128gcm|aes192|aes192gcm|aes256|aes256gcm)</regex> + <regex>^(none|des|3des|bf128|bf256|aes128|aes128gcm|aes192|aes192gcm|aes256|aes256gcm)$</regex> </constraint> </properties> </leafNode> @@ -157,7 +158,7 @@ <description>AES algorithm with 256-bit key GCM</description> </valueHelp> <constraint> - <regex>(none|des|3des|aes128|aes128gcm|aes192|aes192gcm|aes256|aes256gcm)</regex> + <regex>^(none|des|3des|aes128|aes128gcm|aes192|aes192gcm|aes256|aes256gcm)$</regex> </constraint> <multi/> </properties> @@ -204,7 +205,7 @@ <description>SHA-512 algorithm</description> </valueHelp> <constraint> - <regex>(md5|sha1|sha256|sha384|sha512)</regex> + <regex>^(md5|sha1|sha256|sha384|sha512)$</regex> </constraint> </properties> </leafNode> @@ -215,7 +216,7 @@ <children> <leafNode name="failure-count"> <properties> - <help>Maximum number of keepalive packet failures [default 6]</help> + <help>Maximum number of keepalive packet failures (default: 60)</help> <valueHelp> <format>0-1000</format> <description>Maximum number of keepalive packet failures</description> @@ -224,10 +225,11 @@ <validator name="numeric" argument="--range 0-1000"/> </constraint> </properties> + <defaultValue>60</defaultValue> </leafNode> <leafNode name="interval"> <properties> - <help>Keepalive packet interval (seconds) [default 10]</help> + <help>Keepalive packet interval in seconds (default: 10)</help> <valueHelp> <format>0-600</format> <description>Keepalive packet interval (seconds)</description> @@ -236,6 +238,7 @@ <validator name="numeric" argument="--range 0-600"/> </constraint> </properties> + <defaultValue>10</defaultValue> </leafNode> </children> </node> @@ -304,7 +307,7 @@ <description>Server in client-server mode</description> </valueHelp> <constraint> - <regex>(site-to-site|client|server)</regex> + <regex>^(site-to-site|client|server)$</regex> </constraint> </properties> </leafNode> @@ -342,9 +345,10 @@ <description>TCP and initiates connections actively</description> </valueHelp> <constraint> - <regex>(udp|tcp-passive|tcp-active)</regex> + <regex>^(udp|tcp-passive|tcp-active)$</regex> </constraint> </properties> + <defaultValue>udp</defaultValue> </leafNode> <leafNode name="remote-address"> <properties> @@ -359,6 +363,7 @@ </valueHelp> <constraint> <validator name="ipv4-address"/> + <validator name="ipv6-address"/> </constraint> <multi/> </properties> @@ -613,6 +618,7 @@ <leafNode name="reject-unconfigured-clients"> <properties> <help>Reject connections from clients that are not explicitly configured</help> + <valueless/> </properties> </leafNode> <leafNode name="subnet"> @@ -634,7 +640,7 @@ </leafNode> <leafNode name="topology"> <properties> - <help>Topology for clients</help> + <help>Topology for clients (default: net30)</help> <completionHelp> <list>net30 point-to-point subnet</list> </completionHelp> @@ -651,9 +657,10 @@ <description>Subnet topology</description> </valueHelp> <constraint> - <regex>(subnet|point-to-point|net30)</regex> + <regex>^(subnet|point-to-point|net30)$</regex> </constraint> </properties> + <defaultValue>net30</defaultValue> </leafNode> </children> </node> @@ -777,13 +784,13 @@ <description>TLS v1.2</description> </valueHelp> <constraint> - <regex>(1.0|1.1|1.2)</regex> + <regex>^(1.0|1.1|1.2)$</regex> </constraint> </properties> </leafNode> <leafNode name="role"> <properties> - <help>Private key for this host</help> + <help>TLS negotiation role</help> <completionHelp> <list>active passive</list> </completionHelp> @@ -793,10 +800,10 @@ </valueHelp> <valueHelp> <format>passive</format> - <description>Waiting for TLS connections passively</description> + <description>Wait for incoming TLS connection</description> </valueHelp> <constraint> - <regex>(active|passive)</regex> + <regex>^(active|passive)$</regex> </constraint> </properties> </leafNode> diff --git a/interface-definitions/interfaces-pseudo-ethernet.xml.in b/interface-definitions/interfaces-pseudo-ethernet.xml.in index 3fceb70b6..32ba5ea01 100644 --- a/interface-definitions/interfaces-pseudo-ethernet.xml.in +++ b/interface-definitions/interfaces-pseudo-ethernet.xml.in @@ -23,25 +23,8 @@ #include <include/interface-disable-link-detect.xml.i> #include <include/interface-disable.xml.i> #include <include/interface-vrf.xml.i> - <node name="ip"> - <children> - #include <include/interface-arp-cache-timeout.xml.i> - #include <include/interface-disable-arp-filter.xml.i> - #include <include/interface-disable-forwarding.xml.i> - #include <include/interface-enable-arp-accept.xml.i> - #include <include/interface-enable-arp-announce.xml.i> - #include <include/interface-enable-arp-ignore.xml.i> - #include <include/interface-enable-proxy-arp.xml.i> - #include <include/interface-proxy-arp-pvlan.xml.i> - </children> - </node> - <node name="ipv6"> - <children> - #include <include/ipv6-address.xml.i> - #include <include/ipv6-disable-forwarding.xml.i> - #include <include/ipv6-dup-addr-detect-transmits.xml.i> - </children> - </node> + #include <include/interface-ipv4-options.xml.i> + #include <include/interface-ipv6-options.xml.i> #include <include/source-interface-ethernet.xml.i> #include <include/interface-mac.xml.i> <leafNode name="mode"> @@ -73,7 +56,7 @@ </properties> <defaultValue>private</defaultValue> </leafNode> - #include <include/interface-mtu-68-9000.xml.i> + #include <include/interface-mtu-68-16000.xml.i> #include <include/vif-s.xml.i> #include <include/vif.xml.i> </children> diff --git a/interface-definitions/interfaces-tunnel.xml.in b/interface-definitions/interfaces-tunnel.xml.in index 64520ce99..c3f178d59 100644 --- a/interface-definitions/interfaces-tunnel.xml.in +++ b/interface-definitions/interfaces-tunnel.xml.in @@ -22,8 +22,8 @@ #include <include/interface-disable-link-detect.xml.i> #include <include/interface-vrf.xml.i> #include <include/interface-mtu-64-8024.xml.i> - #include <include/interface-ipv4.xml.i> - #include <include/interface-ipv6.xml.i> + #include <include/interface-ipv4-options.xml.i> + #include <include/interface-ipv6-options.xml.i> <leafNode name="local-ip"> <properties> <help>Local IP address for this tunnel</help> diff --git a/interface-definitions/interfaces-vxlan.xml.in b/interface-definitions/interfaces-vxlan.xml.in index 7fdead16a..c7725fed3 100644 --- a/interface-definitions/interfaces-vxlan.xml.in +++ b/interface-definitions/interfaces-vxlan.xml.in @@ -35,24 +35,8 @@ </constraint> </properties> </leafNode> - <node name="ip"> - <children> - #include <include/interface-arp-cache-timeout.xml.i> - #include <include/interface-disable-arp-filter.xml.i> - #include <include/interface-disable-forwarding.xml.i> - #include <include/interface-enable-arp-accept.xml.i> - #include <include/interface-enable-arp-announce.xml.i> - #include <include/interface-enable-arp-ignore.xml.i> - #include <include/interface-enable-proxy-arp.xml.i> - </children> - </node> - <node name="ipv6"> - <children> - #include <include/ipv6-address.xml.i> - #include <include/ipv6-disable-forwarding.xml.i> - #include <include/ipv6-dup-addr-detect-transmits.xml.i> - </children> - </node> + #include <include/interface-ipv4-options.xml.i> + #include <include/interface-ipv6-options.xml.i> <leafNode name="source-address"> <properties> <help>VXLAN source address</help> @@ -67,7 +51,7 @@ </leafNode> #include <include/source-interface.xml.i> #include <include/interface-mac.xml.i> - #include <include/interface-mtu-1200-9000.xml.i> + #include <include/interface-mtu-1200-16000.xml.i> <leafNode name="remote"> <properties> <help>Remote address of VXLAN tunnel</help> diff --git a/interface-definitions/interfaces-wireguard.xml.in b/interface-definitions/interfaces-wireguard.xml.in index 981bce826..aa63e4ac7 100644 --- a/interface-definitions/interfaces-wireguard.xml.in +++ b/interface-definitions/interfaces-wireguard.xml.in @@ -21,7 +21,7 @@ #include <include/interface-disable.xml.i> #include <include/interface-vrf.xml.i> #include <include/port-number.xml.i> - #include <include/interface-mtu-68-9000.xml.i> + #include <include/interface-mtu-68-16000.xml.i> <leafNode name="fwmark"> <properties> <help>A 32-bit fwmark value set on all outgoing packets</help> diff --git a/interface-definitions/interfaces-wireless.xml.in b/interface-definitions/interfaces-wireless.xml.in index 423ec7ba2..fdea1e3ab 100644 --- a/interface-definitions/interfaces-wireless.xml.in +++ b/interface-definitions/interfaces-wireless.xml.in @@ -5,7 +5,7 @@ <tagNode name="wireless" owner="${vyos_conf_scripts_dir}/interfaces-wireless.py"> <properties> <help>Wireless (WiFi/WLAN) Network Interface</help> - <priority>400</priority> + <priority>318</priority> <constraint> <regex>^wlan[0-9]+$</regex> </constraint> @@ -58,7 +58,7 @@ <description>Supported channel set width both 20 MHz and 40 MHz with secondary channel below primary channel</description> </valueHelp> <constraint> - <regex>(ht20|ht40\+|ht40-)</regex> + <regex>^(ht20|ht40\+|ht40-)$</regex> </constraint> <multi/> </properties> @@ -108,7 +108,7 @@ <description>Set maximum A-MSDU length to 7935 octets</description> </valueHelp> <constraint> - <regex>(3839|7935)</regex> + <regex>^(3839|7935)$</regex> </constraint> </properties> </leafNode> @@ -127,7 +127,7 @@ <description>Short GI for 40 MHz</description> </valueHelp> <constraint> - <regex>(20|40)</regex> + <regex>^(20|40)$</regex> </constraint> <multi/> </properties> @@ -147,7 +147,7 @@ <description>DYNAMIC Spatial Multiplexing (SM) Power Save</description> </valueHelp> <constraint> - <regex>(static|dynamic)</regex> + <regex>^(static|dynamic)$</regex> </constraint> </properties> </leafNode> @@ -164,7 +164,7 @@ <description>Number of spacial streams that can use RX STBC</description> </valueHelp> <constraint> - <regex>[1-3]+</regex> + <regex>^[1-3]+$</regex> </constraint> <constraintErrorMessage>Invalid capability item</constraintErrorMessage> </properties> @@ -243,7 +243,7 @@ <description>Support for operation as multi user beamformee</description> </valueHelp> <constraint> - <regex>(single-user-beamformer|single-user-beamformee|multi-user-beamformer|multi-user-beamformee)</regex> + <regex>^(single-user-beamformer|single-user-beamformee|multi-user-beamformer|multi-user-beamformee)$</regex> </constraint> <multi/> </properties> @@ -329,7 +329,7 @@ <description>Station can provide VHT MFB in response to VHT MRQ and unsolicited VHT MFB</description> </valueHelp> <constraint> - <regex>(unsolicited|both)</regex> + <regex>^(unsolicited|both)$</regex> </constraint> <constraintErrorMessage>Invalid capability item</constraintErrorMessage> </properties> @@ -361,7 +361,7 @@ <description>ncrease Maximum MPDU length to 11454 octets</description> </valueHelp> <constraint> - <regex>(7991|11454)</regex> + <regex>^(7991|11454)$</regex> </constraint> </properties> </leafNode> @@ -380,7 +380,7 @@ <description>Short GI for 160 MHz</description> </valueHelp> <constraint> - <regex>(80|160)</regex> + <regex>^(80|160)$</regex> </constraint> <multi/> </properties> @@ -398,7 +398,7 @@ <description>Number of spacial streams that can use RX STBC</description> </valueHelp> <constraint> - <regex>[1-4]+</regex> + <regex>^[1-4]+$</regex> </constraint> <constraintErrorMessage>Invalid capability item</constraintErrorMessage> </properties> @@ -443,6 +443,22 @@ </constraint> </properties> </leafNode> + <leafNode name="country-code"> + <properties> + <help>Indicate country in which device is operating</help> + <completionHelp> + <list>US EU JP DE UK CN ES FR RU</list> + </completionHelp> + <valueHelp> + <format><code%gt;</format> + <description>ISO/IEC 3166-1 Country Code</description> + </valueHelp> + <constraint> + <regex>^[A-Z][A-Z]$</regex> + </constraint> + <constraintErrorMessage>Invalid ISO/IEC 3166-1 Country Code</constraintErrorMessage> + </properties> + </leafNode> #include <include/interface-description.xml.i> #include <include/dhcp-options.xml.i> #include <include/dhcpv6-options.xml.i> @@ -461,25 +477,8 @@ <valueless/> </properties> </leafNode> - <node name="ip"> - <children> - #include <include/interface-arp-cache-timeout.xml.i> - #include <include/interface-disable-arp-filter.xml.i> - #include <include/interface-disable-forwarding.xml.i> - #include <include/interface-enable-arp-accept.xml.i> - #include <include/interface-enable-arp-announce.xml.i> - #include <include/interface-enable-arp-ignore.xml.i> - #include <include/interface-enable-proxy-arp.xml.i> - #include <include/interface-proxy-arp-pvlan.xml.i> - </children> - </node> - <node name="ipv6"> - <children> - #include <include/ipv6-address.xml.i> - #include <include/ipv6-disable-forwarding.xml.i> - #include <include/ipv6-dup-addr-detect-transmits.xml.i> - </children> - </node> + #include <include/interface-ipv4-options.xml.i> + #include <include/interface-ipv6-options.xml.i> #include <include/interface-hw-id.xml.i> <leafNode name="isolate-stations"> <properties> @@ -520,7 +519,7 @@ <description>MFP enforced</description> </valueHelp> <constraint> - <regex>(disabled|optional|required)</regex> + <regex>^(disabled|optional|required)$</regex> </constraint> </properties> </leafNode> @@ -681,7 +680,7 @@ <properties> <help>WPA mode</help> <completionHelp> - <list>wpa wpa2 both</list> + <list>wpa wpa2 wpa+wpa2 wpa3</list> </completionHelp> <valueHelp> <format>wpa</format> @@ -692,15 +691,15 @@ <description>WPA2 (full IEEE 802.11i/RSN)</description> </valueHelp> <valueHelp> - <format>both</format> + <format>wpa+wpa2</format> <description>Allow both WPA and WPA2</description> </valueHelp> <constraint> - <regex>^(wpa|wpa2|both)$</regex> + <regex>^(wpa|wpa2|wpa\+wpa2|wpa3)$</regex> </constraint> <constraintErrorMessage>Unknown WPA mode</constraintErrorMessage> </properties> - <defaultValue>both</defaultValue> + <defaultValue>wpa+wpa2</defaultValue> </leafNode> <leafNode name="passphrase"> <properties> @@ -782,25 +781,4 @@ </tagNode> </children> </node> - <node name="system"> - <children> - <leafNode name="wifi-regulatory-domain" owner="${vyos_conf_scripts_dir}/system-wifi-regdom.py"> - <properties> - <help>Wireless regulatory domain (mandatory)</help> - <priority>305</priority> - <completionHelp> - <list>US EU JP DE UK CN</list> - </completionHelp> - <valueHelp> - <format><code%gt;</format> - <description>Country code (ISO/IEC 3166-1)</description> - </valueHelp> - <constraint> - <regex>[A-Z][A-Z]$</regex> - </constraint> - <constraintErrorMessage>invalid country code</constraintErrorMessage> - </properties> - </leafNode> - </children> - </node> </interfaceDefinition> diff --git a/interface-definitions/interfaces-wirelessmodem.xml.in b/interface-definitions/interfaces-wirelessmodem.xml.in index 96604ff00..a0e78a124 100644 --- a/interface-definitions/interfaces-wirelessmodem.xml.in +++ b/interface-definitions/interfaces-wirelessmodem.xml.in @@ -66,7 +66,7 @@ </properties> </leafNode> #include <include/interface-disable-link-detect.xml.i> - #include <include/interface-mtu-68-9000.xml.i> + #include <include/interface-mtu-68-16000.xml.i> <node name="ipv6"> <children> #include <include/ipv6-address.xml.i> diff --git a/interface-definitions/protocols-bgp.xml.in b/interface-definitions/protocols-bgp.xml.in index 3a4600753..6de8017f2 100644 --- a/interface-definitions/protocols-bgp.xml.in +++ b/interface-definitions/protocols-bgp.xml.in @@ -282,7 +282,7 @@ <constraint> <validator name="ipv4-address"/> <validator name="ipv6-address"/> - <regex>(en|eth|br|bond|gnv|vxlan|wg|tun)[0-9]+</regex> + <regex>(br|bond|dum|en|eth|gnv|lo|peth|tun|vti|vxlan|wg|wlan)[0-9]+</regex> </constraint> </properties> <children> @@ -342,7 +342,6 @@ <leafNode name="description"> <properties> <help>Description for this neighbor</help> - <valueless/> </properties> </leafNode> <leafNode name="disable-capability-negotiation"> @@ -629,7 +628,11 @@ <help>Source IP of routing updates</help> <valueHelp> <format>ipv4</format> - <description>IP address of route source</description> + <description>IPv4 address of route source</description> + </valueHelp> + <valueHelp> + <format>ipv6</format> + <description>IPv6 address of route source</description> </valueHelp> <valueHelp> <format><interface></format> @@ -637,7 +640,8 @@ </valueHelp> <constraint> <validator name="ipv4-address"/> - <regex>(en|eth|br|bond|gnv|vxlan|wg|tun)[0-9]+</regex> + <validator name="ipv6-address"/> + <regex>(br|bond|dum|en|eth|gnv|lo|peth|tun|vti|vxlan|wg|wlan)[0-9]+</regex> </constraint> </properties> </leafNode> @@ -916,12 +920,6 @@ </tagNode> </children> </node> - <leafNode name="enforce-first-as"> - <properties> - <help>Require first AS in the path to match peer AS number</help> - <valueless/> - </properties> - </leafNode> <node name="graceful-restart"> <properties> <help>Graceful restart capability parameters</help> @@ -1141,7 +1139,11 @@ <help>Source IP of routing updates</help> <valueHelp> <format>ipv4</format> - <description>IP address of route source</description> + <description>IPv4 address of route source</description> + </valueHelp> + <valueHelp> + <format>ipv6</format> + <description>IPv6 address of route source</description> </valueHelp> <valueHelp> <format><interface></format> @@ -1149,7 +1151,8 @@ </valueHelp> <constraint> <validator name="ipv4-address"/> - <regex>(en|eth|br|bond|gnv|vxlan|wg|tun)[0-9]+</regex> + <validator name="ipv6-address"/> + <regex>(br|bond|dum|en|eth|gnv|lo|peth|tun|vti|vxlan|wg|wlan)[0-9]+</regex> </constraint> </properties> </leafNode> diff --git a/interface-definitions/protocols-mpls.xml.in b/interface-definitions/protocols-mpls.xml.in index 3ea610d8b..4df2be4e7 100644 --- a/interface-definitions/protocols-mpls.xml.in +++ b/interface-definitions/protocols-mpls.xml.in @@ -11,15 +11,15 @@ <children> <node name="ldp"> <properties> - <help>LDP options</help> + <help>Label Distribution Protocol (LDP)</help> </properties> <children> <leafNode name="router-id"> <properties> - <help>x.x.x.x Label Switch Router (LSR) id</help> + <help>Label Distribution Protocol (LDP) router ID</help> <valueHelp> <format>ipv4</format> - <description>LSR ipv4 id</description> + <description>LDP IPv4 ID</description> </valueHelp> <constraint> <validator name="ipv4-address"/> @@ -28,10 +28,10 @@ </leafNode> <tagNode name="neighbor"> <properties> - <help>LDP Id of neighbor</help> + <help>LDP neighbor parameters</help> <valueHelp> <format>ipv4</format> - <description>neighbor IPv4 id</description> + <description>Neighbor IPv4 address</description> </valueHelp> <constraint> <validator name="ipv4-address"/> @@ -40,7 +40,35 @@ <children> <leafNode name="password"> <properties> - <help>Peer password</help> + <help>Neighbor password</help> + </properties> + </leafNode> + <leafNode name="ttl-security"> + <properties> + <help>Neighbor TTL security</help> + <completionHelp> + <list>disable</list> + </completionHelp> + <valueHelp> + <format><1-254></format> + <description>TTL</description> + </valueHelp> + <valueHelp> + <format>disable</format> + <description>Disable neighbor TTL security</description> + </valueHelp> + </properties> + </leafNode> + <leafNode name="session-holdtime"> + <properties> + <help>Session IPv4 hold time</help> + <valueHelp> + <format>15-65535</format> + <description>Time in seconds</description> + </valueHelp> + <constraint> + <validator name="numeric" argument="--range 15-65535"/> + </constraint> </properties> </leafNode> </children> @@ -54,9 +82,21 @@ </valueHelp> </properties> <children> - <leafNode name="hello-holdtime"> + <leafNode name="hello-ipv4-holdtime"> + <properties> + <help>Hello IPv4 hold time</help> + <valueHelp> + <format>1-65535</format> + <description>Time in seconds</description> + </valueHelp> + <constraint> + <validator name="numeric" argument="--range 1-65535"/> + </constraint> + </properties> + </leafNode> + <leafNode name="hello-ipv4-interval"> <properties> - <help>Hello holdtime</help> + <help>Hello IPv4 interval</help> <valueHelp> <format>1-65535</format> <description>Time in seconds</description> @@ -66,9 +106,21 @@ </constraint> </properties> </leafNode> - <leafNode name="hello-interval"> + <leafNode name="hello-ipv6-holdtime"> <properties> - <help>Hello interval</help> + <help>Hello IPv6 hold time</help> + <valueHelp> + <format>1-65535</format> + <description>Time in seconds</description> + </valueHelp> + <constraint> + <validator name="numeric" argument="--range 1-65535"/> + </constraint> + </properties> + </leafNode> + <leafNode name="hello-ipv6-interval"> + <properties> + <help>Hello IPv6 interval</help> <valueHelp> <format>1-65535</format> <description>Time in seconds</description> @@ -80,7 +132,7 @@ </leafNode> <leafNode name="session-ipv4-holdtime"> <properties> - <help>Session ipv4 holdtime</help> + <help>Session IPv4 hold time</help> <valueHelp> <format>15-65535</format> <description>Time in seconds</description> @@ -92,7 +144,7 @@ </leafNode> <leafNode name="session-ipv6-holdtime"> <properties> - <help>Session ipv6 holdtime</help> + <help>Session IPv6 hold time</help> <valueHelp> <format>15-65535</format> <description>Time in seconds</description> @@ -104,7 +156,7 @@ </leafNode> <leafNode name="transport-ipv4-address"> <properties> - <help>Transport ipv4 address</help> + <help>Transport IPv4 address</help> <valueHelp> <format>ipv4</format> <description>IPv4 bind as transport</description> @@ -116,7 +168,7 @@ </leafNode> <leafNode name="transport-ipv6-address"> <properties> - <help>Transport ipv6 address</help> + <help>Transport IPv6 address</help> <valueHelp> <format>ipv6</format> <description>IPv6 bind as transport</description> @@ -128,6 +180,132 @@ </leafNode> </children> </node> + <node name="targeted-neighbor"> + <properties> + <help>Targeted LDP neighbor/session parameters</help> + </properties> + <children> + <node name="ipv4"> + <properties> + <help>Targeted IPv4 neighbor/session parameters</help> + </properties> + <children> + <leafNode name="address"> + <properties> + <help>Neighbor/session address</help> + <valueHelp> + <format>ipv4</format> + <description>Neighbor/session address</description> + </valueHelp> + <constraint> + <validator name="ipv4-address"/> + </constraint> + <multi/> + </properties> + </leafNode> + <leafNode name="enable"> + <properties> + <help>Accept and respond to targeted hellos</help> + <valueless/> + </properties> + </leafNode> + <leafNode name="hello-interval"> + <properties> + <help>Hello interval</help> + <valueHelp> + <format>1-65535</format> + <description>Time in seconds</description> + </valueHelp> + <constraint> + <validator name="numeric" argument="--range 1-65535"/> + </constraint> + </properties> + </leafNode> + <leafNode name="hello-holdtime"> + <properties> + <help>Hello hold time</help> + <valueHelp> + <format>1-65535</format> + <description>Time in seconds</description> + </valueHelp> + <constraint> + <validator name="numeric" argument="--range 1-65535"/> + </constraint> + </properties> + </leafNode> + </children> + </node> + <node name="ipv6"> + <properties> + <help>Targeted IPv6 neighbor/session parameters</help> + </properties> + <children> + <leafNode name="address"> + <properties> + <help>Neighbor/session address</help> + <valueHelp> + <format>ipv6</format> + <description>Neighbor/session address</description> + </valueHelp> + <constraint> + <validator name="ipv6-address"/> + </constraint> + <multi/> + </properties> + </leafNode> + <leafNode name="enable"> + <properties> + <help>Accept and respond to targeted hellos</help> + <valueless/> + </properties> + </leafNode> + <leafNode name="hello-interval"> + <properties> + <help>Hello interval</help> + <valueHelp> + <format>1-65535</format> + <description>Time in seconds</description> + </valueHelp> + <constraint> + <validator name="numeric" argument="--range 1-65535"/> + </constraint> + </properties> + </leafNode> + <leafNode name="hello-holdtime"> + <properties> + <help>Hello hold time</help> + <valueHelp> + <format>1-65535</format> + <description>Time in seconds</description> + </valueHelp> + <constraint> + <validator name="numeric" argument="--range 1-65535"/> + </constraint> + </properties> + </leafNode> + </children> + </node> + </children> + </node> + <node name="parameters"> + <properties> + <help>Label Distribution Protocol (LDP) miscellaneous parameters</help> + </properties> + <children> + <leafNode name="cisco-interop-tlv"> + <properties> + <help>Enable Cisco non-compliant format capability TLV</help> + <valueless/> + </properties> + </leafNode> + <leafNode name="transport-prefer-ipv4"> + <properties> + <help>Prefer IPv4 for TCP peer transport connection</help> + <valueless/> + </properties> + </leafNode> + </children> + </node> <node name="export"> <properties> <help>Export parameters</help> @@ -163,7 +341,7 @@ </node> <leafNode name="interface"> <properties> - <help>Listen interface for LDP</help> + <help>Enable LDP and neighbor discovery on interface</help> <completionHelp> <script>${vyos_completion_dir}/list_interfaces.py</script> </completionHelp> @@ -172,6 +350,31 @@ </leafNode> </children> </node> + <node name="parameters"> + <properties> + <help>Multiprotocol Label Switching (MPLS) miscellaneous parameters</help> + </properties> + <children> + <leafNode name="no-propagate-ttl"> + <properties> + <help>Disable copy of IP TTL to MPLS TTL</help> + <valueless/> + </properties> + </leafNode> + <leafNode name="maximum-ttl"> + <properties> + <help>Maximum TTL for MPLS packets</help> + <valueHelp> + <format>1-255</format> + <description>Maximum hops allowed</description> + </valueHelp> + <constraint> + <validator name="numeric" argument="--range 1-255"/> + </constraint> + </properties> + </leafNode> + </children> + </node> </children> </node> </children> diff --git a/interface-definitions/system-ipv6.xml.in b/interface-definitions/system-ipv6.xml.in index 47fbeb4e1..6ead747a1 100644 --- a/interface-definitions/system-ipv6.xml.in +++ b/interface-definitions/system-ipv6.xml.in @@ -22,7 +22,7 @@ </leafNode> <node name="multipath"> <properties> - <help>IPv4 multipath settings</help> + <help>IPv6 multipath settings</help> </properties> <children> <leafNode name="layer4-hashing"> diff --git a/interface-definitions/system-options.xml.in b/interface-definitions/system-options.xml.in index a5fec10db..297f5891e 100644 --- a/interface-definitions/system-options.xml.in +++ b/interface-definitions/system-options.xml.in @@ -38,11 +38,24 @@ <constraintErrorMessage>Must be ignore, reboot, or poweroff</constraintErrorMessage> </properties> </leafNode> - <leafNode name="reboot-on-panic"> - <properties> - <help>Reboot system on kernel panic</help> - <valueless/> - </properties> + <leafNode name="performance"> + <properties> + <help>Tune system performance</help> + <completionHelp> + <list>throughput latency</list> + </completionHelp> + <valueHelp> + <format>throughput</format> + <description>Tune for maximum network throughput</description> + </valueHelp> + <valueHelp> + <format>latency</format> + <description>Tune for low network latency</description> + </valueHelp> + <constraint> + <regex>^(throughput|latency)$</regex> + </constraint> + </properties> </leafNode> <node name="http-client"> <properties> @@ -53,6 +66,12 @@ #include <include/source-address-ipv4-ipv6.xml.i> </children> </node> + <leafNode name="reboot-on-panic"> + <properties> + <help>Reboot system on kernel panic</help> + <valueless/> + </properties> + </leafNode> <node name="ssh-client"> <properties> <help>Global options used for SSH client</help> diff --git a/interface-definitions/vpn_l2tp.xml.in b/interface-definitions/vpn_l2tp.xml.in index 8802c0564..82af86470 100644 --- a/interface-definitions/vpn_l2tp.xml.in +++ b/interface-definitions/vpn_l2tp.xml.in @@ -225,6 +225,7 @@ <children> <tagNode name="server"> <children> + #include <include/accel-radius-additions-disable-accounting.xlm.in> <leafNode name="fail-time"> <properties> <help>Mark server unavailable for <n> seconds on failure</help> |