From ffd1da431ef5b6f2218966c762c65382ff00f188 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Thu, 6 May 2021 19:46:31 +0200
Subject: xml: routing: use common router-id include file

---
 .../include/bgp/protocol-common-config.xml.i               | 13 +------------
 .../include/ospf/protocol-common-config.xml.i              |  2 +-
 interface-definitions/include/ospf/router-id.xml.i         | 14 --------------
 interface-definitions/include/router-id.xml.i              | 14 ++++++++++++++
 interface-definitions/protocols-mpls.xml.in                | 13 +------------
 interface-definitions/protocols-ospfv3.xml.in              |  2 +-
 6 files changed, 18 insertions(+), 40 deletions(-)
 delete mode 100644 interface-definitions/include/ospf/router-id.xml.i
 create mode 100644 interface-definitions/include/router-id.xml.i

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/ospf/router-id.xml.i
deleted file mode 100644
index 2512f78d7..000000000
--- a/interface-definitions/include/ospf/router-id.xml.i
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- include start from ospf/router-id.xml.i -->
-<leafNode name="router-id">
-  <properties>
-    <help>Override the default router identifier</help>
-    <valueHelp>
-      <format>ipv4</format>
-      <description>Override the default router identifier</description>
-    </valueHelp>
-    <constraint>
-      <validator name="ipv4-address"/>
-    </constraint>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/router-id.xml.i b/interface-definitions/include/router-id.xml.i
new file mode 100644
index 000000000..272a8b678
--- /dev/null
+++ b/interface-definitions/include/router-id.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from router-id.xml.i -->
+<leafNode name="router-id">
+  <properties>
+    <help>Override default router identifier</help>
+    <valueHelp>
+      <format>ipv4</format>
+      <description>Router-ID in IP address format</description>
+    </valueHelp>
+    <constraint>
+      <validator name="ipv4-address"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
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">
-- 
cgit v1.2.3