From b9d4d8c67d6b41ebbf5b570c7c6b09e05520e737 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Tue, 21 Sep 2021 22:07:33 +0200
Subject: vrrp: keepalived: T3847: migrate/streamline CLI options

Rename virtual-address -> address as we always talk about an IP address.
---
 interface-definitions/vrrp.xml.in | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/vrrp.xml.in b/interface-definitions/vrrp.xml.in
index 44bd7e454..44a9a1f54 100644
--- a/interface-definitions/vrrp.xml.in
+++ b/interface-definitions/vrrp.xml.in
@@ -185,9 +185,9 @@
                 </properties>
               </leafNode>
               #include <include/vrrp-transition-script.xml.i>
-              <leafNode name="virtual-address">
+              <leafNode name="address">
                 <properties>
-                  <help>Virtual address (IPv4 or IPv6, but they must not be mixed in one group)</help>
+                  <help>Virtual IP address</help>
                   <valueHelp>
                     <format>ipv4</format>
                     <description>IPv4 virtual address</description>
@@ -200,11 +200,10 @@
                     <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>
                   <multi/>
                 </properties>
               </leafNode>
-              <leafNode name="virtual-address-excluded">
+              <leafNode name="excluded-address">
                 <properties>
                   <help>Virtual address (If you need additional IPv4 and IPv6 in same group)</help>
                   <valueHelp>
-- 
cgit v1.2.3