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.

1 files changed, 5 insertions, 6 deletions

diff --git a/src/conf_mode/interfaces_ethernet.py b/src/conf_mode/interfaces_ethernet.py
index 6a035e9e9..accfb6b8e 100755
--- a/src/conf_mode/interfaces_ethernet.py
+++ b/src/conf_mode/interfaces_ethernet.py
@@ -44,7 +44,6 @@ from vyos.utils.dict import dict_delete
 from vyos import ConfigError
 from vyos import airbag
 airbag.enable()
-frrender = FRRender()
 
 def update_bond_options(conf: Config, eth_conf: dict) -> list:
     """
@@ -166,7 +165,7 @@ def get_config(config=None):
     if tmp: ethernet.update({'speed_duplex_changed': {}})
 
     tmp = is_node_changed(conf, base + [ifname, 'evpn'])
-    if tmp: ethernet.update({'frrender' : get_frrender_dict(conf)})
+    if tmp: ethernet.update({'frr_dict' : get_frrender_dict(conf)})
 
     return ethernet
 
@@ -322,13 +321,13 @@ def verify_ethernet(ethernet):
     return None
 
 def generate(ethernet):
-    if 'frrender' in ethernet:
-        frrender.generate(ethernet['frrender'])
+    if 'frr_dict' in ethernet and 'frrender_cls' not in ethernet['frr_dict']:
+        FRRender().generate(ethernet['frr_dict'])
     return None
 
 def apply(ethernet):
-    if 'frrender' in ethernet:
-        frrender.apply()
+    if 'frr_dict' in ethernet and 'frrender_cls' not in ethernet['frr_dict']:
+        FRRender().apply()
 
     e = EthernetIf(ethernet['ifname'])
     if 'deleted' in ethernet: