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.

4 files changed, 111 insertions, 68 deletions

diff --git a/smoketest/scripts/cli/test_policy.py b/smoketest/scripts/cli/test_policy.py
index a0c6ab055..7ea1b610e 100755
--- a/smoketest/scripts/cli/test_policy.py
+++ b/smoketest/scripts/cli/test_policy.py
@@ -1945,7 +1945,7 @@ class TestPolicy(VyOSUnitTestSHIM.TestCase):
         local_preference = base_local_preference
         table = base_table
         for route_map in route_maps:
-            config = self.getFRRconfig(f'route-map {route_map} permit {seq}', end='')
+            config = self.getFRRconfig(f'route-map {route_map} permit {seq}', end='', endsection='^exit')
             self.assertIn(f' set local-preference {local_preference}', config)
             self.assertIn(f' set table {table}', config)
             local_preference += 20
@@ -1958,7 +1958,7 @@ class TestPolicy(VyOSUnitTestSHIM.TestCase):
 
         local_preference = base_local_preference
         for route_map in route_maps:
-            config = self.getFRRconfig(f'route-map {route_map} permit {seq}', end='')
+            config = self.getFRRconfig(f'route-map {route_map} permit {seq}', end='', endsection='^exit')
             self.assertIn(f' set local-preference {local_preference}', config)
             local_preference += 20
 
@@ -1972,7 +1972,7 @@ class TestPolicy(VyOSUnitTestSHIM.TestCase):
         self.cli_commit()
 
         for route_map in route_maps:
-            config = self.getFRRconfig(f'route-map {route_map} permit {seq}', end='')
+            config = self.getFRRconfig(f'route-map {route_map} permit {seq}', end='', endsection='^exit')
             self.assertIn(f' set as-path prepend {prepend}', config)
 
         for route_map in route_maps:
@@ -1981,7 +1981,7 @@ class TestPolicy(VyOSUnitTestSHIM.TestCase):
             self.cli_commit()
 
         for route_map in route_maps:
-            config = self.getFRRconfig(f'route-map {route_map} permit {seq}', end='')
+            config = self.getFRRconfig(f'route-map {route_map} permit {seq}', end='', endsection='^exit')
             self.assertNotIn(f' set', config)
 
 def sort_ip(output):
diff --git a/smoketest/scripts/cli/test_protocols_bfd.py b/smoketest/scripts/cli/test_protocols_bfd.py
index 716d0a806..9f178c821 100755
--- a/smoketest/scripts/cli/test_protocols_bfd.py
+++ b/smoketest/scripts/cli/test_protocols_bfd.py
@@ -22,6 +22,7 @@ from vyos.utils.process import process_named_running
 
 PROCESS_NAME = 'bfdd'
 base_path = ['protocols', 'bfd']
+frr_endsection = '^ exit'
 
 dum_if = 'dum1001'
 vrf_name = 'red'
@@ -130,7 +131,7 @@ class TestProtocolsBFD(VyOSUnitTestSHIM.TestCase):
         self.cli_commit()
 
         # Verify FRR bgpd configuration
-        frrconfig = self.getFRRconfig('bfd', daemon=PROCESS_NAME)
+        frrconfig = self.getFRRconfig('bfd', endsection='^exit', daemon=PROCESS_NAME)
         for peer, peer_config in peers.items():
             tmp = f'peer {peer}'
             if 'multihop' in peer_config:
@@ -143,8 +144,8 @@ class TestProtocolsBFD(VyOSUnitTestSHIM.TestCase):
                 tmp += f' vrf {peer_config["vrf"]}'
 
             self.assertIn(tmp, frrconfig)
-            peerconfig = self.getFRRconfig(f' peer {peer}', end='', daemon=PROCESS_NAME)
-
+            peerconfig = self.getFRRconfig(f' peer {peer}', end='', endsection=frr_endsection,
+                                           daemon=PROCESS_NAME)
             if 'echo_mode' in peer_config:
                 self.assertIn(f'echo-mode', peerconfig)
             if 'intv_echo' in peer_config:
@@ -206,7 +207,7 @@ class TestProtocolsBFD(VyOSUnitTestSHIM.TestCase):
 
         # Verify FRR bgpd configuration
         for profile, profile_config in profiles.items():
-            config = self.getFRRconfig(f' profile {profile}', endsection='^ !')
+            config = self.getFRRconfig(f' profile {profile}', endsection=frr_endsection)
             if 'echo_mode' in profile_config:
                 self.assertIn(f' echo-mode', config)
             if 'intv_echo' in profile_config:
@@ -228,7 +229,8 @@ class TestProtocolsBFD(VyOSUnitTestSHIM.TestCase):
                 self.assertNotIn(f'shutdown', config)
 
         for peer, peer_config in peers.items():
