Merge pull request #1951 from fett0/T4939

 T4939: backport VRRP startup delay

3 files changed, 33 insertions, 0 deletions

diff --git a/data/templates/vrrp/keepalived.conf.tmpl b/data/templates/vrrp/keepalived.conf.tmpl
index 10d5c6d24..6203184e3 100644
--- a/data/templates/vrrp/keepalived.conf.tmpl
+++ b/data/templates/vrrp/keepalived.conf.tmpl
@@ -5,6 +5,11 @@
 global_defs {
     dynamic_interfaces
     script_user root
+{% if global_parameters is defined and global_parameters is not none %}
+{%     if global_parameters.startup_delay is defined %}
+    vrrp_startup_delay {{ global_parameters.startup_delay }}
+{%     endif %}
+{% endif %}
     notify_fifo /run/keepalived/keepalived_notify_fifo
     notify_fifo_script /usr/libexec/vyos/system/keepalived-fifo.py
 }
diff --git a/interface-definitions/vrrp.xml.in b/interface-definitions/vrrp.xml.in
index fed1486f9..80a33c2b2 100644
--- a/interface-definitions/vrrp.xml.in
+++ b/interface-definitions/vrrp.xml.in
@@ -11,6 +11,25 @@
           <help>Virtual Router Redundancy Protocol settings</help>
         </properties>
         <children>
+          <node name="global-parameters">
+            <properties>
+              <help>VRRP global 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-600"/>
+                  </constraint>
+                </properties>
+              </leafNode>
+            </children>
+          </node>
           <tagNode name="group">
             <properties>
               <help>VRRP group</help>
diff --git a/smoketest/scripts/cli/test_ha_vrrp.py b/smoketest/scripts/cli/test_ha_vrrp.py
index 8abc70ccd..ad272f524 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 + ['group', group]
+            global_param_base = base_path + ['global-parameters']
 
             self.cli_set(['interfaces', 'ethernet', vrrp_interface, 'vif', vlan_id, 'address', inc_ip(vip, 1) + '/' + vip.split('/')[-1]])
 
@@ -110,9 +112,16 @@ class TestVRRP(VyOSUnitTestSHIM.TestCase):
             self.cli_set(group_base + ['authentication', 'type', 'plaintext-password'])
             self.cli_set(group_base + ['authentication', 'password', f'{group}'])
 
+            # Global parameters
+            self.cli_set(global_param_base + ['startup-delay', f'{startup_delay}'])
+
         # commit changes
         self.cli_commit()
 
+        # Check Global parameters
+        config = getConfig(f'global_defs')
+        self.assertIn(f'vrrp_startup_delay {startup_delay}', config)
+
         for group in groups:
             vlan_id = group.lstrip('VLAN')
             vip = f'100.64.{vlan_id}.1/24'