From 0d9658f3dcaf1a9f376a6768c54a0ceb80ece7d0 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Thu, 11 Mar 2021 20:41:51 +0100
Subject: xml: include: move route-map from ospf to generic section
---
.../include/ospf/ospf-common-config.xml.i | 16 ++++++++--------
interface-definitions/include/ospf/ospf-route-map.xml.i | 14 --------------
interface-definitions/include/rip-redistribute.xml.i | 2 +-
interface-definitions/include/route-map.xml.i | 14 ++++++++++++++
interface-definitions/protocols-ospfv3.xml.in | 12 ++++++------
interface-definitions/protocols-ripng.xml.in | 2 +-
6 files changed, 30 insertions(+), 30 deletions(-)
delete mode 100644 interface-definitions/include/ospf/ospf-route-map.xml.i
create mode 100644 interface-definitions/include/route-map.xml.i
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/ospf/ospf-route-map.xml.i b/interface-definitions/include/ospf/ospf-route-map.xml.i
deleted file mode 100644
index 943a477c0..000000000
--- a/interface-definitions/include/ospf/ospf-route-map.xml.i
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- included start from ospf-route-map.xml.i -->
-<leafNode name="route-map">
- <properties>
- <help>Route map reference</help>
- <valueHelp>
- <format>txt</format>
- <description>Route map reference</description>
- </valueHelp>
- <completionHelp>
- <path>policy route-map</path>
- </completionHelp>
- </properties>
-</leafNode>
-<!-- included end -->
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/route-map.xml.i b/interface-definitions/include/route-map.xml.i
new file mode 100644
index 000000000..943a477c0
--- /dev/null
+++ b/interface-definitions/include/route-map.xml.i
@@ -0,0 +1,14 @@
+<!-- included start from ospf-route-map.xml.i -->
+<leafNode name="route-map">
+ <properties>
+ <help>Route map reference</help>
+ <valueHelp>
+ <format>txt</format>
+ <description>Route map reference</description>
+ </valueHelp>
+ <completionHelp>
+ <path>policy route-map</path>
+ </completionHelp>
+ </properties>
+</leafNode>
+<!-- included end -->
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>
--
cgit v1.2.3