diff --git a/TestON/JenkinsFile/JenkinsfileTrigger b/TestON/JenkinsFile/JenkinsfileTrigger
index ca7c655..c624984 100644
--- a/TestON/JenkinsFile/JenkinsfileTrigger
+++ b/TestON/JenkinsFile/JenkinsfileTrigger
@@ -4,7 +4,7 @@
 test_lists = evaluate readTrusted( 'TestON/JenkinsFile/JenkinsTestONTests.groovy' )
 
 previous_version = "1.12"
-before_previous_version = "master"
+before_previous_version = "1.11"
 funcs.initializeTrend( "VM" );
 
 testcases = [
@@ -147,7 +147,7 @@
         case Calendar.SUNDAY:
             sunday()
             day = "Sunday"
-            //isOldFlow = false
+            isOldFlow = false
             break
     }
 }
@@ -257,6 +257,9 @@
     SR_choices += adder( "SR", "basic", false, "S", true )
     SCPF_choices += adder( "SCPF", "basic", false, "S", true )
     SCPF_choices += adder( "SCPF", "extra_A", false, "S", true )
+    SCPF_choices += adder( "SCPF", "extra_B", false, "S", true )
+    SCPF_choices += adder( "SCPF", "extra_C", false, "S", true )
+    SCPF_choices += adder( "SCPF", "extra_D", false, "S", true )
     USECASE_choices += adder( "USECASE", "basic", false, "S", true )
 }
 def adder( testCat, set, dayAdding, day, getResult ){
@@ -456,4 +459,4 @@
             ~/./return_cell.sh
             '''
     }
-}
\ No newline at end of file
+}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=0_routers=0.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=0_routers=0.json
index 52624f7..be5ff7f 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=0_routers=0.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=0_routers=0.json
@@ -193,8 +193,8 @@
         "of:0000000000000001" : {
             "segmentrouting" : {
                 "name" : "s001",
-                "ipv4NodeSid" : 1,
-		"ipv6NodeSid" : 101,
+                "ipv4NodeSid" : 1001,
+		"ipv6NodeSid" : 2001,
 		"ipv6Loopback" : "2000::c0a8:0001",
                 "ipv4Loopback" : "192.168.0.1",
                 "routerMac" : "00:00:00:00:00:01",
@@ -210,9 +210,9 @@
         "of:0000000000000002" : {
             "segmentrouting" : {
                 "name" : "s002",
-                "ipv4NodeSid" : 2,
+                "ipv4NodeSid" : 1002,
                 "ipv4Loopback" : "192.168.0.2",
-		"ipv6NodeSid" : 102,
+		"ipv6NodeSid" : 2002,
 		"ipv6Loopback" : "2000::c0a8:0002",
                 "routerMac" : "00:00:00:00:00:02",
                 "isEdgeRouter" : true,
@@ -229,9 +229,9 @@
         "of:0000000000000003" : {
             "segmentrouting" : {
                 "name" : "s003",
-                "ipv4NodeSid" : 3,
+                "ipv4NodeSid" : 1003,
                 "ipv4Loopback" : "192.168.0.3",
-        	"ipv6NodeSid" : 103,
+        	"ipv6NodeSid" : 2003,
 		"ipv6Loopback" : "2000::c0a8:0003",
                 "routerMac" : "00:00:00:00:00:02",
                 "isEdgeRouter" : true,
@@ -248,9 +248,9 @@
         "of:0000000000000004" : {
             "segmentrouting" : {
                 "name" : "s004",
-                "ipv4NodeSid" : 4,
+                "ipv4NodeSid" : 1004,
                 "ipv4Loopback" : "192.168.0.4",
-		"ipv6NodeSid" : 104,
+		"ipv6NodeSid" : 2004,
 		"ipv6Loopback" : "2000::c0a8:0004",        
                 "routerMac" : "00:00:00:00:00:04",
                 "isEdgeRouter" : true,
@@ -267,9 +267,9 @@
         "of:0000000000000005" : {
             "segmentrouting" : {
                 "name" : "s005",
-                "ipv4NodeSid" : 5,
+                "ipv4NodeSid" : 1005,
                 "ipv4Loopback" : "192.168.0.5",
-		"ipv6NodeSid" : 105,
+		"ipv6NodeSid" : 2005,
 		"ipv6Loopback" : "2000::c0a8:0005", 
                 "routerMac" : "00:00:00:00:00:04",
                 "isEdgeRouter" : true,
@@ -286,9 +286,9 @@
         "of:0000000000000101" : {
             "segmentrouting" : {
                 "name" : "s101",
-                "ipv4NodeSid" : 101,
+                "ipv4NodeSid" : 1101,
                 "ipv4Loopback" : "192.168.0.101",
-		"ipv6NodeSid" : 201,
+		"ipv6NodeSid" : 2101,
 		"ipv6Loopback" : "2000::c0a8:0101", 
                 "routerMac" : "00:00:00:00:01:01",
                 "isEdgeRouter" : false,
@@ -303,9 +303,9 @@
         "of:0000000000000102" : {
             "segmentrouting" : {
                 "name" : "s102",
-                "ipv4NodeSid" : 102,
+                "ipv4NodeSid" : 1102,
                 "ipv4Loopback" : "192.168.0.102",
-		"ipv6NodeSid" : 202,
+		"ipv6NodeSid" : 2102,
 		"ipv6Loopback" : "2000::c0a8:0202",
                 "routerMac" : "00:00:00:00:01:02",
                 "isEdgeRouter" : false,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=0.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=0.json
index 8264f29..e430592 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=0.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=0.json
@@ -177,8 +177,8 @@
         "of:0000000000000001" : {
             "segmentrouting" : {
                 "name" : "s001",
-                "ipv4NodeSid" : 1,
-		"ipv6NodeSid" : 101,
+                "ipv4NodeSid" : 1001,
+		"ipv6NodeSid" : 2001,
 		"ipv6Loopback" : "2000::c0a8:0001",
                 "ipv4Loopback" : "192.168.0.1",
                 "routerMac" : "00:00:00:00:00:01",
@@ -194,9 +194,9 @@
         "of:0000000000000002" : {
             "segmentrouting" : {
                 "name" : "s002",
-                "ipv4NodeSid" : 2,
+                "ipv4NodeSid" : 1002,
                 "ipv4Loopback" : "192.168.0.2",
-		"ipv6NodeSid" : 102,
+		"ipv6NodeSid" : 2002,
 		"ipv6Loopback" : "2000::c0a8:0002",
                 "routerMac" : "00:00:00:00:00:02",
                 "isEdgeRouter" : true,
@@ -213,9 +213,9 @@
         "of:0000000000000003" : {
             "segmentrouting" : {
                 "name" : "s003",
-                "ipv4NodeSid" : 3,
+                "ipv4NodeSid" : 1003,
                 "ipv4Loopback" : "192.168.0.3",
-        	"ipv6NodeSid" : 103,
+        	"ipv6NodeSid" : 2003,
 		"ipv6Loopback" : "2000::c0a8:0003",
                 "routerMac" : "00:00:00:00:00:02",
                 "isEdgeRouter" : true,
@@ -232,9 +232,9 @@
         "of:0000000000000004" : {
             "segmentrouting" : {
                 "name" : "s004",
-                "ipv4NodeSid" : 4,
+                "ipv4NodeSid" : 1004,
                 "ipv4Loopback" : "192.168.0.4",
-		"ipv6NodeSid" : 104,
+		"ipv6NodeSid" : 2004,
 		"ipv6Loopback" : "2000::c0a8:0004",        
                 "routerMac" : "00:00:00:00:00:04",
                 "isEdgeRouter" : true,
@@ -251,9 +251,9 @@
         "of:0000000000000005" : {
             "segmentrouting" : {
                 "name" : "s005",
-                "ipv4NodeSid" : 5,
+                "ipv4NodeSid" : 1005,
                 "ipv4Loopback" : "192.168.0.5",
-		"ipv6NodeSid" : 105,
+		"ipv6NodeSid" : 2005,
 		"ipv6Loopback" : "2000::c0a8:0005", 
                 "routerMac" : "00:00:00:00:00:04",
                 "isEdgeRouter" : true,
@@ -270,9 +270,9 @@
         "of:0000000000000101" : {
             "segmentrouting" : {
                 "name" : "s101",
-                "ipv4NodeSid" : 101,
+                "ipv4NodeSid" : 1101,
                 "ipv4Loopback" : "192.168.0.101",
-		"ipv6NodeSid" : 201,
+		"ipv6NodeSid" : 2101,
 		"ipv6Loopback" : "2000::c0a8:0101", 
                 "routerMac" : "00:00:00:00:01:01",
                 "isEdgeRouter" : false,
@@ -287,9 +287,9 @@
         "of:0000000000000102" : {
             "segmentrouting" : {
                 "name" : "s102",
-                "ipv4NodeSid" : 102,
+                "ipv4NodeSid" : 1102,
                 "ipv4Loopback" : "192.168.0.102",
-		"ipv6NodeSid" : 202,
+		"ipv6NodeSid" : 2102,
 		"ipv6Loopback" : "2000::c0a8:0202",
                 "routerMac" : "00:00:00:00:01:02",
                 "isEdgeRouter" : false,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.json
index 293829e..030849f 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.json
@@ -228,8 +228,8 @@
         "of:0000000000000001" : {
             "segmentrouting" : {
                 "name" : "s001",
-                "ipv4NodeSid" : 1,
-		"ipv6NodeSid" : 101,
+                "ipv4NodeSid" : 1001,
+		"ipv6NodeSid" : 2001,
 		"ipv6Loopback" : "2000::c0a8:0001",
                 "ipv4Loopback" : "192.168.0.1",
                 "routerMac" : "00:00:00:00:00:01",
@@ -245,9 +245,9 @@
         "of:0000000000000002" : {
             "segmentrouting" : {
                 "name" : "s002",
-                "ipv4NodeSid" : 2,
+                "ipv4NodeSid" : 1002,
                 "ipv4Loopback" : "192.168.0.2",
-		"ipv6NodeSid" : 102,
+		"ipv6NodeSid" : 2002,
 		"ipv6Loopback" : "2000::c0a8:0002",
                 "routerMac" : "00:00:00:00:00:02",
                 "isEdgeRouter" : true,
@@ -264,9 +264,9 @@
         "of:0000000000000003" : {
             "segmentrouting" : {
                 "name" : "s003",
-                "ipv4NodeSid" : 3,
+                "ipv4NodeSid" : 1003,
                 "ipv4Loopback" : "192.168.0.3",
-        	"ipv6NodeSid" : 103,
+        	"ipv6NodeSid" : 2003,
 		"ipv6Loopback" : "2000::c0a8:0003",
                 "routerMac" : "00:00:00:00:00:02",
                 "isEdgeRouter" : true,
@@ -283,9 +283,9 @@
         "of:0000000000000004" : {
             "segmentrouting" : {
                 "name" : "s004",
-                "ipv4NodeSid" : 4,
+                "ipv4NodeSid" : 1004,
                 "ipv4Loopback" : "192.168.0.4",
-		"ipv6NodeSid" : 104,
+		"ipv6NodeSid" : 2004,
 		"ipv6Loopback" : "2000::c0a8:0004",        
                 "routerMac" : "00:00:00:00:00:04",
                 "isEdgeRouter" : true,
@@ -302,9 +302,9 @@
         "of:0000000000000005" : {
             "segmentrouting" : {
                 "name" : "s005",
-                "ipv4NodeSid" : 5,
+                "ipv4NodeSid" : 1005,
                 "ipv4Loopback" : "192.168.0.5",
-		"ipv6NodeSid" : 105,
+		"ipv6NodeSid" : 2005,
 		"ipv6Loopback" : "2000::c0a8:0005", 
                 "routerMac" : "00:00:00:00:00:04",
                 "isEdgeRouter" : true,
@@ -321,9 +321,9 @@
         "of:0000000000000101" : {
             "segmentrouting" : {
                 "name" : "s101",
-                "ipv4NodeSid" : 101,
+                "ipv4NodeSid" : 1101,
                 "ipv4Loopback" : "192.168.0.101",
-		"ipv6NodeSid" : 201,
+		"ipv6NodeSid" : 2101,
 		"ipv6Loopback" : "2000::c0a8:0101", 
                 "routerMac" : "00:00:00:00:01:01",
                 "isEdgeRouter" : false,
@@ -338,9 +338,9 @@
         "of:0000000000000102" : {
             "segmentrouting" : {
                 "name" : "s102",
-                "ipv4NodeSid" : 102,
+                "ipv4NodeSid" : 1102,
                 "ipv4Loopback" : "192.168.0.102",
-		"ipv6NodeSid" : 202,
+		"ipv6NodeSid" : 2102,
 		"ipv6Loopback" : "2000::c0a8:0202",
                 "routerMac" : "00:00:00:00:01:02",
                 "isEdgeRouter" : false,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.json
index 293829e..030849f 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.json
@@ -228,8 +228,8 @@
         "of:0000000000000001" : {
             "segmentrouting" : {
                 "name" : "s001",
-                "ipv4NodeSid" : 1,
-		"ipv6NodeSid" : 101,
+                "ipv4NodeSid" : 1001,
+		"ipv6NodeSid" : 2001,
 		"ipv6Loopback" : "2000::c0a8:0001",
                 "ipv4Loopback" : "192.168.0.1",
                 "routerMac" : "00:00:00:00:00:01",
@@ -245,9 +245,9 @@
         "of:0000000000000002" : {
             "segmentrouting" : {
                 "name" : "s002",
-                "ipv4NodeSid" : 2,
+                "ipv4NodeSid" : 1002,
                 "ipv4Loopback" : "192.168.0.2",
-		"ipv6NodeSid" : 102,
+		"ipv6NodeSid" : 2002,
 		"ipv6Loopback" : "2000::c0a8:0002",
                 "routerMac" : "00:00:00:00:00:02",
                 "isEdgeRouter" : true,
@@ -264,9 +264,9 @@
         "of:0000000000000003" : {
             "segmentrouting" : {
                 "name" : "s003",
-                "ipv4NodeSid" : 3,
+                "ipv4NodeSid" : 1003,
                 "ipv4Loopback" : "192.168.0.3",
-        	"ipv6NodeSid" : 103,
+        	"ipv6NodeSid" : 2003,
 		"ipv6Loopback" : "2000::c0a8:0003",
                 "routerMac" : "00:00:00:00:00:02",
                 "isEdgeRouter" : true,
@@ -283,9 +283,9 @@
         "of:0000000000000004" : {
             "segmentrouting" : {
                 "name" : "s004",
-                "ipv4NodeSid" : 4,
+                "ipv4NodeSid" : 1004,
                 "ipv4Loopback" : "192.168.0.4",
-		"ipv6NodeSid" : 104,
+		"ipv6NodeSid" : 2004,
 		"ipv6Loopback" : "2000::c0a8:0004",        
                 "routerMac" : "00:00:00:00:00:04",
                 "isEdgeRouter" : true,
@@ -302,9 +302,9 @@
         "of:0000000000000005" : {
             "segmentrouting" : {
                 "name" : "s005",
-                "ipv4NodeSid" : 5,
+                "ipv4NodeSid" : 1005,
                 "ipv4Loopback" : "192.168.0.5",
-		"ipv6NodeSid" : 105,
+		"ipv6NodeSid" : 2005,
 		"ipv6Loopback" : "2000::c0a8:0005", 
                 "routerMac" : "00:00:00:00:00:04",
                 "isEdgeRouter" : true,
@@ -321,9 +321,9 @@
         "of:0000000000000101" : {
             "segmentrouting" : {
                 "name" : "s101",
-                "ipv4NodeSid" : 101,
+                "ipv4NodeSid" : 1101,
                 "ipv4Loopback" : "192.168.0.101",
-		"ipv6NodeSid" : 201,
+		"ipv6NodeSid" : 2101,
 		"ipv6Loopback" : "2000::c0a8:0101", 
                 "routerMac" : "00:00:00:00:01:01",
                 "isEdgeRouter" : false,
@@ -338,9 +338,9 @@
         "of:0000000000000102" : {
             "segmentrouting" : {
                 "name" : "s102",
-                "ipv4NodeSid" : 102,
+                "ipv4NodeSid" : 1102,
                 "ipv4Loopback" : "192.168.0.102",
-		"ipv6NodeSid" : 202,
+		"ipv6NodeSid" : 2102,
 		"ipv6Loopback" : "2000::c0a8:0202",
                 "routerMac" : "00:00:00:00:01:02",
                 "isEdgeRouter" : false,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.json
index 293829e..030849f 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.json
@@ -228,8 +228,8 @@
         "of:0000000000000001" : {
             "segmentrouting" : {
                 "name" : "s001",
-                "ipv4NodeSid" : 1,
-		"ipv6NodeSid" : 101,
+                "ipv4NodeSid" : 1001,
+		"ipv6NodeSid" : 2001,
 		"ipv6Loopback" : "2000::c0a8:0001",
                 "ipv4Loopback" : "192.168.0.1",
                 "routerMac" : "00:00:00:00:00:01",
@@ -245,9 +245,9 @@
         "of:0000000000000002" : {
             "segmentrouting" : {
                 "name" : "s002",
-                "ipv4NodeSid" : 2,
+                "ipv4NodeSid" : 1002,
                 "ipv4Loopback" : "192.168.0.2",
-		"ipv6NodeSid" : 102,
+		"ipv6NodeSid" : 2002,
 		"ipv6Loopback" : "2000::c0a8:0002",
                 "routerMac" : "00:00:00:00:00:02",
                 "isEdgeRouter" : true,
@@ -264,9 +264,9 @@
         "of:0000000000000003" : {
             "segmentrouting" : {
                 "name" : "s003",
-                "ipv4NodeSid" : 3,
+                "ipv4NodeSid" : 1003,
                 "ipv4Loopback" : "192.168.0.3",
-        	"ipv6NodeSid" : 103,
+        	"ipv6NodeSid" : 2003,
 		"ipv6Loopback" : "2000::c0a8:0003",
                 "routerMac" : "00:00:00:00:00:02",
                 "isEdgeRouter" : true,
@@ -283,9 +283,9 @@
         "of:0000000000000004" : {
             "segmentrouting" : {
                 "name" : "s004",
-                "ipv4NodeSid" : 4,
+                "ipv4NodeSid" : 1004,
                 "ipv4Loopback" : "192.168.0.4",
-		"ipv6NodeSid" : 104,
+		"ipv6NodeSid" : 2004,
 		"ipv6Loopback" : "2000::c0a8:0004",        
                 "routerMac" : "00:00:00:00:00:04",
                 "isEdgeRouter" : true,
@@ -302,9 +302,9 @@
         "of:0000000000000005" : {
             "segmentrouting" : {
                 "name" : "s005",
-                "ipv4NodeSid" : 5,
+                "ipv4NodeSid" : 1005,
                 "ipv4Loopback" : "192.168.0.5",
-		"ipv6NodeSid" : 105,
+		"ipv6NodeSid" : 2005,
 		"ipv6Loopback" : "2000::c0a8:0005", 
                 "routerMac" : "00:00:00:00:00:04",
                 "isEdgeRouter" : true,
@@ -321,9 +321,9 @@
         "of:0000000000000101" : {
             "segmentrouting" : {
                 "name" : "s101",
-                "ipv4NodeSid" : 101,
+                "ipv4NodeSid" : 1101,
                 "ipv4Loopback" : "192.168.0.101",
-		"ipv6NodeSid" : 201,
+		"ipv6NodeSid" : 2101,
 		"ipv6Loopback" : "2000::c0a8:0101", 
                 "routerMac" : "00:00:00:00:01:01",
                 "isEdgeRouter" : false,
@@ -338,9 +338,9 @@
         "of:0000000000000102" : {
             "segmentrouting" : {
                 "name" : "s102",
-                "ipv4NodeSid" : 102,
+                "ipv4NodeSid" : 1102,
                 "ipv4Loopback" : "192.168.0.102",
-		"ipv6NodeSid" : 202,
+		"ipv6NodeSid" : 2102,
 		"ipv6Loopback" : "2000::c0a8:0202",
                 "routerMac" : "00:00:00:00:01:02",
                 "isEdgeRouter" : false,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=0_routers=0.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=0_routers=0.json
index 85e920f..1fd2664 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=0_routers=0.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=0_routers=0.json
@@ -193,7 +193,7 @@
         "of:0000000000000001" : {
             "segmentrouting" : {
                 "name" : "s001",
-                "ipv4NodeSid" : 1,
+                "ipv4NodeSid" : 1001,
                 "ipv4Loopback" : "192.168.0.1",
                 "routerMac" : "00:00:00:00:00:01",
                 "isEdgeRouter" : true,
@@ -208,7 +208,7 @@
         "of:0000000000000002" : {
             "segmentrouting" : {
                 "name" : "s002",
-                "ipv4NodeSid" : 2,
+                "ipv4NodeSid" : 1002,
                 "ipv4Loopback" : "192.168.0.2",
                 "routerMac" : "00:00:00:00:00:02",
                 "isEdgeRouter" : true,
@@ -225,7 +225,7 @@
         "of:0000000000000003" : {
             "segmentrouting" : {
                 "name" : "s003",
-                "ipv4NodeSid" : 3,
+                "ipv4NodeSid" : 1003,
                 "ipv4Loopback" : "192.168.0.3",
                 "routerMac" : "00:00:00:00:00:02",
                 "isEdgeRouter" : true,
@@ -242,7 +242,7 @@
         "of:0000000000000004" : {
             "segmentrouting" : {
                 "name" : "s004",
-                "ipv4NodeSid" : 4,
+                "ipv4NodeSid" : 1004,
                 "ipv4Loopback" : "192.168.0.4",
                 "routerMac" : "00:00:00:00:00:04",
                 "isEdgeRouter" : true,
@@ -259,7 +259,7 @@
         "of:0000000000000005" : {
             "segmentrouting" : {
                 "name" : "s005",
-                "ipv4NodeSid" : 5,
+                "ipv4NodeSid" : 1005,
                 "ipv4Loopback" : "192.168.0.5",
                 "routerMac" : "00:00:00:00:00:04",
                 "isEdgeRouter" : true,
@@ -276,7 +276,7 @@
         "of:0000000000000101" : {
             "segmentrouting" : {
                 "name" : "s101",
-                "ipv4NodeSid" : 101,
+                "ipv4NodeSid" : 1101,
                 "ipv4Loopback" : "192.168.0.101",
                 "routerMac" : "00:00:00:00:01:01",
                 "isEdgeRouter" : false,
@@ -291,7 +291,7 @@
         "of:0000000000000102" : {
             "segmentrouting" : {
                 "name" : "s102",
-                "ipv4NodeSid" : 102,
+                "ipv4NodeSid" : 1102,
                 "ipv4Loopback" : "192.168.0.102",
                 "routerMac" : "00:00:00:00:01:02",
                 "isEdgeRouter" : false,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=0.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=0.json
index 66e5103..e2e5e0e 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=0.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=0.json
@@ -133,7 +133,7 @@
         "of:0000000000000001" : {
             "segmentrouting" : {
                 "name" : "s001",
-                "ipv4NodeSid" : 1,
+                "ipv4NodeSid" : 1001,
                 "ipv4Loopback" : "192.168.0.1",
                 "routerMac" : "00:00:00:00:00:01",
                 "isEdgeRouter" : true,
@@ -148,7 +148,7 @@
         "of:0000000000000002" : {
             "segmentrouting" : {
                 "name" : "s002",
-                "ipv4NodeSid" : 2,
+                "ipv4NodeSid" : 1002,
                 "ipv4Loopback" : "192.168.0.2",
                 "routerMac" : "00:00:00:00:00:02",
                 "isEdgeRouter" : true,
@@ -165,7 +165,7 @@
         "of:0000000000000003" : {
             "segmentrouting" : {
                 "name" : "s003",
-                "ipv4NodeSid" : 3,
+                "ipv4NodeSid" : 1003,
                 "ipv4Loopback" : "192.168.0.3",
                 "routerMac" : "00:00:00:00:00:02",
                 "isEdgeRouter" : true,
@@ -182,7 +182,7 @@
         "of:0000000000000004" : {
             "segmentrouting" : {
                 "name" : "s004",
-                "ipv4NodeSid" : 4,
+                "ipv4NodeSid" : 1004,
                 "ipv4Loopback" : "192.168.0.4",
                 "routerMac" : "00:00:00:00:00:04",
                 "isEdgeRouter" : true,
@@ -199,7 +199,7 @@
         "of:0000000000000005" : {
             "segmentrouting" : {
                 "name" : "s005",
-                "ipv4NodeSid" : 5,
+                "ipv4NodeSid" : 1005,
                 "ipv4Loopback" : "192.168.0.5",
                 "routerMac" : "00:00:00:00:00:04",
                 "isEdgeRouter" : true,
@@ -216,7 +216,7 @@
         "of:0000000000000101" : {
             "segmentrouting" : {
                 "name" : "s101",
-                "ipv4NodeSid" : 101,
+                "ipv4NodeSid" : 1101,
                 "ipv4Loopback" : "192.168.0.101",
                 "routerMac" : "00:00:00:00:01:01",
                 "isEdgeRouter" : false,
@@ -231,7 +231,7 @@
         "of:0000000000000102" : {
             "segmentrouting" : {
                 "name" : "s102",
-                "ipv4NodeSid" : 102,
+                "ipv4NodeSid" : 1102,
                 "ipv4Loopback" : "192.168.0.102",
                 "routerMac" : "00:00:00:00:01:02",
                 "isEdgeRouter" : false,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.json
index 59284ba..1445c94 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.json
@@ -184,7 +184,7 @@
         "of:0000000000000001" : {
             "segmentrouting" : {
                 "name" : "s001",
-                "ipv4NodeSid" : 1,
+                "ipv4NodeSid" : 1001,
                 "ipv4Loopback" : "192.168.0.1",
                 "routerMac" : "00:00:00:00:00:01",
                 "isEdgeRouter" : true,
@@ -199,7 +199,7 @@
         "of:0000000000000002" : {
             "segmentrouting" : {
                 "name" : "s002",
-                "ipv4NodeSid" : 2,
+                "ipv4NodeSid" : 1002,
                 "ipv4Loopback" : "192.168.0.2",
                 "routerMac" : "00:00:00:00:00:02",
                 "isEdgeRouter" : true,
@@ -216,7 +216,7 @@
         "of:0000000000000003" : {
             "segmentrouting" : {
                 "name" : "s003",
-                "ipv4NodeSid" : 3,
+                "ipv4NodeSid" : 1003,
                 "ipv4Loopback" : "192.168.0.3",
                 "routerMac" : "00:00:00:00:00:02",
                 "isEdgeRouter" : true,
@@ -233,7 +233,7 @@
         "of:0000000000000004" : {
             "segmentrouting" : {
                 "name" : "s004",
-                "ipv4NodeSid" : 4,
+                "ipv4NodeSid" : 1004,
                 "ipv4Loopback" : "192.168.0.4",
                 "routerMac" : "00:00:00:00:00:04",
                 "isEdgeRouter" : true,
@@ -250,7 +250,7 @@
         "of:0000000000000005" : {
             "segmentrouting" : {
                 "name" : "s005",
-                "ipv4NodeSid" : 5,
+                "ipv4NodeSid" : 1005,
                 "ipv4Loopback" : "192.168.0.5",
                 "routerMac" : "00:00:00:00:00:04",
                 "isEdgeRouter" : true,
@@ -267,7 +267,7 @@
         "of:0000000000000101" : {
             "segmentrouting" : {
                 "name" : "s101",
-                "ipv4NodeSid" : 101,
+                "ipv4NodeSid" : 1101,
                 "ipv4Loopback" : "192.168.0.101",
                 "routerMac" : "00:00:00:00:01:01",
                 "isEdgeRouter" : false,
@@ -282,7 +282,7 @@
         "of:0000000000000102" : {
             "segmentrouting" : {
                 "name" : "s102",
-                "ipv4NodeSid" : 102,
+                "ipv4NodeSid" : 1102,
                 "ipv4Loopback" : "192.168.0.102",
                 "routerMac" : "00:00:00:00:01:02",
                 "isEdgeRouter" : false,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.json
index 59284ba..1445c94 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.json
@@ -184,7 +184,7 @@
         "of:0000000000000001" : {
             "segmentrouting" : {
                 "name" : "s001",
-                "ipv4NodeSid" : 1,
+                "ipv4NodeSid" : 1001,
                 "ipv4Loopback" : "192.168.0.1",
                 "routerMac" : "00:00:00:00:00:01",
                 "isEdgeRouter" : true,
@@ -199,7 +199,7 @@
         "of:0000000000000002" : {
             "segmentrouting" : {
                 "name" : "s002",
-                "ipv4NodeSid" : 2,
+                "ipv4NodeSid" : 1002,
                 "ipv4Loopback" : "192.168.0.2",
                 "routerMac" : "00:00:00:00:00:02",
                 "isEdgeRouter" : true,
@@ -216,7 +216,7 @@
         "of:0000000000000003" : {
             "segmentrouting" : {
                 "name" : "s003",
-                "ipv4NodeSid" : 3,
+                "ipv4NodeSid" : 1003,
                 "ipv4Loopback" : "192.168.0.3",
                 "routerMac" : "00:00:00:00:00:02",
                 "isEdgeRouter" : true,
@@ -233,7 +233,7 @@
         "of:0000000000000004" : {
             "segmentrouting" : {
                 "name" : "s004",
-                "ipv4NodeSid" : 4,
+                "ipv4NodeSid" : 1004,
                 "ipv4Loopback" : "192.168.0.4",
                 "routerMac" : "00:00:00:00:00:04",
                 "isEdgeRouter" : true,
@@ -250,7 +250,7 @@
         "of:0000000000000005" : {
             "segmentrouting" : {
                 "name" : "s005",
-                "ipv4NodeSid" : 5,
+                "ipv4NodeSid" : 1005,
                 "ipv4Loopback" : "192.168.0.5",
                 "routerMac" : "00:00:00:00:00:04",
                 "isEdgeRouter" : true,
@@ -267,7 +267,7 @@
         "of:0000000000000101" : {
             "segmentrouting" : {
                 "name" : "s101",
-                "ipv4NodeSid" : 101,
+                "ipv4NodeSid" : 1101,
                 "ipv4Loopback" : "192.168.0.101",
                 "routerMac" : "00:00:00:00:01:01",
                 "isEdgeRouter" : false,
@@ -282,7 +282,7 @@
         "of:0000000000000102" : {
             "segmentrouting" : {
                 "name" : "s102",
-                "ipv4NodeSid" : 102,
+                "ipv4NodeSid" : 1102,
                 "ipv4Loopback" : "192.168.0.102",
                 "routerMac" : "00:00:00:00:01:02",
                 "isEdgeRouter" : false,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.json
index 59284ba..1445c94 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.json
@@ -184,7 +184,7 @@
         "of:0000000000000001" : {
             "segmentrouting" : {
                 "name" : "s001",
-                "ipv4NodeSid" : 1,
+                "ipv4NodeSid" : 1001,
                 "ipv4Loopback" : "192.168.0.1",
                 "routerMac" : "00:00:00:00:00:01",
                 "isEdgeRouter" : true,
@@ -199,7 +199,7 @@
         "of:0000000000000002" : {
             "segmentrouting" : {
                 "name" : "s002",
-                "ipv4NodeSid" : 2,
+                "ipv4NodeSid" : 1002,
                 "ipv4Loopback" : "192.168.0.2",
                 "routerMac" : "00:00:00:00:00:02",
                 "isEdgeRouter" : true,
@@ -216,7 +216,7 @@
         "of:0000000000000003" : {
             "segmentrouting" : {
                 "name" : "s003",
-                "ipv4NodeSid" : 3,
+                "ipv4NodeSid" : 1003,
                 "ipv4Loopback" : "192.168.0.3",
                 "routerMac" : "00:00:00:00:00:02",
                 "isEdgeRouter" : true,
@@ -233,7 +233,7 @@
         "of:0000000000000004" : {
             "segmentrouting" : {
                 "name" : "s004",
-                "ipv4NodeSid" : 4,
+                "ipv4NodeSid" : 1004,
                 "ipv4Loopback" : "192.168.0.4",
                 "routerMac" : "00:00:00:00:00:04",
                 "isEdgeRouter" : true,
@@ -250,7 +250,7 @@
         "of:0000000000000005" : {
             "segmentrouting" : {
                 "name" : "s005",
-                "ipv4NodeSid" : 5,
+                "ipv4NodeSid" : 1005,
                 "ipv4Loopback" : "192.168.0.5",
                 "routerMac" : "00:00:00:00:00:04",
                 "isEdgeRouter" : true,
@@ -267,7 +267,7 @@
         "of:0000000000000101" : {
             "segmentrouting" : {
                 "name" : "s101",
-                "ipv4NodeSid" : 101,
+                "ipv4NodeSid" : 1101,
                 "ipv4Loopback" : "192.168.0.101",
                 "routerMac" : "00:00:00:00:01:01",
                 "isEdgeRouter" : false,
@@ -282,7 +282,7 @@
         "of:0000000000000102" : {
             "segmentrouting" : {
                 "name" : "s102",
-                "ipv4NodeSid" : 102,
+                "ipv4NodeSid" : 1102,
                 "ipv4Loopback" : "192.168.0.102",
                 "routerMac" : "00:00:00:00:01:02",
                 "isEdgeRouter" : false,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=0.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=0.json
index 4566a0a..3d2a4d3 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=0.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=0.json
@@ -297,8 +297,8 @@
         "of:0000000000000001" : {
             "segmentrouting" : {
                 "name" : "s001",
-                "ipv4NodeSid" : 1,
-		"ipv6NodeSid" : 101,
+                "ipv4NodeSid" : 1001,
+		"ipv6NodeSid" : 2001,
 		"ipv6Loopback" : "2000::c0a8:0001",
                 "ipv4Loopback" : "192.168.0.1",
                 "routerMac" : "00:00:00:00:00:01",
@@ -314,9 +314,9 @@
         "of:0000000000000002" : {
             "segmentrouting" : {
                 "name" : "s002",
-                "ipv4NodeSid" : 2,
+                "ipv4NodeSid" : 1002,
                 "ipv4Loopback" : "192.168.0.2",
-		"ipv6NodeSid" : 102,
+		"ipv6NodeSid" : 2002,
 		"ipv6Loopback" : "2000::c0a8:0002",
                 "routerMac" : "00:00:00:00:00:02",
                 "isEdgeRouter" : true,
@@ -333,9 +333,9 @@
         "of:0000000000000003" : {
             "segmentrouting" : {
                 "name" : "s003",
-                "ipv4NodeSid" : 3,
+                "ipv4NodeSid" : 1003,
                 "ipv4Loopback" : "192.168.0.3",
-        	"ipv6NodeSid" : 103,
+        	"ipv6NodeSid" : 2003,
 		"ipv6Loopback" : "2000::c0a8:0003",
                 "routerMac" : "00:00:00:00:00:02",
                 "isEdgeRouter" : true,
@@ -352,9 +352,9 @@
         "of:0000000000000004" : {
             "segmentrouting" : {
                 "name" : "s004",
-                "ipv4NodeSid" : 4,
+                "ipv4NodeSid" : 1004,
                 "ipv4Loopback" : "192.168.0.4",
-		"ipv6NodeSid" : 104,
+		"ipv6NodeSid" : 2004,
 		"ipv6Loopback" : "2000::c0a8:0004",        
                 "routerMac" : "00:00:00:00:00:04",
                 "isEdgeRouter" : true,
@@ -371,9 +371,9 @@
         "of:0000000000000005" : {
             "segmentrouting" : {
                 "name" : "s005",
-                "ipv4NodeSid" : 5,
+                "ipv4NodeSid" : 1005,
                 "ipv4Loopback" : "192.168.0.5",
-		"ipv6NodeSid" : 105,
+		"ipv6NodeSid" : 2005,
 		"ipv6Loopback" : "2000::c0a8:0005", 
                 "routerMac" : "00:00:00:00:00:04",
                 "isEdgeRouter" : true,
@@ -390,9 +390,9 @@
         "of:0000000000000101" : {
             "segmentrouting" : {
                 "name" : "s101",
-                "ipv4NodeSid" : 101,
+                "ipv4NodeSid" : 1101,
                 "ipv4Loopback" : "192.168.0.101",
-		"ipv6NodeSid" : 201,
+		"ipv6NodeSid" : 2101,
 		"ipv6Loopback" : "2000::c0a8:0101", 
                 "routerMac" : "00:00:00:00:01:01",
                 "isEdgeRouter" : false,
@@ -407,9 +407,9 @@
         "of:0000000000000102" : {
             "segmentrouting" : {
                 "name" : "s102",
-                "ipv4NodeSid" : 102,
+                "ipv4NodeSid" : 1102,
                 "ipv4Loopback" : "192.168.0.102",
-		"ipv6NodeSid" : 202,
+		"ipv6NodeSid" : 2102,
 		"ipv6Loopback" : "2000::c0a8:0202",
                 "routerMac" : "00:00:00:00:01:02",
                 "isEdgeRouter" : false,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.json
index 7294d8b..a6555d7 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.json
@@ -348,8 +348,8 @@
         "of:0000000000000001" : {
             "segmentrouting" : {
                 "name" : "s001",
-                "ipv4NodeSid" : 1,
-		"ipv6NodeSid" : 101,
+                "ipv4NodeSid" : 1001,
+		"ipv6NodeSid" : 2001,
 		"ipv6Loopback" : "2000::c0a8:0001",
                 "ipv4Loopback" : "192.168.0.1",
                 "routerMac" : "00:00:00:00:00:01",
@@ -365,9 +365,9 @@
         "of:0000000000000002" : {
             "segmentrouting" : {
                 "name" : "s002",
-                "ipv4NodeSid" : 2,
+                "ipv4NodeSid" : 1002,
                 "ipv4Loopback" : "192.168.0.2",
-		"ipv6NodeSid" : 102,
+		"ipv6NodeSid" : 2002,
 		"ipv6Loopback" : "2000::c0a8:0002",
                 "routerMac" : "00:00:00:00:00:02",
                 "isEdgeRouter" : true,
@@ -384,9 +384,9 @@
         "of:0000000000000003" : {
             "segmentrouting" : {
                 "name" : "s003",
-                "ipv4NodeSid" : 3,
+                "ipv4NodeSid" : 1003,
                 "ipv4Loopback" : "192.168.0.3",
-        	"ipv6NodeSid" : 103,
+        	"ipv6NodeSid" : 2003,
 		"ipv6Loopback" : "2000::c0a8:0003",
                 "routerMac" : "00:00:00:00:00:02",
                 "isEdgeRouter" : true,
@@ -403,9 +403,9 @@
         "of:0000000000000004" : {
             "segmentrouting" : {
                 "name" : "s004",
-                "ipv4NodeSid" : 4,
+                "ipv4NodeSid" : 1004,
                 "ipv4Loopback" : "192.168.0.4",
-		"ipv6NodeSid" : 104,
+		"ipv6NodeSid" : 2004,
 		"ipv6Loopback" : "2000::c0a8:0004",        
                 "routerMac" : "00:00:00:00:00:04",
                 "isEdgeRouter" : true,
@@ -422,9 +422,9 @@
         "of:0000000000000005" : {
             "segmentrouting" : {
                 "name" : "s005",
-                "ipv4NodeSid" : 5,
+                "ipv4NodeSid" : 1005,
                 "ipv4Loopback" : "192.168.0.5",
-		"ipv6NodeSid" : 105,
+		"ipv6NodeSid" : 2005,
 		"ipv6Loopback" : "2000::c0a8:0005", 
                 "routerMac" : "00:00:00:00:00:04",
                 "isEdgeRouter" : true,
@@ -441,9 +441,9 @@
         "of:0000000000000101" : {
             "segmentrouting" : {
                 "name" : "s101",
-                "ipv4NodeSid" : 101,
+                "ipv4NodeSid" : 1101,
                 "ipv4Loopback" : "192.168.0.101",
-		"ipv6NodeSid" : 201,
+		"ipv6NodeSid" : 2101,
 		"ipv6Loopback" : "2000::c0a8:0101", 
                 "routerMac" : "00:00:00:00:01:01",
                 "isEdgeRouter" : false,
@@ -458,9 +458,9 @@
         "of:0000000000000102" : {
             "segmentrouting" : {
                 "name" : "s102",
-                "ipv4NodeSid" : 102,
+                "ipv4NodeSid" : 1102,
                 "ipv4Loopback" : "192.168.0.102",
-		"ipv6NodeSid" : 202,
+		"ipv6NodeSid" : 2102,
 		"ipv6Loopback" : "2000::c0a8:0202",
                 "routerMac" : "00:00:00:00:01:02",
                 "isEdgeRouter" : false,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.json
index 7294d8b..a6555d7 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.json
@@ -348,8 +348,8 @@
         "of:0000000000000001" : {
             "segmentrouting" : {
                 "name" : "s001",
-                "ipv4NodeSid" : 1,
-		"ipv6NodeSid" : 101,
+                "ipv4NodeSid" : 1001,
+		"ipv6NodeSid" : 2001,
 		"ipv6Loopback" : "2000::c0a8:0001",
                 "ipv4Loopback" : "192.168.0.1",
                 "routerMac" : "00:00:00:00:00:01",
@@ -365,9 +365,9 @@
         "of:0000000000000002" : {
             "segmentrouting" : {
                 "name" : "s002",
-                "ipv4NodeSid" : 2,
+                "ipv4NodeSid" : 1002,
                 "ipv4Loopback" : "192.168.0.2",
-		"ipv6NodeSid" : 102,
+		"ipv6NodeSid" : 2002,
 		"ipv6Loopback" : "2000::c0a8:0002",
                 "routerMac" : "00:00:00:00:00:02",
                 "isEdgeRouter" : true,
@@ -384,9 +384,9 @@
         "of:0000000000000003" : {
             "segmentrouting" : {
                 "name" : "s003",
-                "ipv4NodeSid" : 3,
+                "ipv4NodeSid" : 1003,
                 "ipv4Loopback" : "192.168.0.3",
-        	"ipv6NodeSid" : 103,
+        	"ipv6NodeSid" : 2003,
 		"ipv6Loopback" : "2000::c0a8:0003",
                 "routerMac" : "00:00:00:00:00:02",
                 "isEdgeRouter" : true,
@@ -403,9 +403,9 @@
         "of:0000000000000004" : {
             "segmentrouting" : {
                 "name" : "s004",
-                "ipv4NodeSid" : 4,
+                "ipv4NodeSid" : 1004,
                 "ipv4Loopback" : "192.168.0.4",
-		"ipv6NodeSid" : 104,
+		"ipv6NodeSid" : 2004,
 		"ipv6Loopback" : "2000::c0a8:0004",        
                 "routerMac" : "00:00:00:00:00:04",
                 "isEdgeRouter" : true,
@@ -422,9 +422,9 @@
         "of:0000000000000005" : {
             "segmentrouting" : {
                 "name" : "s005",
-                "ipv4NodeSid" : 5,
+                "ipv4NodeSid" : 1005,
                 "ipv4Loopback" : "192.168.0.5",
-		"ipv6NodeSid" : 105,
+		"ipv6NodeSid" : 2005,
 		"ipv6Loopback" : "2000::c0a8:0005", 
                 "routerMac" : "00:00:00:00:00:04",
                 "isEdgeRouter" : true,
@@ -441,9 +441,9 @@
         "of:0000000000000101" : {
             "segmentrouting" : {
                 "name" : "s101",
-                "ipv4NodeSid" : 101,
+                "ipv4NodeSid" : 1101,
                 "ipv4Loopback" : "192.168.0.101",
-		"ipv6NodeSid" : 201,
+		"ipv6NodeSid" : 2101,
 		"ipv6Loopback" : "2000::c0a8:0101", 
                 "routerMac" : "00:00:00:00:01:01",
                 "isEdgeRouter" : false,
@@ -458,9 +458,9 @@
         "of:0000000000000102" : {
             "segmentrouting" : {
                 "name" : "s102",
-                "ipv4NodeSid" : 102,
+                "ipv4NodeSid" : 1102,
                 "ipv4Loopback" : "192.168.0.102",
-		"ipv6NodeSid" : 202,
+		"ipv6NodeSid" : 2102,
 		"ipv6Loopback" : "2000::c0a8:0202",
                 "routerMac" : "00:00:00:00:01:02",
                 "isEdgeRouter" : false,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.json
index 7294d8b..a6555d7 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.json
@@ -348,8 +348,8 @@
         "of:0000000000000001" : {
             "segmentrouting" : {
                 "name" : "s001",
-                "ipv4NodeSid" : 1,
-		"ipv6NodeSid" : 101,
+                "ipv4NodeSid" : 1001,
+		"ipv6NodeSid" : 2001,
 		"ipv6Loopback" : "2000::c0a8:0001",
                 "ipv4Loopback" : "192.168.0.1",
                 "routerMac" : "00:00:00:00:00:01",
@@ -365,9 +365,9 @@
         "of:0000000000000002" : {
             "segmentrouting" : {
                 "name" : "s002",
-                "ipv4NodeSid" : 2,
+                "ipv4NodeSid" : 1002,
                 "ipv4Loopback" : "192.168.0.2",
-		"ipv6NodeSid" : 102,
+		"ipv6NodeSid" : 2002,
 		"ipv6Loopback" : "2000::c0a8:0002",
                 "routerMac" : "00:00:00:00:00:02",
                 "isEdgeRouter" : true,
@@ -384,9 +384,9 @@
         "of:0000000000000003" : {
             "segmentrouting" : {
                 "name" : "s003",
-                "ipv4NodeSid" : 3,
+                "ipv4NodeSid" : 1003,
                 "ipv4Loopback" : "192.168.0.3",
-        	"ipv6NodeSid" : 103,
+        	"ipv6NodeSid" : 2003,
 		"ipv6Loopback" : "2000::c0a8:0003",
                 "routerMac" : "00:00:00:00:00:02",
                 "isEdgeRouter" : true,
@@ -403,9 +403,9 @@
         "of:0000000000000004" : {
             "segmentrouting" : {
                 "name" : "s004",
-                "ipv4NodeSid" : 4,
+                "ipv4NodeSid" : 1004,
                 "ipv4Loopback" : "192.168.0.4",
-		"ipv6NodeSid" : 104,
+		"ipv6NodeSid" : 2004,
 		"ipv6Loopback" : "2000::c0a8:0004",        
                 "routerMac" : "00:00:00:00:00:04",
                 "isEdgeRouter" : true,
@@ -422,9 +422,9 @@
         "of:0000000000000005" : {
             "segmentrouting" : {
                 "name" : "s005",
-                "ipv4NodeSid" : 5,
+                "ipv4NodeSid" : 1005,
                 "ipv4Loopback" : "192.168.0.5",
-		"ipv6NodeSid" : 105,
+		"ipv6NodeSid" : 2005,
 		"ipv6Loopback" : "2000::c0a8:0005", 
                 "routerMac" : "00:00:00:00:00:04",
                 "isEdgeRouter" : true,
@@ -441,9 +441,9 @@
         "of:0000000000000101" : {
             "segmentrouting" : {
                 "name" : "s101",
-                "ipv4NodeSid" : 101,
+                "ipv4NodeSid" : 1101,
                 "ipv4Loopback" : "192.168.0.101",
-		"ipv6NodeSid" : 201,
+		"ipv6NodeSid" : 2101,
 		"ipv6Loopback" : "2000::c0a8:0101", 
                 "routerMac" : "00:00:00:00:01:01",
                 "isEdgeRouter" : false,
@@ -458,9 +458,9 @@
         "of:0000000000000102" : {
             "segmentrouting" : {
                 "name" : "s102",
-                "ipv4NodeSid" : 102,
+                "ipv4NodeSid" : 1102,
                 "ipv4Loopback" : "192.168.0.102",
-		"ipv6NodeSid" : 202,
+		"ipv6NodeSid" : 2102,
 		"ipv6Loopback" : "2000::c0a8:0202",
                 "routerMac" : "00:00:00:00:01:02",
                 "isEdgeRouter" : false,