summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-08-17 09:10:56 +0200
committerChristian Poessinger <christian@poessinger.com>2021-08-17 09:10:56 +0200
commit520d2fb73670cfaa378164896d6993a03893f2b8 (patch)
tree7753d4795eaadd27f92baa025fa47e6e5a2db877
parent6707322f754750431355424518dfa2ac739a1a3a (diff)
downloadvyos-1x-520d2fb73670cfaa378164896d6993a03893f2b8.tar.gz
vyos-1x-520d2fb73670cfaa378164896d6993a03893f2b8.zip
isis: T1316: use common redistribute XML building block for IPv4 and IPv6
-rw-r--r--interface-definitions/include/isis/protocol-common-config.xml.i24
-rw-r--r--interface-definitions/include/isis/redistribute-ipv4.xml.i42
-rw-r--r--interface-definitions/include/isis/redistribute-ipv6.xml.i42
-rw-r--r--interface-definitions/include/isis/redistribute-level-1-2.xml.i20
4 files changed, 32 insertions, 96 deletions
diff --git a/interface-definitions/include/isis/protocol-common-config.xml.i b/interface-definitions/include/isis/protocol-common-config.xml.i
index af5a21f49..84e2f7bb2 100644
--- a/interface-definitions/include/isis/protocol-common-config.xml.i
+++ b/interface-definitions/include/isis/protocol-common-config.xml.i
@@ -447,7 +447,7 @@
<help>Border Gateway Protocol (BGP)</help>
</properties>
<children>
- #include <include/isis/redistribute-ipv4.xml.i>
+ #include <include/isis/redistribute-level-1-2.xml.i>
</children>
</node>
<node name="connected">
@@ -455,7 +455,7 @@
<help>Redistribute connected routes into IS-IS</help>
</properties>
<children>
- #include <include/isis/redistribute-ipv4.xml.i>
+ #include <include/isis/redistribute-level-1-2.xml.i>
</children>
</node>
<node name="kernel">
@@ -463,7 +463,7 @@
<help>Redistribute kernel routes into IS-IS</help>
</properties>
<children>
- #include <include/isis/redistribute-ipv4.xml.i>
+ #include <include/isis/redistribute-level-1-2.xml.i>
</children>
</node>
<node name="ospf">
@@ -471,7 +471,7 @@
<help>Redistribute OSPF routes into IS-IS</help>
</properties>
<children>
- #include <include/isis/redistribute-ipv4.xml.i>
+ #include <include/isis/redistribute-level-1-2.xml.i>
</children>
</node>
<node name="rip">
@@ -479,7 +479,7 @@
<help>Redistribute RIP routes into IS-IS</help>
</properties>
<children>
- #include <include/isis/redistribute-ipv4.xml.i>
+ #include <include/isis/redistribute-level-1-2.xml.i>
</children>
</node>
<node name="static">
@@ -487,7 +487,7 @@
<help>Redistribute static routes into IS-IS</help>
</properties>
<children>
- #include <include/isis/redistribute-ipv4.xml.i>
+ #include <include/isis/redistribute-level-1-2.xml.i>
</children>
</node>
</children>
@@ -502,7 +502,7 @@
<help>Redistribute BGP routes into IS-IS</help>
</properties>
<children>
- #include <include/isis/redistribute-ipv6.xml.i>
+ #include <include/isis/redistribute-level-1-2.xml.i>
</children>
</node>
<node name="connected">
@@ -510,7 +510,7 @@
<help>Redistribute connected routes into IS-IS</help>
</properties>
<children>
- #include <include/isis/redistribute-ipv6.xml.i>
+ #include <include/isis/redistribute-level-1-2.xml.i>
</children>
</node>
<node name="kernel">
@@ -518,7 +518,7 @@
<help>Redistribute kernel routes into IS-IS</help>
</properties>
<children>
- #include <include/isis/redistribute-ipv6.xml.i>
+ #include <include/isis/redistribute-level-1-2.xml.i>
</children>
</node>
<node name="ospf6">
@@ -526,7 +526,7 @@
<help>Redistribute OSPFv3 routes into IS-IS</help>
</properties>
<children>
- #include <include/isis/redistribute-ipv6.xml.i>
+ #include <include/isis/redistribute-level-1-2.xml.i>
</children>
</node>
<node name="ripng">
@@ -534,7 +534,7 @@
<help>Redistribute RIPng routes into IS-IS</help>
</properties>
<children>
- #include <include/isis/redistribute-ipv6.xml.i>
+ #include <include/isis/redistribute-level-1-2.xml.i>
</children>
</node>
<node name="static">
@@ -542,7 +542,7 @@
<help>Redistribute static routes into IS-IS</help>
</properties>
<children>
- #include <include/isis/redistribute-ipv6.xml.i>
+ #include <include/isis/redistribute-level-1-2.xml.i>
</children>
</node>
</children>
diff --git a/interface-definitions/include/isis/redistribute-ipv4.xml.i b/interface-definitions/include/isis/redistribute-ipv4.xml.i
deleted file mode 100644
index fbb6210c7..000000000
--- a/interface-definitions/include/isis/redistribute-ipv4.xml.i
+++ /dev/null
@@ -1,42 +0,0 @@
-<!-- include start from isis/redistribute-ipv4.xml.i -->
-<node name="level-1">
- <properties>
- <help>Redistribute into level-1</help>
- </properties>
- <children>
- <leafNode name="metric">
- <properties>
- <help>Metric for redistributed routes</help>
- <valueHelp>
- <format>u32:0-16777215</format>
- <description>ISIS default metric</description>
- </valueHelp>
- <constraint>
- <validator name="numeric" argument="--range 0-16777215"/>
- </constraint>
- </properties>
- </leafNode>
- #include <include/route-map.xml.i>
- </children>
-</node>
-<node name="level-2">
- <properties>
- <help>Redistribute into level-2</help>
- </properties>
- <children>
- <leafNode name="metric">
- <properties>
- <help>Metric for redistributed routes</help>
- <valueHelp>
- <format>u32:0-16777215</format>
- <description>ISIS default metric</description>
- </valueHelp>
- <constraint>
- <validator name="numeric" argument="--range 0-16777215"/>
- </constraint>
- </properties>
- </leafNode>
- #include <include/route-map.xml.i>
- </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/isis/redistribute-ipv6.xml.i b/interface-definitions/include/isis/redistribute-ipv6.xml.i
deleted file mode 100644
index 7e679e38a..000000000
--- a/interface-definitions/include/isis/redistribute-ipv6.xml.i
+++ /dev/null
@@ -1,42 +0,0 @@
-<!-- include start from isis/redistribute-ipv6.xml.i -->
-<node name="level-1">
- <properties>
- <help>Redistribute into level-1</help>
- </properties>
- <children>
- <leafNode name="metric">
- <properties>
- <help>Metric for redistributed routes</help>
- <valueHelp>
- <format>u32:0-16777215</format>
- <description>ISIS default metric</description>
- </valueHelp>
- <constraint>
- <validator name="numeric" argument="--range 0-16777215"/>
- </constraint>
- </properties>
- </leafNode>
- #include <include/route-map.xml.i>
- </children>
-</node>
-<node name="level-2">
- <properties>
- <help>Redistribute into level-2</help>
- </properties>
- <children>
- <leafNode name="metric">
- <properties>
- <help>Metric for redistributed routes</help>
- <valueHelp>
- <format>u32:0-16777215</format>
- <description>ISIS default metric</description>
- </valueHelp>
- <constraint>
- <validator name="numeric" argument="--range 0-16777215"/>
- </constraint>
- </properties>
- </leafNode>
- #include <include/route-map.xml.i>
- </children>
-</node>
-<!-- include end --> \ No newline at end of file
diff --git a/interface-definitions/include/isis/redistribute-level-1-2.xml.i b/interface-definitions/include/isis/redistribute-level-1-2.xml.i
new file mode 100644
index 000000000..abb85274f
--- /dev/null
+++ b/interface-definitions/include/isis/redistribute-level-1-2.xml.i
@@ -0,0 +1,20 @@
+<!-- include start from isis/redistribute-level-1-2.xml.i -->
+<node name="level-1">
+ <properties>
+ <help>Redistribute into level-1</help>
+ </properties>
+ <children>
+ #include <include/isis/metric.xml.i>
+ #include <include/route-map.xml.i>
+ </children>
+</node>
+<node name="level-2">
+ <properties>
+ <help>Redistribute into level-2</help>
+ </properties>
+ <children>
+ #include <include/isis/metric.xml.i>
+ #include <include/route-map.xml.i>
+ </children>
+</node>
+<!-- include end -->