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