Merge pull request #4227 from c-po/T6746-frr-10

frr: upgrade to 10.2 and migrate protocols to unified FRRender class

10 files changed, 117 insertions, 136 deletions

diff --git a/interface-definitions/include/ospf/protocol-common-config.xml.i b/interface-definitions/include/ospf/protocol-common-config.xml.i
index c4778e126..cef832381 100644
--- a/interface-definitions/include/ospf/protocol-common-config.xml.i
+++ b/interface-definitions/include/ospf/protocol-common-config.xml.i
@@ -321,6 +321,7 @@
       <children>
         #include <include/ospf/authentication.xml.i>
         #include <include/ospf/intervals.xml.i>
+        #include <include/ospf/retransmit-window.xml.i>
       </children>
     </tagNode>
   </children>
@@ -433,6 +434,7 @@
     </leafNode>
     #include <include/ospf/authentication.xml.i>
     #include <include/ospf/intervals.xml.i>
+    #include <include/ospf/retransmit-window.xml.i>
     #include <include/ospf/interface-common.xml.i>
     #include <include/isis/ldp-sync-interface.xml.i>
     <leafNode name="bandwidth">
diff --git a/interface-definitions/include/ospf/retransmit-window.xml.i b/interface-definitions/include/ospf/retransmit-window.xml.i
new file mode 100644
index 000000000..a5e20f522
--- /dev/null
+++ b/interface-definitions/include/ospf/retransmit-window.xml.i
@@ -0,0 +1,15 @@
+<!-- include start from ospf/retransmit-window.xml.i -->
+<leafNode name="retransmit-window">
+  <properties>
+    <help>Window for LSA retransmit</help>
+    <valueHelp>
+      <format>u32:20-1000</format>
+      <description>Retransmit LSAs expiring in this window (milliseconds)</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 20-1000"/>
+    </constraint>
+  </properties>
+  <defaultValue>50</defaultValue>
+</leafNode>
+<!-- include end -->
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/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..fd7366286 100644
--- a/interface-definitions/include/static/static-route.xml.i
+++ b/interface-definitions/include/static/static-route.xml.i
@@ -51,10 +51,24 @@
         #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>
+            <node name="multi-hop">
+              <properties>
+                <help>Configure BFD multi-hop session</help>
+              </properties>
+              <children>
+                #include <include/source-address-ipv4.xml.i>
+              </children>
+            </node>
+          </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..6fcc18b8a 100644
--- a/interface-definitions/include/static/static-route6.xml.i
+++ b/interface-definitions/include/static/static-route6.xml.i
@@ -48,11 +48,26 @@
       </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>
+            <node name="multi-hop">
+              <properties>
+                <help>Configure BFD multi-hop session</help>
+              </properties>
+              <children>
+                #include <include/source-address-ipv6.xml.i>
+              </children>
+            </node>
+          </children>
+        </node>
       </children>
     </tagNode>
   </children>
diff --git a/interface-definitions/include/version/quagga-version.xml.i b/interface-definitions/include/version/quagga-version.xml.i
index 23d884cd4..10ca2816e 100644
--- a/interface-definitions/include/version/quagga-version.xml.i
+++ b/interface-definitions/include/version/quagga-version.xml.i
@@ -1,3 +1,3 @@
 <!-- include start from include/version/quagga-version.xml.i -->
-<syntaxVersion component='quagga' version='11'></syntaxVersion>
+<syntaxVersion component='quagga' version='12'></syntaxVersion>
 <!-- include end -->
diff --git a/interface-definitions/protocols_static.xml.in b/interface-definitions/protocols_static.xml.in
index ca4ca2d74..d8e0ee56b 100644
--- a/interface-definitions/protocols_static.xml.in
+++ b/interface-definitions/protocols_static.xml.in
@@ -11,6 +11,55 @@
           <priority>480</priority>
         </properties>
         <children>
+          <tagNode name="mroute">
+            <properties>
+              <help>Static IPv4 route for Multicast RIB</help>
+              <valueHelp>
+                <format>ipv4net</format>
+                <description>Network</description>
+              </valueHelp>
+              <constraint>
+                <validator name="ipv4-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>
           #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>