From 04a9471cafc14340447f21c80bca10a34cfa20b1 Mon Sep 17 00:00:00 2001
From: Nataliia Solomko <81954790+natali-rs1985@users.noreply.github.com>
Date: Sat, 6 Apr 2024 12:08:59 +0300
Subject: [PATCH] conntrack-sync: T1244: add CLI support for StartupResync

(cherry picked from commit 2eb7f96ca2038bf37dc1d274821ca6f619489b58)
---
 data/templates/conntrackd/conntrackd.conf.j2        | 1 +
 interface-definitions/service_conntrack-sync.xml.in | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/data/templates/conntrackd/conntrackd.conf.j2 b/data/templates/conntrackd/conntrackd.conf.j2
index 669b208775..30e619dafc 100644
--- a/data/templates/conntrackd/conntrackd.conf.j2
+++ b/data/templates/conntrackd/conntrackd.conf.j2
@@ -4,6 +4,7 @@
 Sync {
     Mode FTFW {
         DisableExternalCache {{ 'on' if disable_external_cache is vyos_defined else 'off' }}
+        StartupResync {{ 'on' if startup_resync is vyos_defined else 'off' }}
     }
 {% for iface, iface_config in interface.items() %}
 {%     if iface_config.peer is vyos_defined %}
diff --git a/interface-definitions/service_conntrack-sync.xml.in b/interface-definitions/service_conntrack-sync.xml.in
index 3978648674..631c830b46 100644
--- a/interface-definitions/service_conntrack-sync.xml.in
+++ b/interface-definitions/service_conntrack-sync.xml.in
@@ -81,6 +81,12 @@
               <multi/>
             </properties>
           </leafNode>
+          <leafNode name="startup-resync">
+            <properties>
+              <help>Order conntrackd to request a complete conntrack table resync against the other node at startup</help>
+              <valueless/>
+            </properties>
+          </leafNode>
           <node name="failover-mechanism">
             <properties>
               <help>Failover mechanism to use for conntrack-sync</help>