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, 16 insertions, 62 deletions

diff --git a/src/conf_mode/protocols_rip.py b/src/conf_mode/protocols_rip.py
index 994007137..3862530a2 100755
--- a/src/conf_mode/protocols_rip.py
+++ b/src/conf_mode/protocols_rip.py
@@ -17,58 +17,34 @@
 from sys import exit
 
 from vyos.config import Config
-from vyos.configdict import dict_merge
-from vyos.configdict import node_changed
+from vyos.configdict import get_frrender_dict
+from vyos.configverify import has_frr_protocol_in_dict
 from vyos.configverify import verify_common_route_maps
 from vyos.configverify import verify_access_list
 from vyos.configverify import verify_prefix_list
+from vyos.frrender import FRRender
 from vyos.utils.dict import dict_search
-from vyos.template import render_to_string
 from vyos import ConfigError
-from vyos import frr
 from vyos import airbag
 airbag.enable()
 
+frrender = FRRender()
+
 def get_config(config=None):
     if config:
         conf = config
     else:
         conf = Config()
-    base = ['protocols', 'rip']
-    rip = conf.get_config_dict(base, key_mangling=('-', '_'), get_first_key=True)
-
-    # FRR has VRF support for different routing daemons. As interfaces belong
-    # to VRFs - or the global VRF, we need to check for changed interfaces so
-    # that they will be properly rendered for the FRR config. Also this eases
-    # removal of interfaces from the running configuration.
-    interfaces_removed = node_changed(conf, base + ['interface'])
-    if interfaces_removed:
-        rip['interface_removed'] = list(interfaces_removed)
-
-    # Bail out early if configuration tree does not exist
-    if not conf.exists(base):
-        rip.update({'deleted' : ''})
-        return rip
-
-    # We have gathered the dict representation of the CLI, but there are default
-    # options which we need to update into the dictionary retrived.
-    rip = conf.merge_defaults(rip, recursive=True)
-
-    # We also need some additional information from the config, prefix-lists
-    # and route-maps for instance. They will be used in verify().
-    #
-    # XXX: one MUST always call this without the key_mangling() option! See
-    # vyos.configverify.verify_common_route_maps() for more information.
-    tmp = conf.get_config_dict(['policy'])
-    # Merge policy dict into "regular" config dict
-    rip = dict_merge(tmp, rip)
-
-    return rip
-
-def verify(rip):
-    if not rip:
+
+    return get_frrender_dict(conf)
+
+def verify(config_dict):
+    if not has_frr_protocol_in_dict(config_dict, 'rip'):
         return None
 
+    rip = config_dict['rip']
+    rip['policy'] = config_dict['policy']
+
     verify_common_route_maps(rip)
 
     acl_in = dict_search('distribute_list.access_list.in', rip)
@@ -93,33 +69,11 @@ def verify(rip):
                     raise ConfigError(f'You can not have "split-horizon poison-reverse" enabled ' \
                                       f'with "split-horizon disable" for "{interface}"!')
 
-def generate(rip):
-    if not rip or 'deleted' in rip:
-        return None
-
-    rip['new_frr_config'] = render_to_string('frr/ripd.frr.j2', rip)
-    return None
+def generate(frr_dict):
+    frrender.generate(frr_dict)
 
 def apply(rip):
-    # Save original configuration prior to starting any commit actions
-    frr_cfg = frr.FRRConfig()
-
-    # The route-map used for the FIB (zebra) is part of the mgmt daemon as of FRR 10.1
-    frr_cfg.load_configuration(frr.mgmt_daemon)
-    frr_cfg.modify_section('^ip protocol rip route-map [-a-zA-Z0-9.]+', stop_pattern='(\s|!)')
-    frr_cfg.modify_section('^key chain \S+', stop_pattern='^exit', remove_stop_mark=True)
-    frr_cfg.modify_section('^router rip', stop_pattern='^exit', remove_stop_mark=True)
-
-    for key in ['interface', 'interface_removed']:
-        if key not in rip:
-            continue
-        for interface in rip[key]:
-            frr_cfg.modify_section(f'^interface {interface}', stop_pattern='^exit', remove_stop_mark=True)
-
-    if 'new_frr_config' in rip:
-        frr_cfg.add_before(frr.default_add_before, rip['new_frr_config'])
-    frr_cfg.commit_configuration()
-
+    frrender.apply()
     return None
 
 if __name__ == '__main__':