From 182a62618aff2cd07f90c98b52e61a8940a29381 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Thu, 13 Feb 2025 17:00:09 +0100
Subject: bgp: T7161: add re-usable XML definition for redistribute other
 protocols

---
 .../include/bgp/protocol-common-config.xml.i       | 76 +---------------------
 1 file changed, 2 insertions(+), 74 deletions(-)

(limited to 'interface-definitions/include/bgp/protocol-common-config.xml.i')

diff --git a/interface-definitions/include/bgp/protocol-common-config.xml.i b/interface-definitions/include/bgp/protocol-common-config.xml.i
index 4953251c5..be13099c0 100644
--- a/interface-definitions/include/bgp/protocol-common-config.xml.i
+++ b/interface-definitions/include/bgp/protocol-common-config.xml.i
@@ -126,14 +126,6 @@
             <help>Redistribute routes from other protocols into BGP</help>
           </properties>
           <children>
-            <node name="connected">
-              <properties>
-                <help>Redistribute connected routes into BGP</help>
-              </properties>
-              <children>
-                #include <include/bgp/afi-redistribute-metric-route-map.xml.i>
-              </children>
-            </node>
             <node name="isis">
               <properties>
                 <help>Redistribute IS-IS routes into BGP</help>
@@ -142,14 +134,7 @@
                 #include <include/bgp/afi-redistribute-metric-route-map.xml.i>
               </children>
             </node>
-            <node name="kernel">
-              <properties>
-                <help>Redistribute kernel routes into BGP</help>
-              </properties>
-              <children>
-                #include <include/bgp/afi-redistribute-metric-route-map.xml.i>
-              </children>
-            </node>
+            #include <include/bgp/afi-redistribute-common-protocols.xml.i>
             <node name="ospf">
               <properties>
                 <help>Redistribute OSPF routes into BGP</help>
@@ -166,27 +151,6 @@
                 #include <include/bgp/afi-redistribute-metric-route-map.xml.i>
               </children>
             </node>
-            <node name="babel">
-              <properties>
-                <help>Redistribute Babel routes into BGP</help>
-              </properties>
-              <children>
-                #include <include/bgp/afi-redistribute-metric-route-map.xml.i>
-              </children>
-            </node>
-            <node name="static">
-              <properties>
-                <help>Redistribute static routes into BGP</help>
-              </properties>
-              <children>
-                #include <include/bgp/afi-redistribute-metric-route-map.xml.i>
-              </children>
-            </node>
-            <leafNode name="table">
-              <properties>
-                <help>Redistribute non-main Kernel Routing Table</help>
-              </properties>
-            </leafNode>
           </children>
         </node>
         #include <include/bgp/afi-sid.xml.i>
@@ -503,22 +467,7 @@
             <help>Redistribute routes from other protocols into BGP</help>
           </properties>
           <children>
-            <node name="connected">
-              <properties>
-                <help>Redistribute connected routes into BGP</help>
-              </properties>
-              <children>
-                #include <include/bgp/afi-redistribute-metric-route-map.xml.i>
-              </children>
-            </node>
-            <node name="kernel">
-              <properties>
-                <help>Redistribute kernel routes into BGP</help>
-              </properties>
-              <children>
-                #include <include/bgp/afi-redistribute-metric-route-map.xml.i>
-              </children>
-            </node>
+            #include <include/bgp/afi-redistribute-common-protocols.xml.i>
             <node name="ospfv3">
               <properties>
                 <help>Redistribute OSPFv3 routes into BGP</help>
@@ -535,27 +484,6 @@
                 #include <include/bgp/afi-redistribute-metric-route-map.xml.i>
               </children>
             </node>
-            <node name="babel">
-              <properties>
-                <help>Redistribute Babel routes into BGP</help>
-              </properties>
-              <children>
-                #include <include/bgp/afi-redistribute-metric-route-map.xml.i>
-              </children>
-            </node>
-            <node name="static">
-              <properties>
-                <help>Redistribute static routes into BGP</help>
-              </properties>
-              <children>
-                #include <include/bgp/afi-redistribute-metric-route-map.xml.i>
-              </children>
-            </node>
-            <leafNode name="table">
-              <properties>
-                <help>Redistribute non-main Kernel Routing Table</help>
-              </properties>
-            </leafNode>
           </children>
         </node>
         #include <include/bgp/afi-sid.xml.i>
-- 
cgit v1.2.3


From 0b28c97fa3b11758ed0dc8a8300ede2cab40707c Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Thu, 13 Feb 2025 17:00:16 +0100
Subject: bgp: T7161: support "redistribute isis" for IPv6 unicast AFI

---
 .../include/bgp/afi-redistribute-common-protocols.xml.i           | 8 ++++++++
 interface-definitions/include/bgp/protocol-common-config.xml.i    | 8 --------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'interface-definitions/include/bgp/protocol-common-config.xml.i')

diff --git a/interface-definitions/include/bgp/afi-redistribute-common-protocols.xml.i b/interface-definitions/include/bgp/afi-redistribute-common-protocols.xml.i
index d7f8de4dd..b5ad0ea77 100644
--- a/interface-definitions/include/bgp/afi-redistribute-common-protocols.xml.i
+++ b/interface-definitions/include/bgp/afi-redistribute-common-protocols.xml.i
@@ -15,6 +15,14 @@
     #include <include/bgp/afi-redistribute-metric-route-map.xml.i>
   </children>
 </node>
+<node name="isis">
+  <properties>
+    <help>Redistribute IS-IS routes into BGP</help>
+  </properties>
+  <children>
+    #include <include/bgp/afi-redistribute-metric-route-map.xml.i>
+  </children>
+</node>
 <node name="kernel">
   <properties>
     <help>Redistribute kernel routes into BGP</help>
diff --git a/interface-definitions/include/bgp/protocol-common-config.xml.i b/interface-definitions/include/bgp/protocol-common-config.xml.i
index be13099c0..21514e762 100644
--- a/interface-definitions/include/bgp/protocol-common-config.xml.i
+++ b/interface-definitions/include/bgp/protocol-common-config.xml.i
@@ -126,14 +126,6 @@
             <help>Redistribute routes from other protocols into BGP</help>
           </properties>
           <children>
-            <node name="isis">
-              <properties>
-                <help>Redistribute IS-IS routes into BGP</help>
-              </properties>
-              <children>
-                #include <include/bgp/afi-redistribute-metric-route-map.xml.i>
-              </children>
-            </node>
             #include <include/bgp/afi-redistribute-common-protocols.xml.i>
             <node name="ospf">
               <properties>
-- 
cgit v1.2.3