From 952c52ef012504f17f09234ab1f7608ceb4002b1 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Thu, 11 Mar 2021 19:28:06 +0100
Subject: vrf: ospf: T2271: re-arrange xml include building blocks

In order to fully re-use the XML based OSPF CLI definition for per-VRF routing,
the file structure needs to be reorganized and the common OSPF definition is
moved to its dedicated ospf-common-config.xml.i file, which can then be fully
re-included at the VRF level.

As the amount of include files now has reached a certain amount, this also
introduces "per topic" subdirectories on the filesystem to keep a clean
structure.
---
 interface-definitions/protocols-ospfv3.xml.in | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'interface-definitions/protocols-ospfv3.xml.in')

diff --git a/interface-definitions/protocols-ospfv3.xml.in b/interface-definitions/protocols-ospfv3.xml.in
index 2559e2b03..1868ff34d 100644
--- a/interface-definitions/protocols-ospfv3.xml.in
+++ b/interface-definitions/protocols-ospfv3.xml.in
@@ -162,8 +162,8 @@
               </constraint>
             </properties>
             <children>
-              #include <include/ospf-intervals.xml.i>
-              #include <include/ospf-interface-common.xml.i>
+              #include <include/ospf/ospf-intervals.xml.i>
+              #include <include/ospf/ospf-interface-common.xml.i>
               <leafNode name="ifmtu">
                 <properties>
                   <help>Interface MTU</help>
@@ -246,7 +246,7 @@
                   <help>Redistribute BGP routes</help>
                 </properties>
                 <children>
-                  #include <include/ospf-route-map.xml.i>
+                  #include <include/ospf/ospf-route-map.xml.i>
                 </children>
               </node>
               <node name="connected">
@@ -254,7 +254,7 @@
                   <help>Redistribute connected routes</help>
                 </properties>
                 <children>
-                  #include <include/ospf-route-map.xml.i>
+                  #include <include/ospf/ospf-route-map.xml.i>
                 </children>
               </node>
               <node name="kernel">
@@ -262,7 +262,7 @@
                   <help>Redistribute kernel routes</help>
                 </properties>
                 <children>
-                  #include <include/ospf-route-map.xml.i>
+                  #include <include/ospf/ospf-route-map.xml.i>
                 </children>
               </node>
               <node name="ripng">
@@ -270,7 +270,7 @@
                   <help>Redistribute RIPNG routes</help>
                 </properties>
                 <children>
-                  #include <include/ospf-route-map.xml.i>
+                  #include <include/ospf/ospf-route-map.xml.i>
                 </children>
               </node>
               <node name="static">
@@ -278,12 +278,12 @@
                   <help>Redistribute static routes</help>
                 </properties>
                 <children>
-                  #include <include/ospf-route-map.xml.i>
+                  #include <include/ospf/ospf-route-map.xml.i>
                 </children>
               </node>
             </children>
           </node>
-          #include <include/ospf-route-map.xml.i>
+          #include <include/ospf/ospf-route-map.xml.i>
         </children>
       </node>
     </children>
-- 
cgit v1.2.3


From 0d9658f3dcaf1a9f376a6768c54a0ceb80ece7d0 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Thu, 11 Mar 2021 20:41:51 +0100
Subject: xml: include: move route-map from ospf to generic section

---
 .../include/ospf/ospf-common-config.xml.i                | 16 ++++++++--------
 interface-definitions/include/ospf/ospf-route-map.xml.i  | 14 --------------
 interface-definitions/include/rip-redistribute.xml.i     |  2 +-
 interface-definitions/include/route-map.xml.i            | 14 ++++++++++++++
 interface-definitions/protocols-ospfv3.xml.in            | 12 ++++++------
 interface-definitions/protocols-ripng.xml.in             |  2 +-
 6 files changed, 30 insertions(+), 30 deletions(-)
 delete mode 100644 interface-definitions/include/ospf/ospf-route-map.xml.i
 create mode 100644 interface-definitions/include/route-map.xml.i

