summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-03-11 20:41:51 +0100
committerChristian Poessinger <christian@poessinger.com>2021-03-14 11:09:56 +0100
commit0d9658f3dcaf1a9f376a6768c54a0ceb80ece7d0 (patch)
tree4384b7d7302d72cf70cfd5e5d29032d0a3c1fdfb
parent9991a54c36b9d34d5cacfcee37fd53abd9411bd9 (diff)
downloadvyos-1x-0d9658f3dcaf1a9f376a6768c54a0ceb80ece7d0.tar.gz
vyos-1x-0d9658f3dcaf1a9f376a6768c54a0ceb80ece7d0.zip
xml: include: move route-map from ospf to generic section
-rw-r--r--interface-definitions/include/ospf/ospf-common-config.xml.i16
-rw-r--r--interface-definitions/include/rip-redistribute.xml.i2
-rw-r--r--interface-definitions/include/route-map.xml.i (renamed from interface-definitions/include/ospf/ospf-route-map.xml.i)0
-rw-r--r--interface-definitions/protocols-ospfv3.xml.in12
-rw-r--r--interface-definitions/protocols-ripng.xml.in2
5 files changed, 16 insertions, 16 deletions
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/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/ospf/ospf-route-map.xml.i b/interface-definitions/include/route-map.xml.i
index 943a477c0..943a477c0 100644
--- a/interface-definitions/include/ospf/ospf-route-map.xml.i
+++ b/interface-definitions/include/route-map.xml.i
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>