-            peerconfig = self.getFRRconfig(f' peer {peer}', end='', daemon=PROCESS_NAME)
+            peerconfig = self.getFRRconfig(f' peer {peer}', end='',
+                                           endsection=frr_endsection, daemon=PROCESS_NAME)
             if 'profile' in peer_config:
                 self.assertIn(f' profile {peer_config["profile"]}', peerconfig)
 
diff --git a/smoketest/scripts/cli/test_protocols_static.py b/smoketest/scripts/cli/test_protocols_static.py
index f676e2a52..980bc6e7f 100755
--- a/smoketest/scripts/cli/test_protocols_static.py
+++ b/smoketest/scripts/cli/test_protocols_static.py
@@ -33,7 +33,11 @@ routes = {
             '192.0.2.110' : { 'distance' : '110', 'interface' : 'eth0' },
             '192.0.2.120' : { 'distance' : '120', 'disable' : '' },
             '192.0.2.130' : { 'bfd' : '' },
-            '192.0.2.140' : { 'bfd_source' : '192.0.2.10' },
+            '192.0.2.131' : { 'bfd' : '',
+                              'bfd_profile' : 'vyos1' },
+            '192.0.2.140' : { 'bfd' : '',
+                              'bfd_source' : '192.0.2.10',
+                              'bfd_profile' : 'vyos2' },
         },
         'interface' : {
             'eth0'  : { 'distance' : '130' },
@@ -114,6 +118,45 @@ routes = {
     },
 }
 
+multicast_routes = {
+    '224.0.0.0/24' : {
+        'next_hop' : {
+            '224.203.0.1' : { },
+            '224.203.0.2' : { 'distance' : '110'},
+        },
+    },
+    '224.1.0.0/24' : {
+        'next_hop' : {
+            '224.205.0.1' : { 'disable' : {} },
+            '224.205.0.2' : { 'distance' : '110'},
+        },
+    },
+    '224.2.0.0/24' : {
+        'next_hop' : {
+            '1.2.3.0' : { },
+            '1.2.3.1' : { 'distance' : '110'},
+        },
+    },
+    '224.10.0.0/24' : {
+        'interface' : {
+            'eth1' : { 'disable' : {} },
+            'eth2' : { 'distance' : '110'},
+        },
+    },
+    '224.11.0.0/24' : {
+        'interface' : {
+            'eth0' : { },
+            'eth1' : { 'distance' : '10'},
+        },
+    },
+    '224.12.0.0/24' : {
+        'interface' : {
+            'eth0' : { },
+            'eth1' : { 'distance' : '200'},
+        },
+    },
+}
+
 tables = ['80', '81', '82']
 
 class TestProtocolsStatic(VyOSUnitTestSHIM.TestCase):
@@ -138,7 +181,6 @@ class TestProtocolsStatic(VyOSUnitTestSHIM.TestCase):
         self.assertFalse(v6route)
 
     def test_01_static(self):
-        bfd_profile = 'vyos-test'
         for route, route_config in routes.items():
             route_type = 'route'
             if is_ipv6(route):
@@ -156,9 +198,12 @@ class TestProtocolsStatic(VyOSUnitTestSHIM.TestCase):
                     if 'vrf' in next_hop_config:
                         self.cli_set(base + ['next-hop', next_hop, 'vrf', next_hop_config['vrf']])
                     if 'bfd' in next_hop_config:
-                        self.cli_set(base + ['next-hop', next_hop, 'bfd', 'profile', bfd_profile ])
-                    if 'bfd_source' in next_hop_config:
-                        self.cli_set(base + ['next-hop', next_hop, 'bfd', 'multi-hop', 'source', next_hop_config['bfd_source'], 'profile', bfd_profile])
+                        self.cli_set(base + ['next-hop', next_hop, 'bfd'])
+                        if 'bfd_profile' in next_hop_config:
+                            self.cli_set(base + ['next-hop', next_hop, 'bfd', 'profile', next_hop_config['bfd_profile']])
+                        if 'bfd_source' in next_hop_config:
+                            self.cli_set(base + ['next-hop', next_hop, 'bfd', 'multi-hop'])
+                            self.cli_set(base + ['next-hop', next_hop, 'bfd', 'source-address', next_hop_config['bfd_source']])
                     if 'segments' in next_hop_config:
                         self.cli_set(base + ['next-hop', next_hop, 'segments', next_hop_config['segments']])
 
@@ -217,9 +262,11 @@ class TestProtocolsStatic(VyOSUnitTestSHIM.TestCase):
                     if 'vrf' in next_hop_config:
                         tmp += ' nexthop-vrf ' + next_hop_config['vrf']
                     if 'bfd' in next_hop_config:
