static: T3280: move building blocks to subfolder

As the amount of include files now has reached a certain amount, it is getting
more and more crowsded, thuse introducing "per topic" subdirectories on the
filesystem to keep a clean structure makes sense.

10 files changed, 28 insertions, 28 deletions

diff --git a/interface-definitions/include/static-route-blackhole.xml.i b/interface-definitions/include/static/static-route-blackhole.xml.i
index 838a475d3..f2ad23e69 100644
--- a/interface-definitions/include/static-route-blackhole.xml.i
+++ b/interface-definitions/include/static/static-route-blackhole.xml.i
@@ -1,10 +1,10 @@
-<!-- include start from static-route-blackhole.xml.i -->
+<!-- include start from static/static-route-blackhole.xml.i -->
 <node name="blackhole">
   <properties>
     <help>Silently discard packets when matched</help>
   </properties>
   <children>
-    #include <include/static-route-distance.xml.i>
+    #include <include/static/static-route-distance.xml.i>
   </children>
 </node>
 <!-- include end -->
diff --git a/interface-definitions/include/static-route-distance.xml.i b/interface-definitions/include/static/static-route-distance.xml.i
index da171fe1f..a651b98d7 100644
--- a/interface-definitions/include/static-route-distance.xml.i
+++ b/interface-definitions/include/static/static-route-distance.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from static-route-distance.xml.i -->
+<!-- include start from static/static-route-distance.xml.i -->
 <leafNode name="distance">
   <properties>
     <help>Distance for this route</help>
diff --git a/interface-definitions/include/static-route-interface.xml.i b/interface-definitions/include/static/static-route-interface.xml.i
index 6670c0e33..ed4f455e5 100644
--- a/interface-definitions/include/static-route-interface.xml.i
+++ b/interface-definitions/include/static/static-route-interface.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from static-route-interface.xml.i -->
+<!-- include start from static/static-route-interface.xml.i -->
 <leafNode name="interface">
   <properties>
     <help>Gateway interface name</help>
diff --git a/interface-definitions/include/static-route-map.xml.i b/interface-definitions/include/static/static-route-map.xml.i
index 48f5055aa..af825e043 100644
--- a/interface-definitions/include/static-route-map.xml.i
+++ b/interface-definitions/include/static/static-route-map.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from static-route-map.xml.i -->
+<!-- include start from static/static-route-map.xml.i -->
 <leafNode name="route-map">
   <properties>
     <help>Filter routes installed in local route map</help>
diff --git a/interface-definitions/include/static-route-vrf.xml.i b/interface-definitions/include/static/static-route-vrf.xml.i
index eda4d7aee..69aba253c 100644
--- a/interface-definitions/include/static-route-vrf.xml.i
+++ b/interface-definitions/include/static/static-route-vrf.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from static-route-vrf.xml.i -->
+<!-- include start from static/static-route-vrf.xml.i -->
 <leafNode name="vrf">
   <properties>
     <help>VRF to leak route</help>
diff --git a/interface-definitions/include/static-route.xml.i b/interface-definitions/include/static/static-route.xml.i
index 94fbdd3d6..254ea3163 100644
--- a/interface-definitions/include/static-route.xml.i
+++ b/interface-definitions/include/static/static-route.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from static-route.xml.i -->
+<!-- include start from static/static-route.xml.i -->
 <tagNode name="route">
   <properties>
     <help>VRF static IPv4 route</help>
@@ -16,7 +16,7 @@
         <help>Silently discard pkts when matched</help>
       </properties>
       <children>
-        #include <include/static-route-distance.xml.i>
+        #include <include/static/static-route-distance.xml.i>
         <leafNode name="tag">
           <properties>
             <help>Tag value for this route</help>
@@ -62,8 +62,8 @@
       </properties>
       <children>
         #include <include/generic-disable-node.xml.i>
-        #include <include/static-route-distance.xml.i>
-        #include <include/static-route-vrf.xml.i>
+        #include <include/static/static-route-distance.xml.i>
+        #include <include/static/static-route-vrf.xml.i>
       </children>
     </tagNode>
     <tagNode name="next-hop">
@@ -79,9 +79,9 @@
       </properties>
       <children>
         #include <include/generic-disable-node.xml.i>
