summaryrefslogtreecommitdiff
path: root/interface-definitions
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@vyos.io>2024-03-28 19:14:04 +0100
committerGitHub <noreply@github.com>2024-03-28 19:14:04 +0100
commit6688295580219ed5c6cf98b55acad1a37b780db2 (patch)
tree8ffec5834fde4bc18e76d642a283baed0103220e /interface-definitions
parent42c9243e05a9b9617e9053a3caaddf01567501e3 (diff)
parentcc60e0dcd491e606ac45241419a71e3a763f6ac1 (diff)
downloadvyos-1x-6688295580219ed5c6cf98b55acad1a37b780db2.tar.gz
vyos-1x-6688295580219ed5c6cf98b55acad1a37b780db2.zip
Merge pull request #3206 from vyos/mergify/bp/sagitta/pr-3200
T5832: VRRP allow set interface for exluded-address (backport #3200)
Diffstat (limited to 'interface-definitions')
-rw-r--r--interface-definitions/high-availability.xml.in23
1 files changed, 16 insertions, 7 deletions
diff --git a/interface-definitions/high-availability.xml.in b/interface-definitions/high-availability.xml.in
index 558404882..7108aa06c 100644
--- a/interface-definitions/high-availability.xml.in
+++ b/interface-definitions/high-availability.xml.in
@@ -294,25 +294,34 @@
#include <include/generic-interface-broadcast.xml.i>
</children>
</tagNode>
- <leafNode name="excluded-address">
+ <tagNode name="excluded-address">
<properties>
<help>Virtual address (If you need additional IPv4 and IPv6 in same group)</help>
<valueHelp>
+ <format>ipv4net</format>
+ <description>IPv4 address and prefix length</description>
+ </valueHelp>
+ <valueHelp>
+ <format>ipv6net</format>
+ <description>IPv6 address and prefix length</description>
+ </valueHelp>
+ <valueHelp>
<format>ipv4</format>
- <description>IP address</description>
+ <description>IPv4 address</description>
</valueHelp>
<valueHelp>
<format>ipv6</format>
<description>IPv6 address</description>
</valueHelp>
- <multi/>
<constraint>
- <validator name="ipv4-host"/>
- <validator name="ipv6-host"/>
+ <validator name="ip-host"/>
+ <validator name="ip-address"/>
</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>
+ <children>
+ #include <include/generic-interface-broadcast.xml.i>
+ </children>
+ </tagNode>
<leafNode name="vrid">
<properties>
<help>Virtual router identifier</help>