diff options
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/dhcp-relay.xml.in | 4 | ||||
| -rw-r--r-- | interface-definitions/dhcpv6-relay.xml.in | 1 | ||||
| -rw-r--r-- | interface-definitions/igmp-proxy.xml.in | 10 | ||||
| -rw-r--r-- | interface-definitions/include/nat-rule.xml.i | 1 | ||||
| -rw-r--r-- | interface-definitions/interfaces-tunnel.xml.in | 41 | ||||
| -rw-r--r-- | interface-definitions/interfaces-wireguard.xml.in | 1 | ||||
| -rw-r--r-- | interface-definitions/interfaces-wireless.xml.in | 6 | ||||
| -rw-r--r-- | interface-definitions/ntp.xml.in | 6 | ||||
| -rw-r--r-- | interface-definitions/policy-local-route.xml.in | 67 | ||||
| -rw-r--r-- | interface-definitions/protocols-mpls.xml.in | 9 | ||||
| -rw-r--r-- | interface-definitions/system-option.xml.in (renamed from interface-definitions/system-options.xml.in) | 86 |
11 files changed, 162 insertions, 70 deletions
diff --git a/interface-definitions/dhcp-relay.xml.in b/interface-definitions/dhcp-relay.xml.in index b83402aa1..8c95239d9 100644 --- a/interface-definitions/dhcp-relay.xml.in +++ b/interface-definitions/dhcp-relay.xml.in @@ -35,6 +35,7 @@ </constraint> <constraintErrorMessage>hop-count must be a value between 1 and 255</constraintErrorMessage> </properties> + <defaultValue>10</defaultValue> </leafNode> <leafNode name="max-size"> <properties> @@ -72,9 +73,10 @@ <description>discard packet (default action if giaddr not set in packet)</description> </valueHelp> <constraint> - <regex>(append|replace|forward|discard)</regex> + <regex>^(append|replace|forward|discard)$</regex> </constraint> </properties> + <defaultValue>forward</defaultValue> </leafNode> </children> </node> diff --git a/interface-definitions/dhcpv6-relay.xml.in b/interface-definitions/dhcpv6-relay.xml.in index 0beb09d05..308f94a01 100644 --- a/interface-definitions/dhcpv6-relay.xml.in +++ b/interface-definitions/dhcpv6-relay.xml.in @@ -43,6 +43,7 @@ </constraint> <constraintErrorMessage>max-hop-count must be a value between 1 and 255</constraintErrorMessage> </properties> + <defaultValue>10</defaultValue> </leafNode> <tagNode name="upstream-interface"> <properties> diff --git a/interface-definitions/igmp-proxy.xml.in b/interface-definitions/igmp-proxy.xml.in index 74fec6b48..b9c52794f 100644 --- a/interface-definitions/igmp-proxy.xml.in +++ b/interface-definitions/igmp-proxy.xml.in @@ -44,7 +44,7 @@ </leafNode> <leafNode name="role"> <properties> - <help>Role of this IGMP interface</help> + <help>IGMP interface role (default: downstream)</help> <completionHelp> <list>upstream downstream disabled</list> </completionHelp> @@ -61,13 +61,14 @@ <description>Disabled interface</description> </valueHelp> <constraint> - <regex>(upstream|downstream|disabled)</regex> + <regex>^(upstream|downstream|disabled)$</regex> </constraint> </properties> + <defaultValue>downstream</defaultValue> </leafNode> <leafNode name="threshold"> <properties> - <help>TTL threshold</help> + <help>TTL threshold (default: 1)</help> <valueHelp> <format>1-255</format> <description>TTL threshold for the interfaces (default: 1)</description> @@ -75,8 +76,9 @@ <constraint> <validator name="numeric" argument="--range 1-255"/> </constraint> - <constraintErrorMessage>threshold must be between 1 and 255</constraintErrorMessage> + <constraintErrorMessage>Threshold must be between 1 and 255</constraintErrorMessage> </properties> + <defaultValue>1</defaultValue> </leafNode> <leafNode name="whitelist"> <properties> diff --git a/interface-definitions/include/nat-rule.xml.i b/interface-definitions/include/nat-rule.xml.i index f91834ae0..e70cfd796 100644 --- a/interface-definitions/include/nat-rule.xml.i +++ b/interface-definitions/include/nat-rule.xml.i @@ -290,6 +290,7 @@ <validator name="ip-protocol"/> </constraint> </properties> + <defaultValue>all</defaultValue> </leafNode> <node name="source"> <properties> diff --git a/interface-definitions/interfaces-tunnel.xml.in b/interface-definitions/interfaces-tunnel.xml.in index c3f178d59..b322374b3 100644 --- a/interface-definitions/interfaces-tunnel.xml.in +++ b/interface-definitions/interfaces-tunnel.xml.in @@ -39,7 +39,6 @@ <script>${vyos_completion_dir}/list_local.py</script> </completionHelp> <constraint> - <!-- does it need fixing/changing to be more restrictive ? --> <validator name="ip-address"/> </constraint> </properties> @@ -104,7 +103,7 @@ <script>${vyos_completion_dir}/list_interfaces.py</script> </completionHelp> <constraint> - <regex>(en|eth|br|bond|gnv|vxlan|wg|tun)[0-9]+</regex> + <regex>^(en|eth|br|bond|gnv|vxlan|wg|tun)[0-9]+$</regex> </constraint> </properties> </leafNode> @@ -112,36 +111,40 @@ <properties> <help>Encapsulation of this tunnel interface</help> <completionHelp> - <list>gre gre-bridge ipip sit ipip6 ip6ip6 ip6gre</list> + <list>gre gre-bridge ip6gre ip6ip6 ipip ipip6 sit</list> </completionHelp> <valueHelp> + <format>gre</format> + <description>Generic Routing Encapsulation</description> + </valueHelp> + <valueHelp> <format>gre-bridge</format> <description>Generic Routing Encapsulation bridge interface</description> </valueHelp> <valueHelp> - <format>ipip</format> - <description>IP in IP encapsulation</description> + <format>ip6gre</format> + <description>GRE over IPv6 network</description> </valueHelp> <valueHelp> - <format>sit</format> - <description>Simple Internet Transition encapsulation</description> + <format>ip6ip6</format> + <description>IP6 in IP6 encapsulation</description> </valueHelp> <valueHelp> - <format>ipip6</format> - <description>IP in IP6 encapsulation</description> + <format>ipip</format> + <description>IP in IP encapsulation</description> </valueHelp> <valueHelp> - <format>ip6ip6</format> - <description>IP6 in IP6 encapsulation</description> + <format>ipip6</format> + <description>IP in IP6 encapsulation</description> </valueHelp> <valueHelp> - <format>ip6gre</format> - <description>GRE over IPv6 network</description> + <format>sit</format> + <description>Simple Internet Transition encapsulation</description> </valueHelp> <constraint> - <regex>(gre|gre-bridge|ipip|sit|ipip6|ip6ip6|ip6gre)</regex> + <regex>^(gre|gre-bridge|ip6gre|ip6ip6|ipip|ipip6|sit)$</regex> </constraint> - <constraintErrorMessage>Must be one of 'gre' 'gre-bridge' 'ipip' 'sit' 'ipip6' 'ip6ip6' 'ip6gre'</constraintErrorMessage> + <constraintErrorMessage>Invalid encapsulation, must be one of: gre, gre-bridge, ipip, sit, ipip6, ip6ip6, ip6gre</constraintErrorMessage> </properties> </leafNode> <leafNode name="multicast"> @@ -159,7 +162,7 @@ <description>Disable Multicast (default)</description> </valueHelp> <constraint> - <regex>(enable|disable)</regex> + <regex>^(enable|disable)$</regex> </constraint> <constraintErrorMessage>Must be 'disable' or 'enable'</constraintErrorMessage> </properties> @@ -186,6 +189,7 @@ </constraint> <constraintErrorMessage>TTL must be between 0 and 255</constraintErrorMessage> </properties> + <defaultValue>255</defaultValue> </leafNode> <leafNode name="tos"> <properties> @@ -199,6 +203,7 @@ </constraint> <constraintErrorMessage>TOS must be between 0 and 99</constraintErrorMessage> </properties> + <defaultValue>inherit</defaultValue> </leafNode> <leafNode name="key"> <properties> @@ -232,6 +237,7 @@ </constraint> <constraintErrorMessage>key must be between 0-255</constraintErrorMessage> </properties> + <defaultValue>4</defaultValue> </leafNode> <leafNode name="flowlabel"> <properties> @@ -245,6 +251,7 @@ </constraint> <constraintErrorMessage>Must be 'inherit' or a number</constraintErrorMessage> </properties> + <defaultValue>inherit</defaultValue> </leafNode> <leafNode name="hoplimit"> <properties> @@ -258,6 +265,7 @@ </constraint> <constraintErrorMessage>hoplimit must be between 0-255</constraintErrorMessage> </properties> + <defaultValue>64</defaultValue> </leafNode> <leafNode name="tclass"> <properties> @@ -271,6 +279,7 @@ </constraint> <constraintErrorMessage>Must be 'inherit' or a number</constraintErrorMessage> </properties> + <defaultValue>inherit</defaultValue> </leafNode> </children> </node> diff --git a/interface-definitions/interfaces-wireguard.xml.in b/interface-definitions/interfaces-wireguard.xml.in index aa63e4ac7..84f7803a0 100644 --- a/interface-definitions/interfaces-wireguard.xml.in +++ b/interface-definitions/interfaces-wireguard.xml.in @@ -22,6 +22,7 @@ #include <include/interface-vrf.xml.i> #include <include/port-number.xml.i> #include <include/interface-mtu-68-16000.xml.i> + #include <include/interface-ipv6-options.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 fdea1e3ab..6b238e313 100644 --- a/interface-definitions/interfaces-wireless.xml.in +++ b/interface-definitions/interfaces-wireless.xml.in @@ -771,12 +771,6 @@ </leafNode> #include <include/vif.xml.i> #include <include/vif-s.xml.i> - <leafNode name="wds"> - <properties> - <help>Enable WDS (Wireless Distribution System)</help> - <valueless/> - </properties> - </leafNode> </children> </tagNode> </children> diff --git a/interface-definitions/ntp.xml.in b/interface-definitions/ntp.xml.in index 6070cafe0..6a8eb0818 100644 --- a/interface-definitions/ntp.xml.in +++ b/interface-definitions/ntp.xml.in @@ -20,6 +20,12 @@ <valueless/> </properties> </leafNode> + <leafNode name="pool"> + <properties> + <help>Associate with a number of remote servers</help> + <valueless/> + </properties> + </leafNode> <leafNode name="preempt"> <properties> <help>Specifies the association as preemptable rather than the default persistent</help> diff --git a/interface-definitions/policy-local-route.xml.in b/interface-definitions/policy-local-route.xml.in new file mode 100644 index 000000000..5536c71c8 --- /dev/null +++ b/interface-definitions/policy-local-route.xml.in @@ -0,0 +1,67 @@ +<?xml version="1.0"?> +<!-- Policy local-route --> +<interfaceDefinition> + <node name="policy"> + <children> + <node name="local-route" owner="${vyos_conf_scripts_dir}/policy-local-route.py"> + <properties> + <help>IPv4 policy route of local traffic</help> + </properties> + <children> + <tagNode name="rule"> + <properties> + <help>Policy local-route rule set number</help> + <valueHelp> + <!-- table main with prio 32766 --> + <format><1-32765></format> + <description>Local-route rule number (1-219)</description> + </valueHelp> + <constraint> + <validator name="numeric" argument="--range 1-32765"/> + </constraint> + </properties> + <children> + <node name="set"> + <properties> + <help>Packet modifications</help> + </properties> + <children> + <leafNode name="table"> + <properties> + <help>Routing table to forward packet with</help> + <valueHelp> + <format><1-200></format> + <description>Table number</description> + </valueHelp> + <completionHelp> + <list>main</list> + </completionHelp> + </properties> + </leafNode> + </children> + </node> + <leafNode name="source"> + <properties> + <help>Source address or prefix</help> + <valueHelp> + <format>ipv4</format> + <description>Address to match against</description> + </valueHelp> + <valueHelp> + <format>ipv4net</format> + <description>Prefix to match against</description> + </valueHelp> + <constraint> + <validator name="ipv4-address"/> + <validator name="ip-prefix"/> + </constraint> + <multi/> + </properties> + </leafNode> + </children> + </tagNode> + </children> + </node> + </children> + </node> +</interfaceDefinition> diff --git a/interface-definitions/protocols-mpls.xml.in b/interface-definitions/protocols-mpls.xml.in index 4df2be4e7..16286f2c4 100644 --- a/interface-definitions/protocols-mpls.xml.in +++ b/interface-definitions/protocols-mpls.xml.in @@ -375,6 +375,15 @@ </leafNode> </children> </node> + <leafNode name="interface"> + <properties> + <help>Enable MPLS packet processing on interface</help> + <completionHelp> + <script>${vyos_completion_dir}/list_interfaces.py</script> + </completionHelp> + <multi/> + </properties> + </leafNode> </children> </node> </children> diff --git a/interface-definitions/system-options.xml.in b/interface-definitions/system-option.xml.in index 12e4044af..26b78c8a4 100644 --- a/interface-definitions/system-options.xml.in +++ b/interface-definitions/system-option.xml.in @@ -2,35 +2,29 @@ <interfaceDefinition> <node name="system"> <children> - <node name="options" owner="${vyos_conf_scripts_dir}/system-options.py"> + <node name="option" owner="${vyos_conf_scripts_dir}/system-option.py"> <properties> <help>System Options</help> <priority>9999</priority> </properties> <children> - <leafNode name="beep-if-fully-booted"> + <leafNode name="ctrl-alt-delete"> <properties> - <help>plays sound via system speaker when you can login</help> - <valueless/> - </properties> - </leafNode> - <leafNode name="ctrl-alt-del-action"> - <properties> - <help>Ctrl-Alt-Delete action</help> + <help>System action on Ctrl-Alt-Delete keystroke</help> <completionHelp> <list>ignore reboot poweroff</list> </completionHelp> <valueHelp> <format>ignore</format> - <description>Ignore Ctrl-Alt-Delete</description> + <description>Ignore key sequence</description> </valueHelp> <valueHelp> <format>reboot</format> - <description>Reboot VyOS</description> + <description>Reboot system</description> </valueHelp> <valueHelp> <format>poweroff</format> - <description>Poweroff VyOS</description> + <description>Poweroff system</description> </valueHelp> <constraint> <regex>^(ignore|reboot|poweroff)$</regex> @@ -38,7 +32,40 @@ <constraintErrorMessage>Must be ignore, reboot, or poweroff</constraintErrorMessage> </properties> </leafNode> - <leafNode name="performance"> + <leafNode name="keyboard-layout"> + <properties> + <help>System keyboard layout, type ISO2</help> + <completionHelp> + <list>us fr de fi no dk</list> + </completionHelp> + <valueHelp> + <format>us</format> + <description>United States of America</description> + </valueHelp> + <valueHelp> + <format>fr</format> + <description>France</description> + </valueHelp> + <valueHelp> + <format>de</format> + <description>Germany</description> + </valueHelp> + <valueHelp> + <format>fi</format> + <description>Finland</description> + </valueHelp> + <valueHelp> + <format>no</format> + <description>Norway</description> + </valueHelp> + <valueHelp> + <format>dk</format> + <description>Denmark</description> + </valueHelp> + </properties> + <defaultValue>us</defaultValue> + </leafNode> + <leafNode name="performance"> <properties> <help>Tune system performance</help> <completionHelp> @@ -80,38 +107,11 @@ #include <include/source-address-ipv4-ipv6.xml.i> </children> </node> - <leafNode name="keyboard-layout"> + <leafNode name="startup-beep"> <properties> - <help>System keyboard layout, type ISO2</help> - <completionHelp> - <list>us fr de fi no dk</list> - </completionHelp> - <valueHelp> - <format>us</format> - <description>United States of America</description> - </valueHelp> - <valueHelp> - <format>fr</format> - <description>France</description> - </valueHelp> - <valueHelp> - <format>de</format> - <description>Germany</description> - </valueHelp> - <valueHelp> - <format>fi</format> - <description>Finland</description> - </valueHelp> - <valueHelp> - <format>no</format> - <description>Norway</description> - </valueHelp> - <valueHelp> - <format>dk</format> - <description>Denmark</description> - </valueHelp> + <help>plays sound via system speaker when you can login</help> + <valueless/> </properties> - <defaultValue>us</defaultValue> </leafNode> </children> </node> |