-        #include <include/static-route-distance.xml.i>
-        #include <include/static-route-interface.xml.i>
-        #include <include/static-route-vrf.xml.i>
+        #include <include/static/static-route-distance.xml.i>
+        #include <include/static/static-route-interface.xml.i>
+        #include <include/static/static-route-vrf.xml.i>
       </children>
     </tagNode>
   </children>
diff --git a/interface-definitions/include/static-route6.xml.i b/interface-definitions/include/static/static-route6.xml.i
index 4522ef39b..0ea995588 100644
--- a/interface-definitions/include/static-route6.xml.i
+++ b/interface-definitions/include/static/static-route6.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from static-route6.xml.i -->
+<!-- include start from static/static-route6.xml.i -->
 <tagNode name="route6">
   <properties>
     <help>VRF static IPv6 route</help>
@@ -16,7 +16,7 @@
         <help>Silently discard pkts when matched</help>
       </properties>
       <children>
-        #include <include/static-route-distance.xml.i>
+        #include <include/static/static-route-distance.xml.i>
         <leafNode name="tag">
           <properties>
             <help>Tag value for this route</help>
@@ -47,8 +47,8 @@
       </properties>
       <children>
         #include <include/generic-disable-node.xml.i>
-        #include <include/static-route-distance.xml.i>
-        #include <include/static-route-vrf.xml.i>
+        #include <include/static/static-route-distance.xml.i>
+        #include <include/static/static-route-vrf.xml.i>
       </children>
     </tagNode>
     <tagNode name="next-hop">
@@ -64,9 +64,9 @@
       </properties>
       <children>
         #include <include/generic-disable-node.xml.i>
-        #include <include/static-route-distance.xml.i>
-        #include <include/static-route-interface.xml.i>
-        #include <include/static-route-vrf.xml.i>
+        #include <include/static/static-route-distance.xml.i>
+        #include <include/static/static-route-interface.xml.i>
+        #include <include/static/static-route-vrf.xml.i>
       </children>
     </tagNode>
   </children>
diff --git a/interface-definitions/protocols-rip.xml.in b/interface-definitions/protocols-rip.xml.in
index 089055021..6a01fcdac 100644
--- a/interface-definitions/protocols-rip.xml.in
+++ b/interface-definitions/protocols-rip.xml.in
@@ -151,7 +151,7 @@
                   </completionHelp>
                 </properties>
               </leafNode>
-              #include <include/static-route-distance.xml.i>
+              #include <include/static/static-route-distance.xml.i>
             </children>
           </tagNode>
           #include <include/routing-passive-interface-xml.i>
diff --git a/interface-definitions/protocols-static.xml.in b/interface-definitions/protocols-static.xml.in
index 59a7927a5..f614aa063 100644
--- a/interface-definitions/protocols-static.xml.in
+++ b/interface-definitions/protocols-static.xml.in
@@ -7,9 +7,9 @@
           <help>Static route parameters</help>
         </properties>
         <children>
-          #include <include/static-route-map.xml.i>
-          #include <include/static-route.xml.i>
-          #include <include/static-route6.xml.i>
+          #include <include/static/static-route-map.xml.i>
+          #include <include/static/static-route.xml.i>
+          #include <include/static/static-route6.xml.i>
           <tagNode name="table">
             <properties>
               <help>Policy route table number</help>
@@ -22,8 +22,8 @@
               </constraint>
             </properties>
             <children>
-              #include <include/static-route.xml.i>
-              #include <include/static-route6.xml.i>
+              #include <include/static/static-route.xml.i>
+              #include <include/static/static-route6.xml.i>
             </children>
           </tagNode>
         </children>
diff --git a/interface-definitions/vrf.xml.in b/interface-definitions/vrf.xml.in
index 0a5e5c121..fdf7e3444 100644
--- a/interface-definitions/vrf.xml.in
+++ b/interface-definitions/vrf.xml.in
@@ -39,8 +39,8 @@
                   <priority>600</priority>
                 </properties>
                 <children>
-                  #include <include/static-route.xml.i>
-                  #include <include/static-route6.xml.i>
+                  #include <include/static/static-route.xml.i>
+                  #include <include/static/static-route6.xml.i>
                 </children>
               </node>
               <tagNode name="bgp" owner="${vyos_conf_scripts_dir}/protocols_bgp.py $VAR(../../@)">