(limited to 'interface-definitions/protocols-ospfv3.xml.in')

diff --git a/interface-definitions/include/ospf/ospf-common-config.xml.i b/interface-definitions/include/ospf/ospf-common-config.xml.i
index 590da36b2..96793913b 100644
--- a/interface-definitions/include/ospf/ospf-common-config.xml.i
+++ b/interface-definitions/include/ospf/ospf-common-config.xml.i
@@ -313,7 +313,7 @@
         </leafNode>
         #include <include/ospf/ospf-metric.xml.i>
         #include <include/ospf/ospf-metric-type.xml.i>
-        #include <include/ospf/ospf-route-map.xml.i>
+        #include <include/route-map.xml.i>
       </children>
     </node>
   </children>
@@ -680,7 +680,7 @@
       <children>
         #include <include/ospf/ospf-metric.xml.i>
         #include <include/ospf/ospf-metric-type.xml.i>
-        #include <include/ospf/ospf-route-map.xml.i>
+        #include <include/route-map.xml.i>
       </children>
     </node>
     <node name="connected">
@@ -690,7 +690,7 @@
       <children>
         #include <include/ospf/ospf-metric.xml.i>
         #include <include/ospf/ospf-metric-type.xml.i>
-        #include <include/ospf/ospf-route-map.xml.i>
+        #include <include/route-map.xml.i>
       </children>
     </node>
     <node name="isis">
@@ -700,7 +700,7 @@
       <children>
         #include <include/ospf/ospf-metric.xml.i>
         #include <include/ospf/ospf-metric-type.xml.i>
-        #include <include/ospf/ospf-route-map.xml.i>
+        #include <include/route-map.xml.i>
       </children>
     </node>
     <node name="kernel">
@@ -710,7 +710,7 @@
       <children>
         #include <include/ospf/ospf-metric.xml.i>
         #include <include/ospf/ospf-metric-type.xml.i>
-        #include <include/ospf/ospf-route-map.xml.i>
+        #include <include/route-map.xml.i>
       </children>
     </node>
     <node name="rip">
@@ -720,7 +720,7 @@
       <children>
         #include <include/ospf/ospf-metric.xml.i>
         #include <include/ospf/ospf-metric-type.xml.i>
-        #include <include/ospf/ospf-route-map.xml.i>
+        #include <include/route-map.xml.i>
       </children>
     </node>
     <node name="static">
@@ -730,7 +730,7 @@
       <children>
         #include <include/ospf/ospf-metric.xml.i>
         #include <include/ospf/ospf-metric-type.xml.i>
-        #include <include/ospf/ospf-route-map.xml.i>
+        #include <include/route-map.xml.i>
       </children>
     </node>
   </children>
@@ -754,7 +754,7 @@
     </leafNode>
   </children>
 </node>
-#include <include/ospf/ospf-route-map.xml.i>
+#include <include/route-map.xml.i>
 <node name="timers">
   <properties>
     <help>Adjust routing timers</help>
diff --git a/interface-definitions/include/ospf/ospf-route-map.xml.i b/interface-definitions/include/ospf/ospf-route-map.xml.i
deleted file mode 100644
index 943a477c0..000000000
--- a/interface-definitions/include/ospf/ospf-route-map.xml.i
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- included start from ospf-route-map.xml.i -->
-<leafNode name="route-map">
-  <properties>
-    <help>Route map reference</help>
-    <valueHelp>
-      <format>txt</format>
-      <description>Route map reference</description>
-    </valueHelp>
-    <completionHelp>
-      <path>policy route-map</path>
-    </completionHelp>
-  </properties>
-</leafNode>
-<!-- included end -->
diff --git a/interface-definitions/include/rip-redistribute.xml.i b/interface-definitions/include/rip-redistribute.xml.i
index 123d78fb3..c31be6fe5 100644
--- a/interface-definitions/include/rip-redistribute.xml.i
+++ b/interface-definitions/include/rip-redistribute.xml.i
@@ -11,5 +11,5 @@
     </constraint>
   </properties>
 </leafNode>
