diff options
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/high-availability.xml.in | 12 | ||||
| -rw-r--r-- | interface-definitions/vrrp.xml.in | 257 |
2 files changed, 6 insertions, 263 deletions
diff --git a/interface-definitions/high-availability.xml.in b/interface-definitions/high-availability.xml.in index 42cdceed1..f46343c76 100644 --- a/interface-definitions/high-availability.xml.in +++ b/interface-definitions/high-availability.xml.in @@ -312,7 +312,7 @@ </leafNode> <leafNode name="forward-method"> <properties> - <help>Forwarding method (default - NAT)</help> + <help>Forwarding method (default: NAT)</help> <completionHelp> <list>direct nat tunnel</list> </completionHelp> @@ -340,7 +340,7 @@ <help>Timeout for persistent connections</help> <valueHelp> <format>u32:1-86400</format> - <description>Timeout for persistent connections (default 300)</description> + <description>Timeout for persistent connections (default: 300)</description> </valueHelp> <constraint> <validator name="numeric" argument="--range 1-86400"/> @@ -350,17 +350,17 @@ </leafNode> <leafNode name="protocol"> <properties> - <help>Protocol for port checks (default TCP)</help> + <help>Protocol for port checks (default: TCP)</help> <completionHelp> <list>tcp udp</list> </completionHelp> <valueHelp> <format>tcp</format> - <description>Protocol TCP</description> + <description>TCP</description> </valueHelp> <valueHelp> <format>udp</format> - <description>Protocol UDP</description> + <description>UDP</description> </valueHelp> <constraint> <regex>^(tcp|udp)$</regex> @@ -376,7 +376,7 @@ #include <include/port-number.xml.i> <leafNode name="connection-timeout"> <properties> - <help>Connection timeout to remote server</help> + <help>Server connection timeout</help> <valueHelp> <format>u32:1-86400</format> <description>Connection timeout to remote server</description> diff --git a/interface-definitions/vrrp.xml.in b/interface-definitions/vrrp.xml.in deleted file mode 100644 index 53d79caac..000000000 --- a/interface-definitions/vrrp.xml.in +++ /dev/null @@ -1,257 +0,0 @@ -<?xml version="1.0"?> -<interfaceDefinition> - <node name="high-availability"> - <properties> - <help>High availability settings</help> - </properties> - <children> - <node name="vrrp" owner="${vyos_conf_scripts_dir}/vrrp.py"> - <properties> - <priority>800</priority> <!-- after all interfaces and conntrack-sync --> - <help>Virtual Router Redundancy Protocol settings</help> - </properties> - <children> - <tagNode name="group"> - <properties> - <help>VRRP group</help> - </properties> - <children> - #include <include/generic-interface-broadcast.xml.i> - <leafNode name="advertise-interval"> - <properties> - <help>Advertise interval</help> - <valueHelp> - <format>u32:1-255</format> - <description>Advertise interval in seconds (default: 1)</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 1-255"/> - </constraint> - </properties> - <defaultValue>1</defaultValue> - </leafNode> - <node name="authentication"> - <properties> - <help>VRRP authentication</help> - </properties> - <children> - <leafNode name="password"> - <properties> - <help>VRRP password</help> - <valueHelp> - <format>txt</format> - <description>Password string (up to 8 characters)</description> - </valueHelp> - <constraint> - <regex>.{1,8}</regex> - </constraint> - <constraintErrorMessage>Password must not be longer than 8 characters</constraintErrorMessage> - </properties> - </leafNode> - <leafNode name="type"> - <properties> - <help>Authentication type</help> - <completionHelp> - <list>plaintext-password ah</list> - </completionHelp> - <valueHelp> - <format>plaintext-password</format> - <description>Simple password string</description> - </valueHelp> - <valueHelp> - <format>ah</format> - <description>AH - IPSEC (not recommended)</description> - </valueHelp> - <constraint> - <regex>^(plaintext-password|ah)$</regex> - </constraint> - <constraintErrorMessage>Authentication type must be plaintext-password or ah</constraintErrorMessage> - </properties> - </leafNode> - </children> - </node> - #include <include/generic-description.xml.i> - #include <include/generic-disable-node.xml.i> - <node name="health-check"> - <properties> - <help>Health check script</help> - </properties> - <children> - <leafNode name="failure-count"> - <properties> - <help>Health check failure count required for transition to fault (default: 3)</help> - <constraint> - <validator name="numeric" argument="--positive" /> - </constraint> - </properties> - <defaultValue>3</defaultValue> - </leafNode> - <leafNode name="interval"> - <properties> - <help>Health check execution interval in seconds (default: 60)</help> - <constraint> - <validator name="numeric" argument="--positive"/> - </constraint> - </properties> - <defaultValue>60</defaultValue> - </leafNode> - <leafNode name="script"> - <properties> - <help>Health check script file</help> - <constraint> - <validator name="script"/> - </constraint> - </properties> - </leafNode> - </children> - </node> - <leafNode name="hello-source-address"> - <properties> - <help>VRRP hello source address</help> - <valueHelp> - <format>ipv4</format> - <description>IPv4 hello source address</description> - </valueHelp> - <valueHelp> - <format>ipv6</format> - <description>IPv6 hello source address</description> - </valueHelp> - <constraint> - <validator name="ipv4-address"/> - <validator name="ipv6-address"/> - </constraint> - </properties> - </leafNode> - <leafNode name="peer-address"> - <properties> - <help>Unicast VRRP peer address</help> - <valueHelp> - <format>ipv4</format> - <description>IPv4 unicast peer address</description> - </valueHelp> - <valueHelp> - <format>ipv6</format> - <description>IPv6 unicast peer address</description> - </valueHelp> - <constraint> - <validator name="ipv4-address"/> - <validator name="ipv6-address"/> - </constraint> - </properties> - </leafNode> - <leafNode name="no-preempt"> - <properties> - <valueless/> - <help>Disable master preemption</help> - </properties> - </leafNode> - <leafNode name="preempt-delay"> - <properties> - <help>Preempt delay (in seconds)</help> - <valueHelp> - <format>u32:0-1000</format> - <description>preempt delay</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 0-1000"/> - </constraint> - </properties> - <defaultValue>0</defaultValue> - </leafNode> - <leafNode name="priority"> - <properties> - <help>Router priority (default: 100)</help> - <valueHelp> - <format>u32:1-255</format> - <description>Router priority</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 1-255"/> - </constraint> - </properties> - <defaultValue>100</defaultValue> - </leafNode> - <leafNode name="rfc3768-compatibility"> - <properties> - <help>Use VRRP virtual MAC address as per RFC3768</help> - <valueless/> - </properties> - </leafNode> - #include <include/vrrp-transition-script.xml.i> - <leafNode name="address"> - <properties> - <help>Virtual IP address</help> - <valueHelp> - <format>ipv4</format> - <description>IPv4 virtual address</description> - </valueHelp> - <valueHelp> - <format>ipv6</format> - <description>IPv6 virtual address</description> - </valueHelp> - <constraint> - <validator name="ipv4-host"/> - <validator name="ipv6-host"/> - </constraint> - <multi/> - </properties> - </leafNode> - <leafNode name="excluded-address"> - <properties> - <help>Virtual address (If you need additional IPv4 and IPv6 in same group)</help> - <valueHelp> - <format>ipv4</format> - <description>IP address</description> - </valueHelp> - <valueHelp> - <format>ipv6</format> - <description>IPv6 address</description> - </valueHelp> - <multi/> - <constraint> - <validator name="ipv4-host"/> - <validator name="ipv6-host"/> - </constraint> - <constraintErrorMessage>Virtual address must be a valid IPv4 or IPv6 address with prefix length (e.g. 192.0.2.3/24 or 2001:db8:ff::10/64)</constraintErrorMessage> - </properties> - </leafNode> - <leafNode name="vrid"> - <properties> - <help>Virtual router identifier</help> - <valueHelp> - <format>u32:1-255</format> - <description>Virtual router identifier</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 1-255"/> - </constraint> - </properties> - </leafNode> - </children> - </tagNode> - <tagNode name="sync-group"> - <properties> - <help>VRRP sync group</help> - </properties> - <children> - <leafNode name="member"> - <properties> - <multi/> - <help>Sync group member</help> - <valueHelp> - <format>txt</format> - <description>VRRP group name</description> - </valueHelp> - <completionHelp> - <path>high-availability vrrp group</path> - </completionHelp> - </properties> - </leafNode> - #include <include/vrrp-transition-script.xml.i> - </children> - </tagNode> - </children> - </node> - </children> - </node> -</interfaceDefinition> |