From 06d6386e5d9fb9812b23032516bbdc938dcc4a9f Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Tue, 11 Oct 2022 19:52:32 +0200
Subject: xml: ospf: isis: T4739: merge include files for MPLS segment-routing

---
 .../include/isis/high-low-label-value.xml.i        |  2 +-
 .../include/ospf/high-low-label-value.xml.i        | 26 ----------------------
 .../include/ospf/protocol-common-config.xml.i      |  4 ++--
 3 files changed, 3 insertions(+), 29 deletions(-)
 delete mode 100644 interface-definitions/include/ospf/high-low-label-value.xml.i

diff --git a/interface-definitions/include/isis/high-low-label-value.xml.i b/interface-definitions/include/isis/high-low-label-value.xml.i
index 7026b03dd..f30b5af3a 100644
--- a/interface-definitions/include/isis/high-low-label-value.xml.i
+++ b/interface-definitions/include/isis/high-low-label-value.xml.i
@@ -4,7 +4,7 @@
     <help>MPLS label lower bound</help>
     <valueHelp>
       <format>u32:16-1048575</format>
-      <description>Label value - Suggested minimum value: 100</description>
+      <description>Label value (recommended minimum value: 100)</description>
     </valueHelp>
     <constraint>
       <validator name="numeric" argument="--range 16-1048575"/>
diff --git a/interface-definitions/include/ospf/high-low-label-value.xml.i b/interface-definitions/include/ospf/high-low-label-value.xml.i
deleted file mode 100644
index 9e2ef6efb..000000000
--- a/interface-definitions/include/ospf/high-low-label-value.xml.i
+++ /dev/null
@@ -1,26 +0,0 @@
-<!-- include start from ospf/high-low-label-value.xml.i -->
-<leafNode name="low-label-value">
-  <properties>
-    <help>MPLS label lower bound</help>
-    <valueHelp>
-      <format>u32:16-1048575</format>
-      <description>Label value - Suggested minimum value: 100</description>
-    </valueHelp>
-    <constraint>
-      <validator name="numeric" argument="--range 16-1048575"/>
-    </constraint>
-  </properties>
-</leafNode>
-<leafNode name="high-label-value">
-  <properties>
-    <help>MPLS label upper bound</help>
-    <valueHelp>
-      <format>u32:16-1048575</format>
-      <description>Label value</description>
-    </valueHelp>
-    <constraint>
-      <validator name="numeric" argument="--range 16-1048575"/>
-    </constraint>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/ospf/protocol-common-config.xml.i b/interface-definitions/include/ospf/protocol-common-config.xml.i
index 78c168641..28e3b473b 100644
--- a/interface-definitions/include/ospf/protocol-common-config.xml.i
+++ b/interface-definitions/include/ospf/protocol-common-config.xml.i
@@ -631,7 +631,7 @@
         <help>Segment Routing Global Block label range</help>
       </properties>
       <children>
-        #include <include/ospf/high-low-label-value.xml.i>
+        #include <include/isis/high-low-label-value.xml.i>
       </children>
     </node>
     <node name="local-block">
@@ -639,7 +639,7 @@
         <help>Segment Routing Local Block label range</help>
       </properties>
       <children>
-        #include <include/ospf/high-low-label-value.xml.i>
+        #include <include/isis/high-low-label-value.xml.i>
       </children>
     </node>
     <leafNode name="maximum-label-depth">
-- 
cgit v1.2.3