-#include <include/ospf/ospf-route-map.xml.i>
+#include <include/route-map.xml.i>
 <!-- included end -->
diff --git a/interface-definitions/include/route-map.xml.i b/interface-definitions/include/route-map.xml.i
new file mode 100644
index 000000000..943a477c0
--- /dev/null
+++ b/interface-definitions/include/route-map.xml.i
@@ -0,0 +1,14 @@
+<!-- included start from ospf-route-map.xml.i -->
+<leafNode name="route-map">
+  <properties>
+    <help>Route map reference</help>
+    <valueHelp>
+      <format>txt</format>
+      <description>Route map reference</description>
+    </valueHelp>
+    <completionHelp>
+      <path>policy route-map</path>
+    </completionHelp>
+  </properties>
+</leafNode>
+<!-- included end -->
diff --git a/interface-definitions/protocols-ospfv3.xml.in b/interface-definitions/protocols-ospfv3.xml.in
index 1868ff34d..8c21ba3cd 100644
--- a/interface-definitions/protocols-ospfv3.xml.in
+++ b/interface-definitions/protocols-ospfv3.xml.in
@@ -246,7 +246,7 @@
                   <help>Redistribute BGP routes</help>
                 </properties>
                 <children>
-                  #include <include/ospf/ospf-route-map.xml.i>
+                  #include <include/route-map.xml.i>
                 </children>
               </node>
               <node name="connected">
@@ -254,7 +254,7 @@
                   <help>Redistribute connected routes</help>
                 </properties>
                 <children>
-                  #include <include/ospf/ospf-route-map.xml.i>
+                  #include <include/route-map.xml.i>
                 </children>
               </node>
               <node name="kernel">
@@ -262,7 +262,7 @@
                   <help>Redistribute kernel routes</help>
                 </properties>
                 <children>
-                  #include <include/ospf/ospf-route-map.xml.i>
+                  #include <include/route-map.xml.i>
                 </children>
               </node>
               <node name="ripng">
@@ -270,7 +270,7 @@
                   <help>Redistribute RIPNG routes</help>
                 </properties>
                 <children>
-                  #include <include/ospf/ospf-route-map.xml.i>
+                  #include <include/route-map.xml.i>
                 </children>
               </node>
               <node name="static">
@@ -278,12 +278,12 @@
                   <help>Redistribute static routes</help>
                 </properties>
                 <children>
-                  #include <include/ospf/ospf-route-map.xml.i>
+                  #include <include/route-map.xml.i>
                 </children>
               </node>
             </children>
           </node>
-          #include <include/ospf/ospf-route-map.xml.i>
+          #include <include/route-map.xml.i>
         </children>
       </node>
     </children>
diff --git a/interface-definitions/protocols-ripng.xml.in b/interface-definitions/protocols-ripng.xml.in
index 1b77b40c8..3eac27788 100644
--- a/interface-definitions/protocols-ripng.xml.in
+++ b/interface-definitions/protocols-ripng.xml.in
@@ -137,7 +137,7 @@
               <multi/>
             </properties>
           </leafNode>
-          #include <include/ospf/ospf-route-map.xml.i>
+          #include <include/route-map.xml.i>
           #include <include/rip-timers.xml.i>
         </children>
       </node>
-- 
cgit v1.2.3


From 6325d1576b923f0abce19de49f940f5981411cf9 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 12 Mar 2021 20:41:46 +0100
Subject: xml: ospf: consolidate router-id and distance settings in common
 include files

