summaryrefslogtreecommitdiff
path: root/interface-definitions/include
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-05-06 19:46:31 +0200
committerChristian Poessinger <christian@poessinger.com>2021-05-06 19:46:31 +0200
commitffd1da431ef5b6f2218966c762c65382ff00f188 (patch)
tree19d337fb936e4ef7b02f88baf31d82cd0be585c2 /interface-definitions/include
parentd5bd9bec6c213ff12190b03acf248f348c165c13 (diff)
downloadvyos-1x-ffd1da431ef5b6f2218966c762c65382ff00f188.tar.gz
vyos-1x-ffd1da431ef5b6f2218966c762c65382ff00f188.zip
xml: routing: use common router-id include file
Diffstat (limited to 'interface-definitions/include')
-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
3 files changed, 5 insertions, 16 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"/>