From 463a2078669b5499e82c7d2c06807f16d6c2a99d Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Mon, 26 Jun 2023 21:28:10 +0200
Subject: vrrp: T5315: add support to explicitly specify version

set high-availability vrrp group <name> version 2|3

(cherry picked from commit 6ca308182a7891e600a2e8749f7b12b566005576)
---
 interface-definitions/vrrp.xml.in | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'interface-definitions')

diff --git a/interface-definitions/vrrp.xml.in b/interface-definitions/vrrp.xml.in
index 80a33c2b2..cbd248b33 100644
--- a/interface-definitions/vrrp.xml.in
+++ b/interface-definitions/vrrp.xml.in
@@ -28,6 +28,25 @@
                   </constraint>
                 </properties>
               </leafNode>
+              <leafNode name="version">
+                <properties>
+                  <help>Default VRRP version to use, IPv6 always uses VRRP version 3</help>
+                  <completionHelp>
+                    <list>2 3</list>
+                  </completionHelp>
+                  <valueHelp>
+                    <format>u32:2</format>
+                    <description>VRRP version 2</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>u32:3</format>
+                    <description>VRRP version 3</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="numeric" argument="--range 2-3"/>
+                  </constraint>
+                </properties>
+              </leafNode>
             </children>
           </node>
           <tagNode name="group">
-- 
cgit v1.2.3


From e8ab66da5342579a412de090d827fcb0a0bb0e57 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Mon, 26 Jun 2023 21:44:06 +0200
Subject: vrrp: T5315: fix completion helper

(cherry picked from commit 90c0c2c4c81cdbf2ec3f928499f3e1719bfd6f9a)
---
 interface-definitions/vrrp.xml.in | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/vrrp.xml.in b/interface-definitions/vrrp.xml.in
index cbd248b33..0684a7e4e 100644
--- a/interface-definitions/vrrp.xml.in
+++ b/interface-definitions/vrrp.xml.in
@@ -31,15 +31,12 @@
               <leafNode name="version">
                 <properties>
                   <help>Default VRRP version to use, IPv6 always uses VRRP version 3</help>
-                  <completionHelp>
-                    <list>2 3</list>
-                  </completionHelp>
                   <valueHelp>
-                    <format>u32:2</format>
+                    <format>2</format>
                     <description>VRRP version 2</description>
                   </valueHelp>
                   <valueHelp>
-                    <format>u32:3</format>
+                    <format>3</format>
                     <description>VRRP version 3</description>
                   </valueHelp>
                   <constraint>
-- 
cgit v1.2.3