summaryrefslogtreecommitdiff
path: root/interface-definitions
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-07-11 20:10:55 +0200
committerGitHub <noreply@github.com>2023-07-11 20:10:55 +0200
commit484259af7d2530601faacf7ad741523c5f93622a (patch)
tree2fa138b18666172d0765e3d8a1882a98d7cc9238 /interface-definitions
parent16f7d593e841b73b2fa4b8120f4bb8e66c4321b3 (diff)
parent60be130df1b5918c3bf1a460fdf65c5fa0e59253 (diff)
downloadvyos-1x-484259af7d2530601faacf7ad741523c5f93622a.tar.gz
vyos-1x-484259af7d2530601faacf7ad741523c5f93622a.zip
Merge pull request #2084 from sever-sever/T5341
T5341: HA migrate virtual-server address tag to section address
Diffstat (limited to 'interface-definitions')
-rw-r--r--interface-definitions/high-availability.xml.in3
-rw-r--r--interface-definitions/include/address-ipv4-ipv6-single.xml.i18
-rw-r--r--interface-definitions/include/version/vrrp-version.xml.i2
3 files changed, 21 insertions, 2 deletions
diff --git a/interface-definitions/high-availability.xml.in b/interface-definitions/high-availability.xml.in
index d1bbcc365..4f55916fa 100644
--- a/interface-definitions/high-availability.xml.in
+++ b/interface-definitions/high-availability.xml.in
@@ -336,9 +336,10 @@
</node>
<tagNode name="virtual-server">
<properties>
- <help>Load-balancing virtual server address</help>
+ <help>Load-balancing virtual server alias</help>
</properties>
<children>
+ #include <include/address-ipv4-ipv6-single.xml.i>
<leafNode name="algorithm">
<properties>
<help>Schedule algorithm (default - least-connection)</help>
diff --git a/interface-definitions/include/address-ipv4-ipv6-single.xml.i b/interface-definitions/include/address-ipv4-ipv6-single.xml.i
new file mode 100644
index 000000000..dc3d6fc1b
--- /dev/null
+++ b/interface-definitions/include/address-ipv4-ipv6-single.xml.i
@@ -0,0 +1,18 @@
+<!-- include start from interface/address-ipv4-ipv6.xml.i -->
+<leafNode name="address">
+ <properties>
+ <help>IP address</help>
+ <valueHelp>
+ <format>ipv4</format>
+ <description>IPv4 address</description>
+ </valueHelp>
+ <valueHelp>
+ <format>ipv6</format>
+ <description>IPv6 address</description>
+ </valueHelp>
+ <constraint>
+ <validator name="ip-address"/>
+ </constraint>
+ </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/version/vrrp-version.xml.i b/interface-definitions/include/version/vrrp-version.xml.i
index 626dd6cbc..1514b19ab 100644
--- a/interface-definitions/include/version/vrrp-version.xml.i
+++ b/interface-definitions/include/version/vrrp-version.xml.i
@@ -1,3 +1,3 @@
<!-- include start from include/version/vrrp-version.xml.i -->
-<syntaxVersion component='vrrp' version='3'></syntaxVersion>
+<syntaxVersion component='vrrp' version='4'></syntaxVersion>
<!-- include end -->