summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--interface-definitions/include/bgp/protocol-common-config.xml.i13
-rw-r--r--interface-definitions/include/ospf/protocol-common-config.xml.i2
-rw-r--r--interface-definitions/include/router-id.xml.i (renamed from interface-definitions/include/ospf/router-id.xml.i)6
-rw-r--r--interface-definitions/protocols-mpls.xml.in13
-rw-r--r--interface-definitions/protocols-ospfv3.xml.in2
5 files changed, 7 insertions, 29 deletions
diff --git a/interface-definitions/include/bgp/protocol-common-config.xml.i b/interface-definitions/include/bgp/protocol-common-config.xml.i
index bb3b9ce7c..ea620582f 100644
--- a/interface-definitions/include/bgp/protocol-common-config.xml.i
+++ b/interface-definitions/include/bgp/protocol-common-config.xml.i
@@ -1401,18 +1401,7 @@
<valueless/>
</properties>
</leafNode>
- <leafNode name="router-id">
- <properties>
- <help>BGP router id</help>
- <valueHelp>
- <format>ipv4</format>
- <description>BGP router id</description>
- </valueHelp>
- <constraint>
- <validator name="ipv4-address"/>
- </constraint>
- </properties>
- </leafNode>
+ #include <include/router-id.xml.i>
</children>
</node>
<tagNode name="peer-group">
diff --git a/interface-definitions/include/ospf/protocol-common-config.xml.i b/interface-definitions/include/ospf/protocol-common-config.xml.i
index 6d7fe9d70..2993a3dfb 100644
--- a/interface-definitions/include/ospf/protocol-common-config.xml.i
+++ b/interface-definitions/include/ospf/protocol-common-config.xml.i
@@ -586,7 +586,7 @@
<valueless/>
</properties>
</leafNode>
- #include <include/ospf/router-id.xml.i>
+ #include <include/router-id.xml.i>
</children>
</node>
#include <include/routing-passive-interface-xml.i>
diff --git a/interface-definitions/include/ospf/router-id.xml.i b/interface-definitions/include/router-id.xml.i
index 2512f78d7..272a8b678 100644
--- a/interface-definitions/include/ospf/router-id.xml.i
+++ b/interface-definitions/include/router-id.xml.i
@@ -1,10 +1,10 @@
-<!-- include start from ospf/router-id.xml.i -->
+<!-- include start from router-id.xml.i -->
<leafNode name="router-id">
<properties>
- <help>Override the default router identifier</help>
+ <help>Override default router identifier</help>
<valueHelp>
<format>ipv4</format>
- <description>Override the default router identifier</description>
+ <description>Router-ID in IP address format</description>
</valueHelp>
<constraint>
<validator name="ipv4-address"/>
diff --git a/interface-definitions/protocols-mpls.xml.in b/interface-definitions/protocols-mpls.xml.in
index de1aa436d..e7646e625 100644
--- a/interface-definitions/protocols-mpls.xml.in
+++ b/interface-definitions/protocols-mpls.xml.in
@@ -14,18 +14,7 @@
<help>Label Distribution Protocol (LDP)</help>
</properties>
<children>
- <leafNode name="router-id">
- <properties>
- <help>Label Distribution Protocol router ID</help>
- <valueHelp>
- <format>ipv4</format>
- <description>LDP IPv4 ID</description>
- </valueHelp>
- <constraint>
- <validator name="ipv4-address"/>
- </constraint>
- </properties>
- </leafNode>
+ #include <include/router-id.xml.i>
<node name="allocation">
<properties>
<help>Forwarding equivalence class allocation from local routes</help>
diff --git a/interface-definitions/protocols-ospfv3.xml.in b/interface-definitions/protocols-ospfv3.xml.in
index df775233b..99e671b32 100644
--- a/interface-definitions/protocols-ospfv3.xml.in
+++ b/interface-definitions/protocols-ospfv3.xml.in
@@ -171,7 +171,7 @@
<help>OSPFv3 specific parameters</help>
</properties>
<children>
- #include <include/ospf/router-id.xml.i>
+ #include <include/router-id.xml.i>
</children>
</node>
<node name="redistribute">