From 9d0e8634c79f5347545ec28fffd3612c760e07df Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 14 Mar 2021 15:28:42 +0000
Subject: 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.
---
 .../include/static-route-blackhole.xml.i           | 10 ---
 .../include/static-route-distance.xml.i            | 14 ----
 .../include/static-route-interface.xml.i           | 17 ----
 .../include/static-route-map.xml.i                 | 10 ---
 .../include/static-route-vrf.xml.i                 | 19 -----
 interface-definitions/include/static-route.xml.i   | 90 ----------------------
 interface-definitions/include/static-route6.xml.i  | 75 ------------------
 .../include/static/static-route-blackhole.xml.i    | 10 +++
 .../include/static/static-route-distance.xml.i     | 14 ++++
 .../include/static/static-route-interface.xml.i    | 17 ++++
 .../include/static/static-route-map.xml.i          | 10 +++
 .../include/static/static-route-vrf.xml.i          | 19 +++++
 .../include/static/static-route.xml.i              | 90 ++++++++++++++++++++++
 .../include/static/static-route6.xml.i             | 75 ++++++++++++++++++
 interface-definitions/protocols-rip.xml.in         |  2 +-
 interface-definitions/protocols-static.xml.in      | 10 +--
 interface-definitions/vrf.xml.in                   |  4 +-
 17 files changed, 243 insertions(+), 243 deletions(-)
 delete mode 100644 interface-definitions/include/static-route-blackhole.xml.i
 delete mode 100644 interface-definitions/include/static-route-distance.xml.i
 delete mode 100644 interface-definitions/include/static-route-interface.xml.i
 delete mode 100644 interface-definitions/include/static-route-map.xml.i
 delete mode 100644 interface-definitions/include/static-route-vrf.xml.i
 delete mode 100644 interface-definitions/include/static-route.xml.i
 delete mode 100644 interface-definitions/include/static-route6.xml.i
 create mode 100644 interface-definitions/include/static/static-route-blackhole.xml.i
 create mode 100644 interface-definitions/include/static/static-route-distance.xml.i
 create mode 100644 interface-definitions/include/static/static-route-interface.xml.i
 create mode 100644 interface-definitions/include/static/static-route-map.xml.i
 create mode 100644 interface-definitions/include/static/static-route-vrf.xml.i
 create mode 100644 interface-definitions/include/static/static-route.xml.i
 create mode 100644 interface-definitions/include/static/static-route6.xml.i

(limited to 'interface-definitions')