---
 .../include/ospf/ospf-common-config.xml.i          | 63 ++--------------------
 .../include/ospf/ospf-distance-global.xml.i        | 14 +++++
 .../include/ospf/ospf-distance-per-protocol.xml.i  | 38 +++++++++++++
 .../include/ospf/ospf-router-id.xml.i              | 14 +++++
 interface-definitions/protocols-ospfv3.xml.in      | 63 ++--------------------
 5 files changed, 72 insertions(+), 120 deletions(-)
 create mode 100644 interface-definitions/include/ospf/ospf-distance-global.xml.i
 create mode 100644 interface-definitions/include/ospf/ospf-distance-per-protocol.xml.i
 create mode 100644 interface-definitions/include/ospf/ospf-router-id.xml.i

(limited to 'interface-definitions/protocols-ospfv3.xml.in')

diff --git a/interface-definitions/include/ospf/ospf-common-config.xml.i b/interface-definitions/include/ospf/ospf-common-config.xml.i
index 96793913b..a9b2f0a2b 100644
--- a/interface-definitions/include/ospf/ospf-common-config.xml.i
+++ b/interface-definitions/include/ospf/ospf-common-config.xml.i
@@ -335,59 +335,13 @@
     <help>Administrative distance</help>
   </properties>
   <children>
-    <leafNode name="global">
-      <properties>
-        <help>OSPF administrative distance</help>
-        <valueHelp>
-          <format>u32:1-255</format>
-          <description>Administrative distance</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 1-255"/>
-        </constraint>
-      </properties>
-    </leafNode>
+    #include <include/ospf/ospf-distance-global.xml.i>
     <node name="ospf">
       <properties>
         <help>OSPF administrative distance</help>
       </properties>
       <children>
-        <leafNode name="external">
-          <properties>
-            <help>Distance for external routes</help>
-            <valueHelp>
-              <format>u32:1-255</format>
-              <description>Distance for external routes</description>
-            </valueHelp>
-            <constraint>
-              <validator name="numeric" argument="--range 1-255"/>
-            </constraint>
-          </properties>
-        </leafNode>
-        <leafNode name="inter-area">
-          <properties>
-            <help>Distance for inter-area routes</help>
-            <valueHelp>
-              <format>u32:1-255</format>
-              <description>Distance for inter-area routes</description>
-            </valueHelp>
-            <constraint>
-              <validator name="numeric" argument="--range 1-255"/>
-            </constraint>
-          </properties>
-        </leafNode>
-        <leafNode name="intra-area">
-          <properties>
-            <help>Distance for intra-area routes</help>
-            <valueHelp>
-              <format>u32:1-255</format>
-              <description>Distance for intra-area routes</description>
-            </valueHelp>
-            <constraint>
-              <validator name="numeric" argument="--range 1-255"/>
-            </constraint>
-          </properties>
-        </leafNode>
+        #include <include/ospf/ospf-distance-per-protocol.xml.i>
       </children>
     </node>
   </children>
@@ -632,18 +586,7 @@
         <valueless/>
       </properties>
     </leafNode>
-    <leafNode name="router-id">
-      <properties>
-        <help>Override the default router identifier</help>
-        <valueHelp>
-          <format>ipv4</format>
-          <description>Override the default router identifier</description>
-        </valueHelp>
-        <constraint>
-          <validator name="ipv4-address"/>
-        </constraint>
-      </properties>
-    </leafNode>
+    #include <include/ospf/ospf-router-id.xml.i>
   </children>
 </node>
 #include <include/routing-passive-interface-xml.i>
