diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE06.json.tucson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE06.json.tucson
index 093b740..11dab81 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE06.json.tucson
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE06.json.tucson
@@ -1,6 +1,6 @@
 {
 "ports":{
-        "device:leaf1/56":{
+        "device:leaf1/9":{
             "interfaces":[
                 {
                     "ips":[
@@ -11,7 +11,7 @@
                 }
             ]
         },
-        "device:leaf2/56":{
+        "device:leaf2/9":{
             "interfaces":[
                 {
                     "ips":[
@@ -22,7 +22,7 @@
                 }
             ]
         },
-        "device:leaf1/40": {
+        "device:leaf1/11": {
             "interfaces": [
               {
                 "ips": [
@@ -33,7 +33,7 @@
               }
             ]
           },
-          "device:leaf2/40": {
+          "device:leaf2/11": {
             "interfaces": [
               {
                 "ips": [
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE16.json.tucson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE16.json.tucson
index 06c8e7f..c3f743e 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE16.json.tucson
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE16.json.tucson
@@ -1,6 +1,6 @@
 {
 "ports":{
-        "device:leaf1/56":{
+        "device:leaf1/9":{
             "interfaces":[
                 {
                     "ips":[
@@ -11,7 +11,7 @@
                 }
             ]
         },
-        "device:leaf2/56":{
+        "device:leaf2/9":{
             "interfaces":[
                 {
                     "ips":[
@@ -22,7 +22,7 @@
                 }
             ]
         },
-        "device:leaf1/40": {
+        "device:leaf1/11": {
             "interfaces": [
               {
                 "ips": [
@@ -33,7 +33,7 @@
               }
             ]
           },
-          "device:leaf2/40": {
+          "device:leaf2/11": {
             "interfaces": [
               {
                 "ips": [
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE26.json.tucson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE26.json.tucson
index b3cd310..4981a51 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE26.json.tucson
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE26.json.tucson
@@ -1,6 +1,6 @@
 {
 "ports":{
-        "device:leaf1/56":{
+        "device:leaf1/9":{
             "interfaces":[
                 {
                     "ips":[
@@ -12,7 +12,7 @@
                 }
             ]
         },
-        "device:leaf2/56":{
+        "device:leaf2/9":{
             "interfaces":[
                 {
                     "ips":[
@@ -24,7 +24,7 @@
                 }
             ]
         },
-        "device:leaf1/40": {
+        "device:leaf1/11": {
             "interfaces": [
               {
                 "ips": [
@@ -36,7 +36,7 @@
               }
             ]
           },
-          "device:leaf2/40": {
+          "device:leaf2/11": {
             "interfaces": [
               {
                 "ips": [
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE36.json.tucson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE36.json.tucson
index 25059e5..4a5ab72 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE36.json.tucson
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE36.json.tucson
@@ -1,6 +1,6 @@
 {
 "ports":{
-        "device:leaf1/56":{
+        "device:leaf1/9":{
             "interfaces":[
                 {
                     "ips":[
@@ -12,7 +12,7 @@
                 }
             ]
         },
-        "device:leaf2/56":{
+        "device:leaf2/9":{
             "interfaces":[
                 {
                     "ips":[
@@ -24,7 +24,7 @@
                 }
             ]
         },
-        "device:leaf1/40": {
+        "device:leaf1/11": {
             "interfaces": [
               {
                 "ips": [
@@ -35,7 +35,7 @@
               }
             ]
           },
-          "device:leaf2/40": {
+          "device:leaf2/11": {
             "interfaces": [
               {
                 "ips": [
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE46.json.tucson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE46.json.tucson
index d2b7ed7..4149d79 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE46.json.tucson
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE46.json.tucson
@@ -1,6 +1,6 @@
 {
 "ports":{
-        "device:leaf1/56":{
+        "device:leaf1/9":{
             "interfaces":[
                 {
                     "ips":[
@@ -11,7 +11,7 @@
                 }
             ]
         },
-        "device:leaf2/56":{
+        "device:leaf2/9":{
             "interfaces":[
                 {
                     "ips":[
@@ -22,7 +22,7 @@
                 }
             ]
         },
-        "device:leaf1/40": {
+        "device:leaf1/11": {
             "interfaces": [
               {
                 "ips": [
@@ -33,7 +33,7 @@
               }
             ]
           },
-          "device:leaf2/40": {
+          "device:leaf2/11": {
             "interfaces": [
               {
                 "ips": [
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE56.json.tucson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE56.json.tucson
index d1e47c8..5f3408c 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE56.json.tucson
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE56.json.tucson
@@ -1,6 +1,6 @@
 {
 "ports":{
-        "device:leaf1/56":{
+        "device:leaf1/9":{
             "interfaces":[
                 {
                     "ips":[
@@ -11,7 +11,7 @@
                 }
             ]
         },
-        "device:leaf2/56":{
+        "device:leaf2/9":{
             "interfaces":[
                 {
                     "ips":[
@@ -22,7 +22,7 @@
                 }
             ]
         },
-        "device:leaf1/40": {
+        "device:leaf1/11": {
             "interfaces": [
               {
                 "ips": [
@@ -33,7 +33,7 @@
               }
             ]
           },
-          "device:leaf2/40": {
+          "device:leaf2/11": {
             "interfaces": [
               {
                 "ips": [
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE66.json.tucson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE66.json.tucson
index 615d33b..002d9db 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE66.json.tucson
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE66.json.tucson
@@ -1,6 +1,6 @@
 {
 "ports":{
-        "device:leaf1/56":{
+        "device:leaf1/9":{
             "interfaces":[
                 {
                     "ips":[
@@ -11,7 +11,7 @@
                 }
             ]
         },
-        "device:leaf2/56":{
+        "device:leaf2/9":{
             "interfaces":[
                 {
                     "ips":[
@@ -22,7 +22,7 @@
                 }
             ]
         },
-        "device:leaf1/40": {
+        "device:leaf1/11": {
             "interfaces": [
               {
                 "ips": [
@@ -33,7 +33,7 @@
               }
             ]
           },
-          "device:leaf2/40": {
+          "device:leaf2/11": {
             "interfaces": [
               {
                 "ips": [
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE76.json.tucson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE76.json.tucson
index de1aa12..19088e5 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE76.json.tucson
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE76.json.tucson
@@ -1,6 +1,6 @@
 {
 "ports":{
-        "device:leaf1/56":{
+        "device:leaf1/9":{
             "interfaces":[
                 {
                     "ips":[
@@ -11,7 +11,7 @@
                 }
             ]
         },
-        "device:leaf2/56":{
+        "device:leaf2/9":{
             "interfaces":[
                 {
                     "ips":[
@@ -22,7 +22,7 @@
                 }
             ]
         },
-        "device:leaf1/40": {
+        "device:leaf1/11": {
             "interfaces": [
               {
                 "ips": [
@@ -33,7 +33,7 @@
               }
             ]
           },
-          "device:leaf2/40": {
+          "device:leaf2/11": {
             "interfaces": [
               {
                 "ips": [
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE06.cfg b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE06.cfg
index a10a0ca..e09e1be 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE06.cfg
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE06.cfg
@@ -1,6 +1,6 @@
 {
 "ports":{
-        "device:leaf1/56":{
+        "device:leaf1/9":{
             "interfaces":[
                 {
                     "ips":[
@@ -11,7 +11,7 @@
                 }
             ]
         },
-        "device:leaf2/56":{
+        "device:leaf2/9":{
             "interfaces":[
                 {
                     "ips":[
@@ -22,7 +22,7 @@
                 }
             ]
         },
-        "device:leaf1/40": {
+        "device:leaf1/11": {
             "interfaces": [
               {
                 "ips": [
@@ -33,7 +33,7 @@
               }
             ]
           },
-          "device:leaf2/40": {
+          "device:leaf2/11": {
             "interfaces": [
               {
                 "ips": [
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE09.cfg b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE09.cfg
index 4cb68f0..fba1799 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE09.cfg
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE09.cfg
@@ -1,6 +1,6 @@
 {
 "ports":{
-        "device:leaf1/56":{
+        "device:leaf1/9":{
             "interfaces":[
                 {
                     "ips":[
@@ -10,7 +10,7 @@
                 }
             ]
         },
-        "device:leaf2/56":{
+        "device:leaf2/9":{
             "interfaces":[
                 {
                     "ips":[
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE19.cfg b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE19.cfg
index d5c73e0..21a6a78 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE19.cfg
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE19.cfg
@@ -1,6 +1,6 @@
 {
 "ports":{
-        "device:leaf1/56":{
+        "device:leaf1/9":{
             "interfaces":[
                 {
                     "ips":[
@@ -10,7 +10,7 @@
                 }
             ]
         },
-        "device:leaf2/56":{
+        "device:leaf2/9":{
             "interfaces":[
                 {
                     "ips":[
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE29.cfg b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE29.cfg
index b09226c..6731483 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE29.cfg
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE29.cfg
@@ -1,6 +1,6 @@
 {
 "ports":{
-        "device:leaf1/56":{
+        "device:leaf1/9":{
             "interfaces":[
                 {
                     "ips":[
@@ -11,7 +11,7 @@
                 }
             ]
         },
-        "device:leaf2/56":{
+        "device:leaf2/9":{
             "interfaces":[
                 {
                     "ips":[
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE39.cfg b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE39.cfg
index ea119ca..bdafbf0 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE39.cfg
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE39.cfg
@@ -1,6 +1,6 @@
 {
 "ports":{
-        "device:leaf1/56":{
+        "device:leaf1/9":{
             "interfaces":[
                 {
                     "ips":[
@@ -13,7 +13,7 @@
                 }
             ]
         },
-        "device:leaf2/56":{
+        "device:leaf2/9":{
             "interfaces":[
                 {
                     "ips":[
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE49.cfg b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE49.cfg
index fee5e68..49df2d6 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE49.cfg
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE49.cfg
@@ -1,6 +1,6 @@
 {
 "ports":{
-        "device:leaf1/56":{
+        "device:leaf1/9":{
             "interfaces":[
                 {
                     "ips":[
@@ -10,7 +10,7 @@
                 }
             ]
         },
-         "device:leaf1/56":
+         "device:leaf1/9":
 {           "interfaces":[
                 {
                     "ips":[
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE59.cfg b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE59.cfg
index 7dfc797..60601d8 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE59.cfg
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE59.cfg
@@ -1,6 +1,6 @@
 {
 "ports":{
-        "device:leaf1/56":{
+        "device:leaf1/9":{
             "interfaces":[
                 {
                     "ips":[
@@ -10,7 +10,7 @@
                 }
             ]
         },
-        "device:leaf2/56":{
+        "device:leaf2/9":{
             "interfaces":[
                 {
                     "ips":[
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE69.cfg b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE69.cfg
index 7fe7a67..ea6c804 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE69.cfg
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE69.cfg
@@ -1,6 +1,6 @@
 {
 "ports":{
-        "device:leaf1/56":{
+        "device:leaf1/9":{
             "interfaces":[
                 {
                     "ips":[
@@ -10,7 +10,7 @@
                 }
             ]
         },
-        "device:leaf2/56":{
+        "device:leaf2/9":{
             "interfaces":[
                 {
                     "ips":[
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE79.cfg b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE79.cfg
index d3a7412..d537799 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE79.cfg
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE79.cfg
@@ -1,6 +1,6 @@
 {
 "ports":{
-        "device:leaf1/56":{
+        "device:leaf1/9":{
             "interfaces":[
                 {
                     "ips":[
@@ -10,7 +10,7 @@
                 }
             ]
         },
-        "device:leaf2/56":{
+        "device:leaf2/9":{
             "interfaces":[
                 {
                     "ips":[