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.

8 files changed, 102 insertions, 135 deletions

diff --git a/interface-definitions/include/source-address-ipv4.xml.i b/interface-definitions/include/source-address-ipv4.xml.i
index 052678113..aa0b083c7 100644
--- a/interface-definitions/include/source-address-ipv4.xml.i
+++ b/interface-definitions/include/source-address-ipv4.xml.i
@@ -1,7 +1,7 @@
 <!-- include start from source-address-ipv4.xml.i -->
 <leafNode name="source-address">
   <properties>
-    <help>IPv4 source address used to initiate connection</help>
+    <help>IPv4 address used to initiate connection</help>
     <completionHelp>
       <script>${vyos_completion_dir}/list_local_ips.sh --ipv4</script>
     </completionHelp>
diff --git a/interface-definitions/include/source-address-ipv6.xml.i b/interface-definitions/include/source-address-ipv6.xml.i
new file mode 100644
index 000000000..a27955b0c
--- /dev/null
+++ b/interface-definitions/include/source-address-ipv6.xml.i
@@ -0,0 +1,17 @@
+<!-- include start from source-address-ipv6.xml.i -->
+<leafNode name="source-address">
+  <properties>
+    <help>IPv6 address used to initiate connection</help>
+    <completionHelp>
+      <script>${vyos_completion_dir}/list_local_ips.sh --ipv6</script>
+    </completionHelp>
+    <valueHelp>
+      <format>ipv6</format>
+      <description>IPv6 source address</description>
+    </valueHelp>
+    <constraint>
+      <validator name="ipv6-address"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/static/bfd-multi-hop.xml.i b/interface-definitions/include/static/bfd-multi-hop.xml.i
new file mode 100644
index 000000000..e53994191
--- /dev/null
+++ b/interface-definitions/include/static/bfd-multi-hop.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from static/bfd-multi-hop.xml.i -->
+<leafNode name="multi-hop">
+  <properties>
+    <help>Enable BFD multi-hop session (requires source-address)</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/static/static-route-bfd.xml.i b/interface-definitions/include/static/static-route-bfd.xml.i
deleted file mode 100644
index d588b369f..000000000
--- a/interface-definitions/include/static/static-route-bfd.xml.i
+++ /dev/null
@@ -1,36 +0,0 @@
-<!-- include start from static/static-route-bfd.xml.i -->
-<node name="bfd">
-  <properties>
-    <help>BFD monitoring</help>
-  </properties>
-  <children>
-    #include <include/bfd/profile.xml.i>
-    <node name="multi-hop">
-      <properties>
-        <help>Use BFD multi hop session</help>
-      </properties>
-      <children>
-        <tagNode name="source">
-          <properties>
-            <help>Use source for BFD session</help>
-            <valueHelp>
-              <format>ipv4</format>
-              <description>IPv4 source address</description>
-            </valueHelp>
-            <valueHelp>
-              <format>ipv6</format>
-              <description>IPv6 source address</description>
-            </valueHelp>
-            <constraint>
-              <validator name="ip-address"/>
-            </constraint>
-          </properties>
-          <children>
-            #include <include/bfd/profile.xml.i>
-          </children>
-        </tagNode>
-      </children>
-    </node>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/static/static-route.xml.i b/interface-definitions/include/static/static-route.xml.i
index 51e45c6f7..fa1131118 100644
--- a/interface-definitions/include/static/static-route.xml.i
+++ b/interface-definitions/include/static/static-route.xml.i
@@ -51,10 +51,18 @@
         #include <include/static/static-route-distance.xml.i>
         #include <include/static/static-route-interface.xml.i>
         #include <include/static/static-route-vrf.xml.i>
-        #include <include/static/static-route-bfd.xml.i>
+        <node name="bfd">
+          <properties>
+            <help>BFD monitoring</help>
+          </properties>
+          <children>
+            #include <include/bfd/profile.xml.i>
+            #include <include/static/bfd-multi-hop.xml.i>
+            #include <include/source-address-ipv4.xml.i>
+          </children>
+        </node>
       </children>
     </tagNode>
   </children>
 </tagNode>
 <!-- include end -->
-
diff --git a/interface-definitions/include/static/static-route6.xml.i b/interface-definitions/include/static/static-route6.xml.i
index 4468c8025..e75385dc7 100644
--- a/interface-definitions/include/static/static-route6.xml.i
+++ b/interface-definitions/include/static/static-route6.xml.i
@@ -48,11 +48,20 @@
       </properties>
       <children>
         #include <include/generic-disable-node.xml.i>
-        #include <include/static/static-route-bfd.xml.i>
         #include <include/static/static-route-distance.xml.i>
         #include <include/static/static-route-interface.xml.i>
         #include <include/static/static-route-segments.xml.i>
         #include <include/static/static-route-vrf.xml.i>
+        <node name="bfd">
+          <properties>
+            <help>BFD monitoring</help>
+          </properties>
+          <children>
+            #include <include/bfd/profile.xml.i>
+            #include <include/static/bfd-multi-hop.xml.i>
+            #include <include/source-address-ipv6.xml.i>
+          </children>
+        </node>
       </children>
     </tagNode>
   </children>