diff --git a/interface-definitions/include/static-route-blackhole.xml.i b/interface-definitions/include/static-route-blackhole.xml.i
deleted file mode 100644
index 838a475d3..000000000
--- a/interface-definitions/include/static-route-blackhole.xml.i
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- include start from 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>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/static-route-distance.xml.i b/interface-definitions/include/static-route-distance.xml.i
deleted file mode 100644
index da171fe1f..000000000
--- a/interface-definitions/include/static-route-distance.xml.i
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- include start from static-route-distance.xml.i -->
-<leafNode name="distance">
-  <properties>
-    <help>Distance for this route</help>
-    <valueHelp>
-      <format>u32:1-255</format>
-      <description>Distance for this route</description>
-    </valueHelp>
-    <constraint>
-      <validator name="numeric" argument="--range 1-255"/>
-    </constraint>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/static-route-interface.xml.i b/interface-definitions/include/static-route-interface.xml.i
deleted file mode 100644
index 6670c0e33..000000000
--- a/interface-definitions/include/static-route-interface.xml.i
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- include start from static-route-interface.xml.i -->
-<leafNode name="interface">
-  <properties>
-    <help>Gateway interface name</help>
-    <completionHelp>
-      <script>${vyos_completion_dir}/list_interfaces.py</script>
-    </completionHelp>
-    <valueHelp>
-      <format>txt</format>
-      <description>Gateway interface name</description>
-    </valueHelp>
-    <constraint>
-      <validator name="interface-name"/>
-    </constraint>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/static-route-map.xml.i b/interface-definitions/include/static-route-map.xml.i
deleted file mode 100644
index 48f5055aa..000000000
--- a/interface-definitions/include/static-route-map.xml.i
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- include start from static-route-map.xml.i -->
-<leafNode name="route-map">
-  <properties>
-    <help>Filter routes installed in local route map</help>
-    <completionHelp>
-      <path>policy route-map</path>
-    </completionHelp>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/static-route-vrf.xml.i b/interface-definitions/include/static-route-vrf.xml.i
deleted file mode 100644
index eda4d7aee..000000000
--- a/interface-definitions/include/static-route-vrf.xml.i
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- include start from static-route-vrf.xml.i -->
-<leafNode name="vrf">
-  <properties>
-    <help>VRF to leak route</help>
-    <completionHelp>
-      <list>default</list>
-      <path>vrf name</path>
-    </completionHelp>
-    <valueHelp>
-      <format>txt</format>
-      <description>Name of VRF to leak to</description>
-    </valueHelp>
-    <constraint>
-      <regex>^(default)$</regex>
-      <validator name="vrf-name"/>
-    </constraint>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/static-route.xml.i b/interface-definitions/include/static-route.xml.i
deleted file mode 100644
index 94fbdd3d6..000000000
--- a/interface-definitions/include/static-route.xml.i
+++ /dev/null
@@ -1,90 +0,0 @@
-<!-- include start from static-route.xml.i -->
-<tagNode name="route">
-  <properties>
-    <help>VRF static IPv4 route</help>
-    <valueHelp>
-      <format>ipv4net</format>
-      <description>IPv4 static route</description>
-    </valueHelp>
-    <constraint>
-      <validator name="ipv4-prefix"/>
-    </constraint>
-  </properties>
-  <children>
-    <node name="blackhole">
-      <properties>
-        <help>Silently discard pkts when matched</help>
-      </properties>
-      <children>
-        #include <include/static-route-distance.xml.i>
-        <leafNode name="tag">
-          <properties>
-            <help>Tag value for this route</help>
-            <valueHelp>
-              <format>u32:1-4294967295</format>
-              <description>Tag value for this route</description>
-            </valueHelp>
-            <constraint>
-              <validator name="numeric" argument="--range 1-4294967295"/>
-            </constraint>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="dhcp-interface">
-      <properties>
-        <help>DHCP interface supplying next-hop IP address</help>
-        <completionHelp>
-          <script>${vyos_completion_dir}/list_interfaces.py</script>
-        </completionHelp>
-        <valueHelp>
-          <format>txt</format>
-          <description>DHCP interface name</description>
-        </valueHelp>
-        <constraint>
-          <validator name="interface-name"/>
-        </constraint>
-      </properties>
-    </leafNode>
-    <tagNode name="interface">
-      <properties>
-        <help>Next-hop IPv4 router interface</help>
-        <completionHelp>
-          <script>${vyos_completion_dir}/list_interfaces.py</script>
-        </completionHelp>
-        <valueHelp>
-          <format>txt</format>
-          <description>Gateway interface name</description>
-        </valueHelp>
-        <constraint>
-          <validator name="interface-name"/>
-        </constraint>
-      </properties>
-      <children>
-        #include <include/generic-disable-node.xml.i>
-        #include <include/static-route-distance.xml.i>
-        #include <include/static-route-vrf.xml.i>
-      </children>
-    </tagNode>
-    <tagNode name="next-hop">
-      <properties>
-        <help>Next-hop IPv4 router address</help>
-        <valueHelp>
-          <format>ipv4</format>
-          <description>Next-hop router address</description>
-        </valueHelp>
-        <constraint>
-          <validator name="ipv4-address"/>
-        </constraint>
-      </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>
-      </children>
-    </tagNode>
-  </children>
-</tagNode>
-<!-- include end -->
-
diff --git a/interface-definitions/include/static-route6.xml.i b/interface-definitions/include/static-route6.xml.i
deleted file mode 100644
index 4522ef39b..000000000
--- a/interface-definitions/include/static-route6.xml.i
+++ /dev/null
@@ -1,75 +0,0 @@
-<!-- include start from static-route6.xml.i -->
-<tagNode name="route6">
-  <properties>
-    <help>VRF static IPv6 route</help>
-    <valueHelp>
-      <format>ipv6net</format>
-      <description>IPv6 static route</description>
-    </valueHelp>
-    <constraint>
-      <validator name="ipv6-prefix"/>
-    </constraint>
-  </properties>
-  <children>
-    <node name="blackhole">
-      <properties>
-        <help>Silently discard pkts when matched</help>
-      </properties>
-      <children>
-        #include <include/static-route-distance.xml.i>
-        <leafNode name="tag">
-          <properties>
-            <help>Tag value for this route</help>
-            <valueHelp>
-              <format>u32:1-4294967295</format>
-              <description>Tag value for this route</description>
-            </valueHelp>
-            <constraint>
-              <validator name="numeric" argument="--range 1-4294967295"/>
-            </constraint>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <tagNode name="interface">
-      <properties>
-        <help>IPv6 gateway interface name</help>
-        <completionHelp>
-          <script>${vyos_completion_dir}/list_interfaces.py</script>
-        </completionHelp>
-        <valueHelp>
-          <format>txt</format>
-          <description>Gateway interface name</description>
-        </valueHelp>
-        <constraint>
-          <validator name="interface-name"/>
-        </constraint>
-      </properties>
-      <children>
-        #include <include/generic-disable-node.xml.i>
-        #include <include/static-route-distance.xml.i>
-        #include <include/static-route-vrf.xml.i>
-      </children>
-    </tagNode>
-    <tagNode name="next-hop">
-      <properties>
-        <help>IPv6 gateway address</help>
-        <valueHelp>
-          <format>ipv6</format>
-          <description>Next-hop IPv6 router</description>
-        </valueHelp>
-        <constraint>
-          <validator name="ipv6-address"/>
-        </constraint>
-      </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>
-      </children>
-    </tagNode>
-  </children>
-</tagNode>
-<!-- include end -->
-
diff --git a/interface-definitions/include/static/static-route-blackhole.xml.i b/interface-definitions/include/static/static-route-blackhole.xml.i
new file mode 100644
index 000000000..f2ad23e69
--- /dev/null
+++ b/interface-definitions/include/static/static-route-blackhole.xml.i
@@ -0,0 +1,10 @@
+<!-- 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/static-route-distance.xml.i>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/static/static-route-distance.xml.i b/interface-definitions/include/static/static-route-distance.xml.i
new file mode 100644
index 000000000..a651b98d7
--- /dev/null
+++ b/interface-definitions/include/static/static-route-distance.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from static/static-route-distance.xml.i -->
+<leafNode name="distance">
+  <properties>
+    <help>Distance for this route</help>
+    <valueHelp>
+      <format>u32:1-255</format>
+      <description>Distance for this route</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-255"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/static/static-route-interface.xml.i b/interface-definitions/include/static/static-route-interface.xml.i
new file mode 100644
index 000000000..ed4f455e5
--- /dev/null
+++ b/interface-definitions/include/static/static-route-interface.xml.i
@@ -0,0 +1,17 @@
+<!-- include start from static/static-route-interface.xml.i -->
+<leafNode name="interface">
+  <properties>
+    <help>Gateway interface name</help>
+    <completionHelp>
+      <script>${vyos_completion_dir}/list_interfaces.py</script>
+    </completionHelp>
+    <valueHelp>
+      <format>txt</format>
+      <description>Gateway interface name</description>
+    </valueHelp>
+    <constraint>
+      <validator name="interface-name"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/static/static-route-map.xml.i b/interface-definitions/include/static/static-route-map.xml.i
new file mode 100644
index 000000000..af825e043
--- /dev/null
+++ b/interface-definitions/include/static/static-route-map.xml.i
@@ -0,0 +1,10 @@
+<!-- include start from static/static-route-map.xml.i -->
+<leafNode name="route-map">
+  <properties>
+    <help>Filter routes installed in local route map</help>
+    <completionHelp>
+      <path>policy route-map</path>
+    </completionHelp>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/static/static-route-vrf.xml.i b/interface-definitions/include/static/static-route-vrf.xml.i
new file mode 100644
index 000000000..69aba253c
--- /dev/null
+++ b/interface-definitions/include/static/static-route-vrf.xml.i
@@ -0,0 +1,19 @@
+<!-- include start from static/static-route-vrf.xml.i -->
+<leafNode name="vrf">
+  <properties>
+    <help>VRF to leak route</help>
+    <completionHelp>
+      <list>default</list>
+      <path>vrf name</path>
+    </completionHelp>
+    <valueHelp>
+      <format>txt</format>
+      <description>Name of VRF to leak to</description>
+    </valueHelp>
+    <constraint>
+      <regex>^(default)$</regex>
+      <validator name="vrf-name"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/static/static-route.xml.i b/interface-definitions/include/static/static-route.xml.i
new file mode 100644
index 000000000..254ea3163
--- /dev/null
+++ b/interface-definitions/include/static/static-route.xml.i
@@ -0,0 +1,90 @@
+<!-- include start from static/static-route.xml.i -->
+<tagNode name="route">
+  <properties>
+    <help>VRF static IPv4 route</help>
+    <valueHelp>
+      <format>ipv4net</format>
+      <description>IPv4 static route</description>
+    </valueHelp>
+    <constraint>
+      <validator name="ipv4-prefix"/>
+    </constraint>
+  </properties>
+  <children>
+    <node name="blackhole">
+      <properties>
+        <help>Silently discard pkts when matched</help>
+      </properties>
+      <children>
+        #include <include/static/static-route-distance.xml.i>
+        <leafNode name="tag">
+          <properties>
+            <help>Tag value for this route</help>
+            <valueHelp>
+              <format>u32:1-4294967295</format>
+              <description>Tag value for this route</description>
+            </valueHelp>
+            <constraint>
+              <validator name="numeric" argument="--range 1-4294967295"/>
+            </constraint>
+          </properties>
+        </leafNode>
+      </children>
+    </node>
+    <leafNode name="dhcp-interface">
+      <properties>
+        <help>DHCP interface supplying next-hop IP address</help>
+        <completionHelp>
+          <script>${vyos_completion_dir}/list_interfaces.py</script>
+        </completionHelp>
+        <valueHelp>
+          <format>txt</format>
+          <description>DHCP interface name</description>
+        </valueHelp>
+        <constraint>
+          <validator name="interface-name"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    <tagNode name="interface">
+      <properties>
+        <help>Next-hop IPv4 router interface</help>
+        <completionHelp>
+          <script>${vyos_completion_dir}/list_interfaces.py</script>
+        </completionHelp>
+        <valueHelp>
+          <format>txt</format>
+          <description>Gateway interface name</description>
+        </valueHelp>
+        <constraint>
+          <validator name="interface-name"/>
+        </constraint>
+      </properties>
+      <children>
+        #include <include/generic-disable-node.xml.i>
+        #include <include/static/static-route-distance.xml.i>
+        #include <include/static/static-route-vrf.xml.i>
+      </children>
+    </tagNode>
+    <tagNode name="next-hop">
+      <properties>
+        <help>Next-hop IPv4 router address</help>
+        <valueHelp>
+          <format>ipv4</format>
+          <description>Next-hop router address</description>
+        </valueHelp>
+        <constraint>
+          <validator name="ipv4-address"/>
+        </constraint>
+      </properties>
+      <children>
+        #include <include/generic-disable-node.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>
+</tagNode>
+<!-- include end -->
+
diff --git a/interface-definitions/include/static/static-route6.xml.i b/interface-definitions/include/static/static-route6.xml.i
new file mode 100644
index 000000000..0ea995588
--- /dev/null
+++ b/interface-definitions/include/static/static-route6.xml.i
@@ -0,0 +1,75 @@
+<!-- include start from static/static-route6.xml.i -->
+<tagNode name="route6">
+  <properties>
+    <help>VRF static IPv6 route</help>
+    <valueHelp>
+      <format>ipv6net</format>
+      <description>IPv6 static route</description>
+    </valueHelp>
+    <constraint>
+      <validator name="ipv6-prefix"/>
+    </constraint>
+  </properties>
+  <children>
+    <node name="blackhole">
+      <properties>
+        <help>Silently discard pkts when matched</help>
+      </properties>
+      <children>
+        #include <include/static/static-route-distance.xml.i>
+        <leafNode name="tag">
+          <properties>
+            <help>Tag value for this route</help>
+            <valueHelp>
+              <format>u32:1-4294967295</format>
+              <description>Tag value for this route</description>
+            </valueHelp>
+            <constraint>
+              <validator name="numeric" argument="--range 1-4294967295"/>
+            </constraint>
+          </properties>
+        </leafNode>
+      </children>
+    </node>
+    <tagNode name="interface">
+      <properties>
+        <help>IPv6 gateway interface name</help>
+        <completionHelp>
+          <script>${vyos_completion_dir}/list_interfaces.py</script>
+        </completionHelp>
+        <valueHelp>
+          <format>txt</format>
+          <description>Gateway interface name</description>
+        </valueHelp>
+        <constraint>
+          <validator name="interface-name"/>
+        </constraint>
+      </properties>
+      <children>
+        #include <include/generic-disable-node.xml.i>
+        #include <include/static/static-route-distance.xml.i>
+        #include <include/static/static-route-vrf.xml.i>
+      </children>
+    </tagNode>
+    <tagNode name="next-hop">
+      <properties>
+        <help>IPv6 gateway address</help>
+        <valueHelp>
+          <format>ipv6</format>
+          <description>Next-hop IPv6 router</description>
+        </valueHelp>
+        <constraint>
+          <validator name="ipv6-address"/>
+        </constraint>
+      </properties>
+      <children>
+        #include <include/generic-disable-node.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>
+</tagNode>
+<!-- include end -->
+
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(../../@)">
-- 
cgit v1.2.3