summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-03-14 15:20:51 +0000
committerChristian Poessinger <christian@poessinger.com>2021-03-14 16:56:11 +0100
commitc2ae70181b8ad136f5139c9fdd53e0bb402c9914 (patch)
tree07a37e3f9e18b316517189d9133573fe70e52d73
parentadea0e05a56cb25a9e40b46e30a7648c99907031 (diff)
downloadvyos-1x-c2ae70181b8ad136f5139c9fdd53e0bb402c9914.tar.gz
vyos-1x-c2ae70181b8ad136f5139c9fdd53e0bb402c9914.zip
rip: xml: T2547: 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.
-rw-r--r--interface-definitions/include/rip/rip-access-list.xml.i (renamed from interface-definitions/include/rip-access-list.xml.i)2
-rw-r--r--interface-definitions/include/rip/rip-access-list6.xml.i (renamed from interface-definitions/include/rip-access-list6.xml.i)2
-rw-r--r--interface-definitions/include/rip/rip-default-information.xml.i (renamed from interface-definitions/include/rip-default-information.xml.i)2
-rw-r--r--interface-definitions/include/rip/rip-default-metric.xml.i (renamed from interface-definitions/include/rip-default-metric.xml.i)2
-rw-r--r--interface-definitions/include/rip/rip-interface.xml.i (renamed from interface-definitions/include/rip-interface.xml.i)2
-rw-r--r--interface-definitions/include/rip/rip-prefix-list.xml.i (renamed from interface-definitions/include/rip-prefix-list.xml.i)2
-rw-r--r--interface-definitions/include/rip/rip-prefix-list6.xml.i (renamed from interface-definitions/include/rip-prefix-list6.xml.i)2
-rw-r--r--interface-definitions/include/rip/rip-redistribute.xml.i (renamed from interface-definitions/include/rip-redistribute.xml.i)2
-rw-r--r--interface-definitions/include/rip/rip-timers.xml.i (renamed from interface-definitions/include/rip-timers.xml.i)2
-rw-r--r--interface-definitions/protocols-rip.xml.in28
-rw-r--r--interface-definitions/protocols-ripng.xml.in26
11 files changed, 36 insertions, 36 deletions
diff --git a/interface-definitions/include/rip-access-list.xml.i b/interface-definitions/include/rip/rip-access-list.xml.i
index 9d5366a0d..00ee9b736 100644
--- a/interface-definitions/include/rip-access-list.xml.i
+++ b/interface-definitions/include/rip/rip-access-list.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from rip-access-list.xml.i -->
+<!-- include start from rip/rip-access-list.xml.i -->
<node name="access-list">
<properties>
<help>Access-list</help>
diff --git a/interface-definitions/include/rip-access-list6.xml.i b/interface-definitions/include/rip/rip-access-list6.xml.i
index a57f2038d..9e4298bc0 100644
--- a/interface-definitions/include/rip-access-list6.xml.i
+++ b/interface-definitions/include/rip/rip-access-list6.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from rip-access-list.xml.i -->
+<!-- include start from rip/rip-access-list.xml.i -->
<node name="access-list">
<properties>
<help>Access-list</help>
diff --git a/interface-definitions/include/rip-default-information.xml.i b/interface-definitions/include/rip/rip-default-information.xml.i
index 9dbe744a1..28c540c26 100644
--- a/interface-definitions/include/rip-default-information.xml.i
+++ b/interface-definitions/include/rip/rip-default-information.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from rip-default-information.xml.i -->
+<!-- include start from rip/rip-default-information.xml.i -->
<node name="default-information">
<properties>
<help>Control distribution of default route</help>
diff --git a/interface-definitions/include/rip-default-metric.xml.i b/interface-definitions/include/rip/rip-default-metric.xml.i
index e021e47dd..297af5af8 100644
--- a/interface-definitions/include/rip-default-metric.xml.i
+++ b/interface-definitions/include/rip/rip-default-metric.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from rip-default-metric.xml.i -->
+<!-- include start from rip/rip-default-metric.xml.i -->
<leafNode name="default-metric">
<properties>
<help>Metric of redistributed routes</help>
diff --git a/interface-definitions/include/rip-interface.xml.i b/interface-definitions/include/rip/rip-interface.xml.i
index 1807a944a..dd3bddd4f 100644
--- a/interface-definitions/include/rip-interface.xml.i
+++ b/interface-definitions/include/rip/rip-interface.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from rip-interface.xml.i -->
+<!-- include start from rip/rip-interface.xml.i -->
<tagNode name="interface">
<properties>
<help>Interface name</help>
diff --git a/interface-definitions/include/rip-prefix-list.xml.i b/interface-definitions/include/rip/rip-prefix-list.xml.i
index ec8a34266..2569a2a09 100644
--- a/interface-definitions/include/rip-prefix-list.xml.i
+++ b/interface-definitions/include/rip/rip-prefix-list.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from rip-prefix-list.xml.i -->
+<!-- include start from rip/rip-prefix-list.xml.i -->
<node name="prefix-list">
<properties>
<help>Prefix-list</help>
diff --git a/interface-definitions/include/rip-prefix-list6.xml.i b/interface-definitions/include/rip/rip-prefix-list6.xml.i
index b1026bcd2..fcf1499e0 100644
--- a/interface-definitions/include/rip-prefix-list6.xml.i
+++ b/interface-definitions/include/rip/rip-prefix-list6.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from rip-prefix-list.xml.i -->
+<!-- include start from rip/rip-prefix-list.xml.i -->
<node name="prefix-list">
<properties>
<help>Prefix-list</help>
diff --git a/interface-definitions/include/rip-redistribute.xml.i b/interface-definitions/include/rip/rip-redistribute.xml.i
index 1e47125e9..d7a79b007 100644
--- a/interface-definitions/include/rip-redistribute.xml.i
+++ b/interface-definitions/include/rip/rip-redistribute.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from rip-redistribute.xml.i -->
+<!-- include start from rip/rip-redistribute.xml.i -->
<leafNode name="metric">
<properties>
<help>Metric for redistributed routes</help>
diff --git a/interface-definitions/include/rip-timers.xml.i b/interface-definitions/include/rip/rip-timers.xml.i
index f43ea3f5f..3aaaf8e65 100644
--- a/interface-definitions/include/rip-timers.xml.i
+++ b/interface-definitions/include/rip/rip-timers.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from rip-timers.xml.i -->
+<!-- include start from rip/rip-timers.xml.i -->
<node name="timers">
<properties>
<help>RIPng timer values</help>
diff --git a/interface-definitions/protocols-rip.xml.in b/interface-definitions/protocols-rip.xml.in
index 1ae3bd8f7..089055021 100644
--- a/interface-definitions/protocols-rip.xml.in
+++ b/interface-definitions/protocols-rip.xml.in
@@ -19,14 +19,14 @@
</constraint>
</properties>
</leafNode>
- #include <include/rip-default-information.xml.i>
- #include <include/rip-default-metric.xml.i>
+ #include <include/rip/rip-default-information.xml.i>
+ #include <include/rip/rip-default-metric.xml.i>
<node name="distribute-list">
<properties>
<help>Filter networks in routing updates</help>
</properties>
<children>
- #include <include/rip-access-list.xml.i>
+ #include <include/rip/rip-access-list.xml.i>
<tagNode name="interface">
<properties>
<help>Apply filtering to an interface</help>
@@ -42,14 +42,14 @@
</constraint>
</properties>
<children>
- #include <include/rip-access-list.xml.i>
- #include <include/rip-prefix-list.xml.i>
+ #include <include/rip/rip-access-list.xml.i>
+ #include <include/rip/rip-prefix-list.xml.i>
</children>
</tagNode>
- #include <include/rip-prefix-list.xml.i>
+ #include <include/rip/rip-prefix-list.xml.i>
</children>
</node>
- #include <include/rip-interface.xml.i>
+ #include <include/rip/rip-interface.xml.i>
<tagNode name="interface">
<children>
<node name="authentication">
@@ -165,7 +165,7 @@
<help>Redistribute BGP routes</help>
</properties>
<children>
- #include <include/rip-redistribute.xml.i>
+ #include <include/rip/rip-redistribute.xml.i>
</children>
</node>
<node name="connected">
@@ -173,7 +173,7 @@
<help>Redistribute connected routes</help>
</properties>
<children>
- #include <include/rip-redistribute.xml.i>
+ #include <include/rip/rip-redistribute.xml.i>
</children>
</node>
<node name="isis">
@@ -181,7 +181,7 @@
<help>Redistribute IS-IS routes</help>
</properties>
<children>
- #include <include/rip-redistribute.xml.i>
+ #include <include/rip/rip-redistribute.xml.i>
</children>
</node>
<node name="kernel">
@@ -189,7 +189,7 @@
<help>Redistribute kernel routes</help>
</properties>
<children>
- #include <include/rip-redistribute.xml.i>
+ #include <include/rip/rip-redistribute.xml.i>
</children>
</node>
<node name="ospf">
@@ -197,7 +197,7 @@
<help>Redistribute OSPF routes</help>
</properties>
<children>
- #include <include/rip-redistribute.xml.i>
+ #include <include/rip/rip-redistribute.xml.i>
</children>
</node>
<node name="static">
@@ -205,7 +205,7 @@
<help>Redistribute static routes</help>
</properties>
<children>
- #include <include/rip-redistribute.xml.i>
+ #include <include/rip/rip-redistribute.xml.i>
</children>
</node>
</children>
@@ -223,7 +223,7 @@
<multi/>
</properties>
</leafNode>
- #include <include/rip-timers.xml.i>
+ #include <include/rip/rip-timers.xml.i>
</children>
</node>
</children>
diff --git a/interface-definitions/protocols-ripng.xml.in b/interface-definitions/protocols-ripng.xml.in
index 3eac27788..1bd52d18e 100644
--- a/interface-definitions/protocols-ripng.xml.in
+++ b/interface-definitions/protocols-ripng.xml.in
@@ -20,14 +20,14 @@
<multi/>
</properties>
</leafNode>
- #include <include/rip-default-information.xml.i>
- #include <include/rip-default-metric.xml.i>
+ #include <include/rip/rip-default-information.xml.i>
+ #include <include/rip/rip-default-metric.xml.i>
<node name="distribute-list">
<properties>
<help>Filter networks in routing updates</help>
</properties>
<children>
- #include <include/rip-access-list6.xml.i>
+ #include <include/rip/rip-access-list6.xml.i>
<tagNode name="interface">
<properties>
<help>Apply filtering to an interface</help>
@@ -43,14 +43,14 @@
</constraint>
</properties>
<children>
- #include <include/rip-access-list6.xml.i>
- #include <include/rip-prefix-list6.xml.i>
+ #include <include/rip/rip-access-list6.xml.i>
+ #include <include/rip/rip-prefix-list6.xml.i>
</children>
</tagNode>
- #include <include/rip-prefix-list6.xml.i>
+ #include <include/rip/rip-prefix-list6.xml.i>
</children>
</node>
- #include <include/rip-interface.xml.i>
+ #include <include/rip/rip-interface.xml.i>
<leafNode name="network">
<properties>
<help>RIPng network</help>
@@ -87,7 +87,7 @@
<help>Redistribute BGP routes</help>
</properties>
<children>
- #include <include/rip-redistribute.xml.i>
+ #include <include/rip/rip-redistribute.xml.i>
</children>
</node>
<node name="connected">
@@ -95,7 +95,7 @@
<help>Redistribute connected routes</help>
</properties>
<children>
- #include <include/rip-redistribute.xml.i>
+ #include <include/rip/rip-redistribute.xml.i>
</children>
</node>
<node name="kernel">
@@ -103,7 +103,7 @@
<help>Redistribute kernel routes</help>
</properties>
<children>
- #include <include/rip-redistribute.xml.i>
+ #include <include/rip/rip-redistribute.xml.i>
</children>
</node>
<node name="ospfv3">
@@ -111,7 +111,7 @@
<help>Redistribute OSPFv3 routes</help>
</properties>
<children>
- #include <include/rip-redistribute.xml.i>
+ #include <include/rip/rip-redistribute.xml.i>
</children>
</node>
<node name="static">
@@ -119,7 +119,7 @@
<help>Redistribute static routes</help>
</properties>
<children>
- #include <include/rip-redistribute.xml.i>
+ #include <include/rip/rip-redistribute.xml.i>
</children>
</node>
</children>
@@ -138,7 +138,7 @@
</properties>
</leafNode>
#include <include/route-map.xml.i>
- #include <include/rip-timers.xml.i>
+ #include <include/rip/rip-timers.xml.i>
</children>
</node>
</children>