diff --git a/interface-definitions/include/ospf/ospf-distance-global.xml.i b/interface-definitions/include/ospf/ospf-distance-global.xml.i
new file mode 100644
index 000000000..930bd9640
--- /dev/null
+++ b/interface-definitions/include/ospf/ospf-distance-global.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from ospf/ospf-distance-global.xml.i -->
+<leafNode name="global">
+  <properties>
+    <help>Administrative distance</help>
+    <valueHelp>
+      <format>u32:1-255</format>
+      <description>Administrative distance</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-255"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/ospf/ospf-distance-per-protocol.xml.i b/interface-definitions/include/ospf/ospf-distance-per-protocol.xml.i
new file mode 100644
index 000000000..19debdea2
--- /dev/null
+++ b/interface-definitions/include/ospf/ospf-distance-per-protocol.xml.i
@@ -0,0 +1,38 @@
+<!-- include start from ospf/ospf-distance-per-protocol.xml.i -->
+<leafNode name="external">
+  <properties>
+    <help>Distance for external routes</help>
+    <valueHelp>
+      <format>u32:1-255</format>
+      <description>Distance for external routes</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-255"/>
+    </constraint>
+  </properties>
+</leafNode>
+<leafNode name="inter-area">
+  <properties>
+    <help>Distance for inter-area routes</help>
+    <valueHelp>
+      <format>u32:1-255</format>
+      <description>Distance for inter-area routes</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-255"/>
+    </constraint>
+  </properties>
+</leafNode>
+<leafNode name="intra-area">
+  <properties>
+    <help>Distance for intra-area routes</help>
+    <valueHelp>
+      <format>u32:1-255</format>
+      <description>Distance for intra-area routes</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-255"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/ospf/ospf-router-id.xml.i b/interface-definitions/include/ospf/ospf-router-id.xml.i
new file mode 100644
index 000000000..a719f40dc
--- /dev/null
+++ b/interface-definitions/include/ospf/ospf-router-id.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from ospf/ospf-router-id.xml.i -->
+<leafNode name="router-id">
+  <properties>
+    <help>Override the default router identifier</help>
+    <valueHelp>
+      <format>ipv4</format>
+      <description>Override the default router identifier</description>
+    </valueHelp>
+    <constraint>
+      <validator name="ipv4-address"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- included end -->
diff --git a/interface-definitions/protocols-ospfv3.xml.in b/interface-definitions/protocols-ospfv3.xml.in
index 8c21ba3cd..06787b604 100644
--- a/interface-definitions/protocols-ospfv3.xml.in
+++ b/interface-definitions/protocols-ospfv3.xml.in
@@ -90,59 +90,13 @@
               <help>Administrative distance</help>
             </properties>
             <children>
-              <leafNode name="global">
-                <properties>
-                  <help>OSPFv3 administrative distance</help>
-                  <valueHelp>
-                    <format>u32:1-255</format>
-                    <description>Administrative distance</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 1-255"/>
-                  </constraint>
-                </properties>
-              </leafNode>
+              #include <include/ospf/ospf-distance-global.xml.i>
               <node name="ospfv3">
                 <properties>
                   <help>OSPFv3 administrative distance</help>
                 </properties>
                 <children>
-                  <leafNode name="external">
-                    <properties>
-                      <help>Distance for external routes</help>
-                      <valueHelp>
-                        <format>u32:1-255</format>
-                        <description>Distance for external routes</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 1-255"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="inter-area">
-                    <properties>
-                      <help>Distance for inter-area routes</help>
-                      <valueHelp>
-                        <format>u32:1-255</format>
-                        <description>Distance for inter-area routes</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 1-255"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="intra-area">
-                    <properties>
-                      <help>Distance for intra-area routes</help>
-                      <valueHelp>
-                        <format>u32:1-255</format>
-                        <description>Distance for intra-area routes</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 1-255"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
+                  #include <include/ospf/ospf-distance-per-protocol.xml.i>
                 </children>
               </node>
             </children>
@@ -222,18 +176,7 @@
               <help>OSPFv3 specific parameters</help>
             </properties>
             <children>
-              <leafNode name="router-id">
-                <properties>
-                  <help>Override the default router identifier</help>
-                  <valueHelp>
-                    <format>ipv4</format>
-                    <description>Override the default router identifier</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="ipv4-address"/>
-                  </constraint>
-                </properties>
-              </leafNode>
+              #include <include/ospf/ospf-router-id.xml.i>
             </children>
           </node>
           <node name="redistribute">
-- 
cgit v1.2.3