From 08c2a057917c357ccf6fac7b51e05d5dae780fc3 Mon Sep 17 00:00:00 2001
From: Cheeze_It <none@none.com>
Date: Fri, 7 Oct 2022 21:27:47 -0700
Subject: isis: T4739: ISIS segment routing being refactored

This is to refactor ISIS segment routing to match up with OSPF segment routing.
---
 interface-definitions/include/isis/high-low-label-value.xml.i   | 2 +-
 interface-definitions/include/isis/protocol-common-config.xml.i | 6 ------
 interface-definitions/include/ospf/high-low-label-value.xml.i   | 6 +++---
 interface-definitions/include/version/isis-version.xml.i        | 2 +-
 4 files changed, 5 insertions(+), 11 deletions(-)

(limited to 'interface-definitions')

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 adc28417d..7026b03dd 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</description>
+      <description>Label value - Suggested minimum value: 100</description>
     </valueHelp>
     <constraint>
       <validator name="numeric" argument="--range 16-1048575"/>
diff --git a/interface-definitions/include/isis/protocol-common-config.xml.i b/interface-definitions/include/isis/protocol-common-config.xml.i
index 75a0355d4..57ee19300 100644
--- a/interface-definitions/include/isis/protocol-common-config.xml.i
+++ b/interface-definitions/include/isis/protocol-common-config.xml.i
@@ -233,12 +233,6 @@
     <help>Segment-Routing (SPRING) settings</help>
   </properties>
   <children>
-    <leafNode name="enable">
-      <properties>
-        <help>Enable segment-routing functionality</help>
-        <valueless/>
-      </properties>
-    </leafNode>
     <node name="global-block">
       <properties>
         <help>Segment Routing Global Block label range</help>
diff --git a/interface-definitions/include/ospf/high-low-label-value.xml.i b/interface-definitions/include/ospf/high-low-label-value.xml.i
index 4b6779922..9e2ef6efb 100644
--- a/interface-definitions/include/ospf/high-low-label-value.xml.i
+++ b/interface-definitions/include/ospf/high-low-label-value.xml.i
@@ -3,8 +3,8 @@
   <properties>
     <help>MPLS label lower bound</help>
     <valueHelp>
-      <format>u32:100-1048575</format>
-      <description>Label value</description>
+      <format>u32:16-1048575</format>
+      <description>Label value - Suggested minimum value: 100</description>
     </valueHelp>
     <constraint>
       <validator name="numeric" argument="--range 16-1048575"/>
@@ -15,7 +15,7 @@
   <properties>
     <help>MPLS label upper bound</help>
     <valueHelp>
-      <format>u32:100-1048575</format>
+      <format>u32:16-1048575</format>
       <description>Label value</description>
     </valueHelp>
     <constraint>
diff --git a/interface-definitions/include/version/isis-version.xml.i b/interface-definitions/include/version/isis-version.xml.i
index 4a8fef39c..7bf12e81a 100644
--- a/interface-definitions/include/version/isis-version.xml.i
+++ b/interface-definitions/include/version/isis-version.xml.i
@@ -1,3 +1,3 @@
 <!-- include start from include/version/isis-version.xml.i -->
-<syntaxVersion component='isis' version='1'></syntaxVersion>
+<syntaxVersion component='isis' version='2'></syntaxVersion>
 <!-- include end -->
-- 
cgit v1.2.3