From b798603e21faad8b6cf4d78a2900ea54703fecef Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Sat, 2 Mar 2024 08:39:23 +0100
Subject: ospfv3: T5717: allow metric and metric-type on redistributed routes

Example:
vyos@vyos# set protocols ospfv3 redistribute bgp
Possible completions:
   metric               OSPF default metric
   metric-type          OSPF metric type for default routes (default: 2)
   route-map            Specify route-map name to use

(cherry picked from commit ed2c288c8a9031f91acf76d20b84e2002696981c)
---
 .../include/ospfv3/protocol-common-config.xml.i    | 28 +++++++++++++++-------
 1 file changed, 20 insertions(+), 8 deletions(-)

(limited to 'interface-definitions/include')

diff --git a/interface-definitions/include/ospfv3/protocol-common-config.xml.i b/interface-definitions/include/ospfv3/protocol-common-config.xml.i
index 4c3ca68e1..1462b9c15 100644
--- a/interface-definitions/include/ospfv3/protocol-common-config.xml.i
+++ b/interface-definitions/include/ospfv3/protocol-common-config.xml.i
@@ -221,11 +221,23 @@
     <help>Redistribute information from another routing protocol</help>
   </properties>
   <children>
+    <node name="babel">
+      <properties>
+        <help>Redistribute Babel routes</help>
+      </properties>
+      <children>
+        #include <include/ospf/metric.xml.i>
+        #include <include/ospf/metric-type.xml.i>
+        #include <include/route-map.xml.i>
+      </children>
+    </node>
     <node name="bgp">
       <properties>
         <help>Redistribute BGP routes</help>
       </properties>
       <children>
+        #include <include/ospf/metric.xml.i>
+        #include <include/ospf/metric-type.xml.i>
         #include <include/route-map.xml.i>
       </children>
     </node>
@@ -234,6 +246,8 @@
         <help>Redistribute connected routes</help>
       </properties>
       <children>
+        #include <include/ospf/metric.xml.i>
+        #include <include/ospf/metric-type.xml.i>
         #include <include/route-map.xml.i>
       </children>
     </node>
@@ -242,6 +256,8 @@
         <help>Redistribute kernel routes</help>
       </properties>
       <children>
+        #include <include/ospf/metric.xml.i>
+        #include <include/ospf/metric-type.xml.i>
         #include <include/route-map.xml.i>
       </children>
     </node>
@@ -250,14 +266,8 @@
         <help>Redistribute RIPNG routes</help>
       </properties>
       <children>
-        #include <include/route-map.xml.i>
-      </children>
-    </node>
-    <node name="babel">
-      <properties>
-        <help>Redistribute Babel routes</help>
-      </properties>
-      <children>
+        #include <include/ospf/metric.xml.i>
+        #include <include/ospf/metric-type.xml.i>
         #include <include/route-map.xml.i>
       </children>
     </node>
@@ -266,6 +276,8 @@
         <help>Redistribute static routes</help>
       </properties>
       <children>
+        #include <include/ospf/metric.xml.i>
+        #include <include/ospf/metric-type.xml.i>
         #include <include/route-map.xml.i>
       </children>
     </node>
-- 
cgit v1.2.3