From 779f311e7fe81e3c85de28f13e4e12e33b255483 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Sun, 8 Dec 2024 16:33:45 +0100
Subject: frr: T6746: integrate FRRender class into vyos-configd

When running under vyos-configd only a single apply() is done as last step in
the commit algorithm. FRRender class address is provided via an attribute from
vyos-configd process.
---
 python/vyos/configdict.py | 6 ++++++
 python/vyos/frrender.py   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'python')

diff --git a/python/vyos/configdict.py b/python/vyos/configdict.py
index c7384f71d..baffd94dd 100644
--- a/python/vyos/configdict.py
+++ b/python/vyos/configdict.py
@@ -1125,6 +1125,12 @@ def get_frrender_dict(conf) -> dict:
 
         dict.update({'vrf' : vrf})
 
+    # Use singleton instance of the FRR render class
+    if hasattr(conf, 'frrender_cls'):
+        frrender = getattr(conf, 'frrender_cls')
+        dict.update({'frrender_cls' : frrender})
+        frrender.generate(dict)
+
     if os.path.exists(frr_debug_enable):
         print('======== < BEGIN > ==========')
         import pprint
diff --git a/python/vyos/frrender.py b/python/vyos/frrender.py
index 2069930a9..e02094bbb 100644
--- a/python/vyos/frrender.py
+++ b/python/vyos/frrender.py
@@ -136,7 +136,7 @@ class FRRender:
         emsg = ''
         while count < count_max:
             count += 1
-            print('FRR: Reloading configuration', count)
+            print('FRR: Reloading configuration - tries:', count, 'Python class ID:', id(self))
 
             cmdline = '/usr/lib/frr/frr-reload.py --reload'
             if DEBUG_ON:
-- 
cgit v1.2.3