diff --git a/interface-definitions/protocols_static.xml.in b/interface-definitions/protocols_static.xml.in
index ca4ca2d74..407e56553 100644
--- a/interface-definitions/protocols_static.xml.in
+++ b/interface-definitions/protocols_static.xml.in
@@ -11,6 +11,62 @@
           <priority>480</priority>
         </properties>
         <children>
+          <node name="multicast">
+            <properties>
+              <help>Multicast static route</help>
+            </properties>
+            <children>
+              <tagNode name="route">
+                <properties>
+                  <help>Configure static unicast route into MRIB for multicast RPF lookup</help>
+                  <valueHelp>
+                    <format>ipv4net</format>
+                    <description>Network</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="ip-prefix"/>
+                  </constraint>
+                </properties>
+                <children>
+                  <tagNode name="next-hop">
+                    <properties>
+                      <help>Next-hop IPv4 router address</help>
+                      <valueHelp>
+                        <format>ipv4</format>
+                        <description>Next-hop router address</description>
+                      </valueHelp>
+                      <constraint>
+                        <validator name="ipv4-address"/>
+                      </constraint>
+                    </properties>
+                    <children>
+                      #include <include/generic-disable-node.xml.i>
+                      #include <include/static/static-route-distance.xml.i>
+                    </children>
+                  </tagNode>
+                  <tagNode name="interface">
+                    <properties>
+                      <help>Next-hop IPv4 router interface</help>
+                      <completionHelp>
+                        <script>${vyos_completion_dir}/list_interfaces</script>
+                      </completionHelp>
+                      <valueHelp>
+                        <format>txt</format>
+                        <description>Gateway interface name</description>
+                      </valueHelp>
+                      <constraint>
+                        #include <include/constraint/interface-name.xml.i>
+                      </constraint>
+                    </properties>
+                    <children>
+                      #include <include/generic-disable-node.xml.i>
+                      #include <include/static/static-route-distance.xml.i>
+                    </children>
+                  </tagNode>
+                </children>
+              </tagNode>
+            </children>
+          </node>
           #include <include/route-map.xml.i>
           #include <include/static/static-route.xml.i>
           #include <include/static/static-route6.xml.i>
diff --git a/interface-definitions/protocols_static_multicast.xml.in b/interface-definitions/protocols_static_multicast.xml.in
deleted file mode 100644
index caf95ed7c..000000000
--- a/interface-definitions/protocols_static_multicast.xml.in
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0"?>
-<interfaceDefinition>
-  <node name="protocols">
-    <children>
-      <node name="static">
-        <children>
-          <node name="multicast" owner="${vyos_conf_scripts_dir}/protocols_static_multicast.py">
-            <properties>
-              <help>Multicast static route</help>
-              <priority>481</priority>
-            </properties>
-            <children>
-              <tagNode name="route">
-                <properties>
-                  <help>Configure static unicast route into MRIB for multicast RPF lookup</help>
-                  <valueHelp>
-                    <format>ipv4net</format>
-                    <description>Network</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="ip-prefix"/>
-                  </constraint>
-                </properties>
-                <children>
-                  <tagNode name="next-hop">
-                    <properties>
-                      <help>Nexthop IPv4 address</help>
-                      <valueHelp>
-                        <format>ipv4</format>
-                        <description>Nexthop IPv4 address</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="ipv4-address"/>
-                      </constraint>
-                    </properties>
-                    <children>
-                      <leafNode name="distance">
-                        <properties>
-                          <help>Distance value for this route</help>
-                          <valueHelp>
-                            <format>u32:1-255</format>
-                            <description>Distance for this route</description>
-                          </valueHelp>
-                          <constraint>
-                            <validator name="numeric" argument="--range 1-255"/>
-                          </constraint>
-                        </properties>
-                      </leafNode>
-                    </children>
-                  </tagNode>
-                </children>
-              </tagNode>
-              <tagNode name="interface-route">
-                <properties>
-                  <help>Multicast interface based route</help>
-                  <valueHelp>
-                    <format>ipv4net</format>
-                    <description>Network</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="ip-prefix"/>
-                  </constraint>
-                </properties>
-                <children>
-                  <tagNode name="next-hop-interface">
-                    <properties>
-                      <help>Next-hop interface</help>
-                      <completionHelp>
-                        <script>${vyos_completion_dir}/list_interfaces</script>
-                      </completionHelp>
-                    </properties>
-                    <children>
-                      <leafNode name="distance">
-                        <properties>
-                          <help>Distance value for this route</help>
-                          <valueHelp>
-                            <format>u32:1-255</format>
-                            <description>Distance for this route</description>
-                          </valueHelp>
-                          <constraint>
-                            <validator name="numeric" argument="--range 1-255"/>
-                          </constraint>
-                        </properties>
-                      </leafNode>
-                    </children>
-                  </tagNode>
-                </children>
-              </tagNode>
-            </children>
-          </node>
-        </children>
-      </node>
-    </children>
-  </node>
-</interfaceDefinition>