From 57dd8a257052bbfa76447ddf83ef2f7e5efa2744 Mon Sep 17 00:00:00 2001
From: Cheeze_It <none@none.com>
Date: Thu, 13 Oct 2022 20:33:28 -0700
Subject: T4739: ISIS segment routing being refactored

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

(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
deleted file mode 100644
index f30b5af3a..000000000
--- a/interface-definitions/include/isis/high-low-label-value.xml.i
+++ /dev/null
@@ -1,26 +0,0 @@
-<!-- include start from isis/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 (recommended 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/isis/protocol-common-config.xml.i b/interface-definitions/include/isis/protocol-common-config.xml.i
index 57ee19300..42bda7a80 100644
--- a/interface-definitions/include/isis/protocol-common-config.xml.i
+++ b/interface-definitions/include/isis/protocol-common-config.xml.i
@@ -238,7 +238,7 @@
         <help>Segment Routing Global Block label range</help>
       </properties>
       <children>
-        #include <include/isis/high-low-label-value.xml.i>
+        #include <include/segment-routing-label-value.xml.i>
       </children>
     </node>
     <node name="local-block">
@@ -246,7 +246,7 @@
         <help>Segment Routing Local Block label range</help>
       </properties>
       <children>
-        #include <include/isis/high-low-label-value.xml.i>
+        #include <include/segment-routing-label-value.xml.i>
       </children>
     </node>
     <leafNode name="maximum-label-depth">
diff --git a/interface-definitions/include/segment-routing-label-value.xml.i b/interface-definitions/include/segment-routing-label-value.xml.i
new file mode 100644
index 000000000..05e1edd78
--- /dev/null
+++ b/interface-definitions/include/segment-routing-label-value.xml.i
@@ -0,0 +1,26 @@
+<!-- include start from segment-routing-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 (recommended minimum value: 300)</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 -->
-- 
cgit v1.2.3


From e3d66e7eb61c4fd5d29b64370a993d583f597639 Mon Sep 17 00:00:00 2001
From: Cheeze_It <none@none.com>
Date: Thu, 13 Oct 2022 20:36:37 -0700
Subject: T4739: OSPF segment routing being refactored

---
 .../include/ospf/protocol-common-config.xml.i               |  4 ++--
 smoketest/scripts/cli/test_protocols_ospf.py                | 13 +++++--------
 2 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/include/ospf/protocol-common-config.xml.i b/interface-definitions/include/ospf/protocol-common-config.xml.i
index 28e3b473b..0615063af 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/isis/high-low-label-value.xml.i>
+        #include <include/segment-routing-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/isis/high-low-label-value.xml.i>
+        #include <include/segment-routing-label-value.xml.i>
       </children>
     </node>
     <leafNode name="maximum-label-depth">
diff --git a/smoketest/scripts/cli/test_protocols_ospf.py b/smoketest/scripts/cli/test_protocols_ospf.py
index 93bb761c1..51c947537 100755
--- a/smoketest/scripts/cli/test_protocols_ospf.py
+++ b/smoketest/scripts/cli/test_protocols_ospf.py
@@ -382,10 +382,10 @@ class TestProtocolsOSPF(VyOSUnitTestSHIM.TestCase):
 
 
     def test_ospf_14_segment_routing_configuration(self):
-        global_block_low = "100"
-        global_block_high = "199"
-        local_block_low = "200"
-        local_block_high = "299"
+        global_block_low = "300"
+        global_block_high = "399"
+        local_block_low = "400"
+        local_block_high = "499"
         interface = 'lo'
         maximum_stack_size = '5'
         prefix_one = '192.168.0.1/32'
@@ -408,16 +408,13 @@ class TestProtocolsOSPF(VyOSUnitTestSHIM.TestCase):
         self.cli_commit()
 
         # Verify all changes
-
         frrconfig = self.getFRRconfig('router ospf')
+        self.assertIn(f' segment-routing on', frrconfig)
         self.assertIn(f' segment-routing global-block {global_block_low} {global_block_high} local-block {local_block_low} {local_block_high}', frrconfig)
         self.assertIn(f' segment-routing node-msd {maximum_stack_size}', frrconfig)
         self.assertIn(f' segment-routing prefix {prefix_one} index {prefix_one_value} explicit-null', frrconfig)
         self.assertIn(f' segment-routing prefix {prefix_two} index {prefix_two_value} no-php-flag', frrconfig)
 
-        self.skipTest('https://github.com/FRRouting/frr/issues/12007')
-        self.assertIn(f' segment-routing on', frrconfig)
-
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
-- 
cgit v1.2.3