frr: T6747: migrate protocols to unified FRRender class

With FRR 10.0 daemons started to be migrated to integrated FRR mgmtd and a
northbound interface. This led to some drawbacks in the current state how
changes to FRR are handled. The current implementation will use frr-reload.py
and specifies excatly WHICH daemon needs a config update and will only replace
this part inside FRR.

With FRR10 and mgmtd when a partial configuration is sent to mgmtd, it will
remove configuration parts from other daemons like bgpd or ospfd which have
not yet been migrated to mgmtd.

It's not possible to call frr-reload.py with daemon mgmtd - it will error out.

This commit will also change the CLI for static routes:

CLI command "set protocols static route 10.0.0.0/8 next-hop 1.2.3.4 bfd multi-hop
source 1.1.1.1" will be split into:
* set protocols static route 10.0.0.0/8 next-hop 1.2.3.4 bfd source-address 1.1.1.1
* set protocols static route 10.0.0.0/8 next-hop 1.2.3.4 bfd multi-hop

To make the XML blocks reusable, and comply with the FRR CLI - this was actually
a wrong implementation from the beginning as you can not have multiple BFD
source addresses.

CLI command "set protocols static route 10.0.0.0/8 next-hop 1.2.3.4 bfd multi-hop
source 1.1.1.1 profile bar" is changed to:
* set protocols static route 10.0.0.0/8 next-hop 1.2.3.4 bfd profile bar

CLI commands "set protocols static multicast interface-route" is moved to:
* set protocols static multicast route <x.x.x.x/x> interface

To have an identical look and feel with regular static routes.

1 files changed, 14 insertions, 49 deletions

diff --git a/src/conf_mode/protocols_openfabric.py b/src/conf_mode/protocols_openfabric.py
index b60117a02..3dc06ee68 100644
--- a/src/conf_mode/protocols_openfabric.py
+++ b/src/conf_mode/protocols_openfabric.py
@@ -18,14 +18,15 @@ from sys import exit
 
 from vyos.base import Warning
 from vyos.config import Config
-from vyos.configdict import node_changed
+from vyos.configdict import get_frrender_dict
 from vyos.configverify import verify_interface_exists
-from vyos.template import render_to_string
+from vyos.configverify import has_frr_protocol_in_dict
+from vyos.frrender import FRRender
 from vyos import ConfigError
-from vyos import frr
 from vyos import airbag
 
 airbag.enable()
+frrender = FRRender()
 
 def get_config(config=None):
     if config:
@@ -33,32 +34,14 @@ def get_config(config=None):
     else:
         conf = Config()
 
-    base_path = ['protocols', 'openfabric']
+    return get_frrender_dict(conf)
 
-    openfabric = conf.get_config_dict(base_path, key_mangling=('-', '_'),
-                                get_first_key=True,
-                                no_tag_node_value_mangle=True)
-
-    # Remove per domain MPLS configuration - get a list of all changed Openfabric domains
-    # (removed and added) so that they will be properly rendered for the FRR config.
-    openfabric['domains_all'] = list(conf.list_nodes(' '.join(base_path) + f' domain') +
-                                         node_changed(conf, base_path + ['domain']))
-
-    # Get a list of all interfaces
-    openfabric['interfaces_all'] = []
-    for domain in openfabric['domains_all']:
-        interfaces_modified = list(node_changed(conf, base_path + ['domain', domain, 'interface']) +
-                                  conf.list_nodes(' '.join(base_path) + f' domain {domain} interface'))
-        openfabric['interfaces_all'].extend(interfaces_modified)
-
-    if not conf.exists(base_path):
-        openfabric.update({'deleted': ''})
-
-    return openfabric
+def verify(config_dict):
+    if not has_frr_protocol_in_dict(config_dict, 'openfabric'):
+        return None
 
-def verify(openfabric):
-    # bail out early - looks like removal from running config
-    if not openfabric or 'deleted' in openfabric:
+    openfabric = config_dict['openfabric']
+    if 'deleted' in openfabric:
         return None
 
     if 'net' not in openfabric:
@@ -107,29 +90,11 @@ def verify(openfabric):
 
     return None
 
-def generate(openfabric):
-    if not openfabric or 'deleted' in openfabric:
-        return None
-
-    openfabric['frr_fabricd_config'] = render_to_string('frr/fabricd.frr.j2', openfabric)
-    return None
-
-def apply(openfabric):
-    # Save original configuration prior to starting any commit actions
-    frr_cfg = frr.FRRConfig()
-
-    frr_cfg.load_configuration(frr.openfabric_daemon)
-    for domain in openfabric['domains_all']:
-        frr_cfg.modify_section(f'^router openfabric {domain}', stop_pattern='^exit', remove_stop_mark=True)
-
-    for interface in openfabric['interfaces_all']:
-        frr_cfg.modify_section(f'^interface {interface}', stop_pattern='^exit', remove_stop_mark=True)
-
-    if 'frr_fabricd_config' in openfabric:
-        frr_cfg.add_before(frr.default_add_before, openfabric['frr_fabricd_config'])
-
-    frr_cfg.commit_configuration(frr.openfabric_daemon)
+def generate(config_dict):
+    frrender.generate(config_dict)
 
+def apply(config_dict):
+    frrender.apply()
     return None
 
 if __name__ == '__main__':