-                        tmp += ' bfd profile ' + bfd_profile
-                    if 'bfd_source' in next_hop_config:
-                        tmp += ' bfd multi-hop source ' + next_hop_config['bfd_source'] + ' profile ' + bfd_profile
+                        tmp += ' bfd'
+                        if 'bfd_source' in next_hop_config:
+                            tmp += ' multi-hop source ' + next_hop_config['bfd_source']
+                        if 'bfd_profile' in next_hop_config:
+                            tmp += ' profile ' + next_hop_config['bfd_profile']
                     if 'segments' in next_hop_config:
                         tmp += ' segments ' + next_hop_config['segments']
 
@@ -426,7 +473,7 @@ class TestProtocolsStatic(VyOSUnitTestSHIM.TestCase):
             self.assertEqual(tmp['linkinfo']['info_kind'],          'vrf')
 
             # Verify FRR bgpd configuration
-            frrconfig = self.getFRRconfig(f'vrf {vrf}')
+            frrconfig = self.getFRRconfig(f'vrf {vrf}', endsection='^exit-vrf')
             self.assertIn(f'vrf {vrf}', frrconfig)
 
             # Verify routes
@@ -478,5 +525,48 @@ class TestProtocolsStatic(VyOSUnitTestSHIM.TestCase):
 
                     self.assertIn(tmp, frrconfig)
 
+    def test_04_static_multicast(self):
+        for route, route_config in multicast_routes.items():
+            if 'next_hop' in route_config:
+                base = base_path + ['multicast', 'route', route]
+                for next_hop, next_hop_config in route_config['next_hop'].items():
+                    self.cli_set(base + ['next-hop', next_hop])
+                    if 'distance' in next_hop_config:
+                        self.cli_set(base + ['next-hop', next_hop, 'distance', next_hop_config['distance']])
+                    if 'disable' in next_hop_config:
+                        self.cli_set(base + ['next-hop', next_hop, 'disable'])
+
+            if 'interface' in route_config:
+                base = base_path + ['multicast', 'route', route]
+                for next_hop, next_hop_config in route_config['interface'].items():
+                    self.cli_set(base + ['interface', next_hop])
+                    if 'distance' in next_hop_config:
+                        self.cli_set(base + ['interface', next_hop, 'distance', next_hop_config['distance']])
+
+        self.cli_commit()
+
+        # Verify FRR configuration
+        frrconfig = self.getFRRconfig('ip mroute', end='')
+        for route, route_config in multicast_routes.items():
+            if 'next_hop' in route_config:
+                for next_hop, next_hop_config in route_config['next_hop'].items():
+                    tmp = f'ip mroute {route} {next_hop}'
+                    if 'distance' in next_hop_config:
+                        tmp += ' ' + next_hop_config['distance']
+                    if 'disable' in next_hop_config:
+                        self.assertNotIn(tmp, frrconfig)
+                    else:
+                        self.assertIn(tmp, frrconfig)
+
+            if 'next_hop_interface' in route_config:
+                for next_hop, next_hop_config in route_config['next_hop_interface'].items():
+                    tmp = f'ip mroute {route} {next_hop}'
+                    if 'distance' in next_hop_config:
+                        tmp += ' ' + next_hop_config['distance']
+                    if 'disable' in next_hop_config:
+                        self.assertNotIn(tmp, frrconfig)
+                    else:
+                        self.assertIn(tmp, frrconfig)
+
 if __name__ == '__main__':
-    unittest.main(verbosity=2, failfast=True)
+    unittest.main(verbosity=2)
diff --git a/smoketest/scripts/cli/test_protocols_static_multicast.py b/smoketest/scripts/cli/test_protocols_static_multicast.py
deleted file mode 100755
index 9fdda236f..000000000
--- a/smoketest/scripts/cli/test_protocols_static_multicast.py
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright (C) 2024 VyOS maintainers and contributors
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 or later as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import unittest
-
-from base_vyostest_shim import VyOSUnitTestSHIM
-
-
-base_path = ['protocols', 'static', 'multicast']
-
-
-class TestProtocolsStaticMulticast(VyOSUnitTestSHIM.TestCase):
-
-    def tearDown(self):
-        self.cli_delete(base_path)
-        self.cli_commit()
-
-        mroute = self.getFRRconfig('ip mroute', end='')
-        self.assertFalse(mroute)
-
-    def test_01_static_multicast(self):
-
-        self.cli_set(base_path + ['route', '224.202.0.0/24', 'next-hop', '224.203.0.1'])
-        self.cli_set(base_path + ['interface-route', '224.203.0.0/24', 'next-hop-interface', 'eth0'])
-
-        self.cli_commit()
-
-        # Verify FRR bgpd configuration
-        frrconfig = self.getFRRconfig('ip mroute', end='')
-
-        self.assertIn('ip mroute 224.202.0.0/24 224.203.0.1', frrconfig)
-        self.assertIn('ip mroute 224.203.0.0/24 eth0', frrconfig)
-
-
-if __name__ == '__main__':
-    unittest.main(verbosity=2)