From ab9fccdc3a460d731d1a56b576bef537331d8f9b Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Sat, 28 Jan 2023 20:51:44 +0100
Subject: vrrp: T1297: improve gratuitous ARP default value handling and help
 strings

---
 interface-definitions/include/vrrp/garp.xml.i | 46 +++++++++++++++------------
 1 file changed, 25 insertions(+), 21 deletions(-)

(limited to 'interface-definitions/include')

diff --git a/interface-definitions/include/vrrp/garp.xml.i b/interface-definitions/include/vrrp/garp.xml.i
index b321c9591..b56b490df 100644
--- a/interface-definitions/include/vrrp/garp.xml.i
+++ b/interface-definitions/include/vrrp/garp.xml.i
@@ -4,38 +4,42 @@
     <help>Gratuitous ARP parameters</help>
   </properties>
   <children>
-    <leafNode name="master-delay">
+    <leafNode name="interval">
       <properties>
-        <help>Delay for second set of gratuitous ARPs after transition to MASTER</help>
+        <help>Interval between Gratuitous ARP</help>
         <valueHelp>
-          <format>u32:1-1000</format>
-          <description>Delay for second set of gratuitous ARPs after transition to MASTER</description>
+          <format>&lt;0.000-1000&gt;</format>
+          <description>Interval in seconds, resolution microseconds</description>
         </valueHelp>
         <constraint>
-          <validator name="numeric" argument="--range 1-1000"/>
+          <validator name="numeric" argument="--range 0.000-1000 --float"/>
         </constraint>
       </properties>
-      <defaultValue>5</defaultValue>
+      <defaultValue>0</defaultValue>
     </leafNode>
-    <leafNode name="master-repeat">
+    <leafNode name="master-delay">
       <properties>
-        <help>Number of gratuitous ARP messages to send at a time after transition to MASTER</help>
+        <help>Delay for second set of gratuitous ARPs after transition to master</help>
         <valueHelp>
-          <format>u32:1-255</format>
-          <description>Number of gratuitous ARP messages to send at a time after transition to MASTER</description>
+          <format>u32:1-1000</format>
+          <description>Delay in seconds</description>
         </valueHelp>
         <constraint>
-          <validator name="numeric" argument="--range 1-255"/>
+          <validator name="numeric" argument="--range 1-1000"/>
         </constraint>
       </properties>
       <defaultValue>5</defaultValue>
     </leafNode>
     <leafNode name="master-refresh">
       <properties>
-        <help>Minimum time interval for refreshing gratuitous ARPs while MASTER. 0 means no refresh</help>
+        <help>Minimum time interval for refreshing gratuitous ARPs while beeing master</help>
+        <valueHelp>
+          <format>u32:0</format>
+          <description>No refresh</description>
+        </valueHelp>
         <valueHelp>
           <format>u32:1-255</format>
-          <description>Minimum time interval for refreshing gratuitous ARPs while MASTER. 0 means no refresh</description>
+          <description>Interval in seconds</description>
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 1-255"/>
@@ -45,10 +49,10 @@
     </leafNode>
     <leafNode name="master-refresh-repeat">
       <properties>
-        <help>Number of gratuitous ARP messages to send at a time while MASTER</help>
+        <help>Number of gratuitous ARP messages to send at a time while beeing master</help>
         <valueHelp>
           <format>u32:1-255</format>
-          <description>Number of gratuitous ARP messages to send at a time while MASTER</description>
+          <description>Number of gratuitous ARP messages</description>
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 1-255"/>
@@ -56,18 +60,18 @@
       </properties>
       <defaultValue>1</defaultValue>
     </leafNode>
-    <leafNode name="interval">
+    <leafNode name="master-repeat">
       <properties>
-        <help>Delay between gratuitous ARP messages sent on an interface</help>
+        <help>Number of gratuitous ARP messages to send at a time after transition to master</help>
         <valueHelp>
-          <format>&lt;0.000-1000&gt;</format>
-          <description>Delay between gratuitous ARP messages sent on an interface</description>
+          <format>u32:1-255</format>
+          <description>Number of gratuitous ARP messages</description>
         </valueHelp>
         <constraint>
-          <validator name="numeric" argument="--range 0.000-1000 --float"/>
+          <validator name="numeric" argument="--range 1-255"/>
         </constraint>
       </properties>
-      <defaultValue>0</defaultValue>
+      <defaultValue>5</defaultValue>
     </leafNode>
   </children>
 </node>
-- 
cgit v1.2.3