From ed0da146529c5a38c32ac346335138baab428bac Mon Sep 17 00:00:00 2001
From: fett0 <fernando.gmaidana@gmail.com>
Date: Thu, 19 Jan 2023 18:24:14 +0000
Subject:  T4939: VRRP startup delay for bonding fix

---
 smoketest/scripts/cli/test_ha_vrrp.py | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'smoketest/scripts')

diff --git a/smoketest/scripts/cli/test_ha_vrrp.py b/smoketest/scripts/cli/test_ha_vrrp.py
index 68905e447..fba1f4687 100755
--- a/smoketest/scripts/cli/test_ha_vrrp.py
+++ b/smoketest/scripts/cli/test_ha_vrrp.py
@@ -87,11 +87,13 @@ class TestVRRP(VyOSUnitTestSHIM.TestCase):
         advertise_interval = '77'
         priority = '123'
         preempt_delay = '400'
+        startup_delay = '120'
 
         for group in groups:
             vlan_id = group.lstrip('VLAN')
             vip = f'100.64.{vlan_id}.1/24'
             group_base = base_path + ['vrrp', 'group', group]
+            global_param_base = base_path + ['vrrp', 'global-parameters']
 
             self.cli_set(['interfaces', 'ethernet', vrrp_interface, 'vif', vlan_id, 'address', inc_ip(vip, 1) + '/' + vip.split('/')[-1]])
 
@@ -110,6 +112,10 @@ class TestVRRP(VyOSUnitTestSHIM.TestCase):
             self.cli_set(group_base + ['authentication', 'type', 'plaintext-password'])
             self.cli_set(group_base + ['authentication', 'password', f'{group}'])
 
+            # Global parameters
+            config = getConfig(f'global_defs')
+            self.cli_set(global_param_base + ['startup-delay', f'{startup_delay}'])
+
         # commit changes
         self.cli_commit()
 
-- 
cgit v1.2.3


From 8f8976d3c55eccfc68efd019bac88664f9792f80 Mon Sep 17 00:00:00 2001
From: fett0 <fernando.gmaidana@gmail.com>
Date: Thu, 19 Jan 2023 19:22:57 +0000
Subject:  T4939: VRRP startup delay for bonding fix

---
 .../<tagNode name=\"global-parameter\">.xml"       | 38 ++++++++++++++++++++++
 interface-definitions/high-availability.xml.in     |  2 +-
 smoketest/scripts/cli/test_ha_vrrp.py              |  3 ++
 3 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 "data/templates/high-availability/<tagNode name=\"global-parameter\">.xml"

(limited to 'smoketest/scripts')

diff --git "a/data/templates/high-availability/<tagNode name=\"global-parameter\">.xml" "b/data/templates/high-availability/<tagNode name=\"global-parameter\">.xml"
new file mode 100644
index 000000000..e7e009625
--- /dev/null
+++ "b/data/templates/high-availability/<tagNode name=\"global-parameter\">.xml"	
@@ -0,0 +1,38 @@
+      <tagNode name="global-parameter">
+        <properties>
+          <help>VRRP Globas parameters</help>
+        </properties>
+        <children>
+          <leafNode name="startup-delay">
+           <properties>
+             <help>Time VRRP startup process (in seconds)</help>
+              <valueHelp>
+                <format>u32:1-600</format>
+                <description>Interval in seconds</description>
+              </valueHelp>
+             <constraint>
+               <validator name="numeric" argument="--range 1-3600"/>
+             </constraint>
+           </properties>>
+          </leafNode>
+        </children>
+
+      <node name="global-parameter">
+        <properties>
+          <help>VRRP Globas parameters</help>
+        </properties>
+        <children>
+          <leafNode name="startup-delay">
+           <properties>
+             <help>Time vrrp startup process (in seconds)</help>
+              <valueHelp>
+                <format>u32:1-600</format>
+                <description>Interval in seconds</description>
+              </valueHelp>
+              <constraint>
+               <validator name="numeric" argument="--range 1-3600"/>
+              </constraint>
+           </properties>>
+          </leafNode>
+        </children>
+      </node>
\ No newline at end of file
diff --git a/interface-definitions/high-availability.xml.in b/interface-definitions/high-availability.xml.in
index 09ebfdf39..9436035d8 100644
--- a/interface-definitions/high-availability.xml.in
+++ b/interface-definitions/high-availability.xml.in
@@ -18,7 +18,7 @@
             <children>
               <leafNode name="startup-delay">
                 <properties>
-                  <help>Time vrrp startup process (in seconds)</help>
+                  <help>Time VRRP startup process (in seconds)</help>
                   <valueHelp>
                     <format>u32:1-600</format>
                     <description>Interval in seconds</description>
diff --git a/smoketest/scripts/cli/test_ha_vrrp.py b/smoketest/scripts/cli/test_ha_vrrp.py
index fba1f4687..f18a4ab86 100755
--- a/smoketest/scripts/cli/test_ha_vrrp.py
+++ b/smoketest/scripts/cli/test_ha_vrrp.py
@@ -137,6 +137,9 @@ class TestVRRP(VyOSUnitTestSHIM.TestCase):
             # Authentication
             self.assertIn(f'auth_pass "{group}"', config)
             self.assertIn(f'auth_type PASS', config)
+            # Global parameters
+            config = getConfig(f'global_defs')
+            self.assertIn(f'vrrp_startup_delay {startup_delay}', config)
 
     def test_03_sync_group(self):
         sync_group = 'VyOS'
-- 
cgit v1.2.3