diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params.tucson b/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params.hudson
similarity index 91%
rename from TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params.tucson
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params.hudson
index 5ed9047..046825b 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params.tucson
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params.hudson
@@ -2,7 +2,7 @@
     <testcases>6,16,26,36,46,56,66,76</testcases>
 
     <GRAPH>
-        <nodeCluster>pairedleaves</nodeCluster>
+        <nodeCluster>ci1-sdfabric</nodeCluster>
         <builds>20</builds>
         <jobName>SRBridging-tofino</jobName>
         <branch>master</branch>
@@ -24,7 +24,7 @@
         <lib>routinglib.py,trellislib.py,stratum.py</lib>
     </DEPENDENCY>
 
-    <jsonFileSuffix>.tucson</jsonFileSuffix>
+    <jsonFileSuffix>.hudson</jsonFileSuffix>
 
     <persistent_setup>True</persistent_setup>
 
@@ -65,8 +65,8 @@
     </CTRL>
 
     <timers>
-        <LinkDiscovery>12</LinkDiscovery>
-        <SwitchDiscovery>12</SwitchDiscovery>
+        <LinkDiscovery>1</LinkDiscovery>
+        <SwitchDiscovery>2</SwitchDiscovery>
         <TrafficDiscovery>10</TrafficDiscovery>
     </timers>
 
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params.tucson.debug b/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params.tucson.debug
deleted file mode 100644
index ceee8a5..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params.tucson.debug
+++ /dev/null
@@ -1,89 +0,0 @@
-<PARAMS>
-    <testcases>6,16,26,36,46,56,66,76</testcases>
-
-    <GRAPH>
-        <nodeCluster>pairedleaves</nodeCluster>
-        <builds>20</builds>
-        <jobName>SRBridging-tofino</jobName>
-        <branch>master</branch>
-    </GRAPH>
-
-    <SCALE>
-        <size>3</size>
-        <max>3</max>
-    </SCALE>
-
-    <DEPENDENCY>
-        <useCommonConf>False</useCommonConf>
-        <useCommonTopo>True</useCommonTopo>
-        <useBmv2>True</useBmv2>
-        <bmv2SwitchType>stratum</bmv2SwitchType>
-        <switchPrefix></switchPrefix>
-        <stratumRoot>~/stratum</stratumRoot>
-        <topology>trellis_fabric.py</topology>
-        <lib>routinglib.py,trellislib.py,stratum.py</lib>
-    </DEPENDENCY>
-
-    <jsonFileSuffix>.tucson</jsonFileSuffix>
-
-    <persistent_setup>True</persistent_setup>
-
-    <kubernetes>
-        <appName>onos-classic</appName>
-        <namespace>tost</namespace>
-    </kubernetes>
-    <use_stern>True</use_stern>
-
-    <ENV>
-        <cellName>productionCell</cellName>
-        <cellApps>drivers,fpm,lldpprovider,hostprovider,netcfghostprovider,drivers.bmv2,pipelines.fabric,org.stratumproject.fabric-tna,drivers.barefoot,segmentrouting,t3</cellApps>
-    </ENV>
-
-    <EXTERNAL_APPS>
-    </EXTERNAL_APPS>
-
-    <ONOS_Configuration>
-        <org.onosproject.grpc.ctl.GrpcChannelControllerImpl>
-            <enableMessageLog>true</enableMessageLog>
-        </org.onosproject.grpc.ctl.GrpcChannelControllerImpl>
-    </ONOS_Configuration>
-
-    <ONOS_Logging>
-        <org.onosproject.segmentrouting>DEBUG</org.onosproject.segmentrouting>
-        <org.onosproject.net.flowobjective.impl>DEBUG</org.onosproject.net.flowobjective.impl>
-        <org.stratumproject.fabric.tna>DEBUG</org.stratumproject.fabric.tna>
-    </ONOS_Logging>
-    <ONOS_Logging_Reset>
-        <org.onosproject.segmentrouting>DEBUG</org.onosproject.segmentrouting>
-        <org.onosproject.net.flowobjective.impl>INFO</org.onosproject.net.flowobjective.impl>
-        <org.stratumproject.fabric.tna>INFO</org.stratumproject.fabric.tna>
-    </ONOS_Logging_Reset>
-
-    <GIT>
-        <pull>False</pull>
-        <branch>master</branch>
-    </GIT>
-
-    <CTRL>
-        <port>6653</port>
-    </CTRL>
-
-    <timers>
-        <LinkDiscovery>12</LinkDiscovery>
-        <SwitchDiscovery>12</SwitchDiscovery>
-        <TrafficDiscovery>10</TrafficDiscovery>
-    </timers>
-
-    <SLEEP>
-        <startup>10</startup>
-    </SLEEP>
-
-    <TOPO>
-        <switchNum>2</switchNum>
-        <linkNum>2</linkNum>
-    </TOPO>
-
-    <ALARM>
-        <minPassPercent>100</minPassPercent>
-    </ALARM>
-</PARAMS>
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.py b/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.py
index 1606e1b..697a3ee 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.py
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.py
@@ -1248,7 +1248,8 @@
 
     def CASE56( self, main ):
         """
-        Tests connectivity between two untagged hosts with different vlan id
+        Tests connectivity between two untagged hosts with different vlan id,
+        hosts should not be able to ping each other.
         (Ports are configured as vlan-untagged 10 and 20, respectively)
 
         Sets up 3 ONOS instances
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.topo.0x2.tucson b/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.topo.0x2.hudson
similarity index 74%
rename from TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.topo.0x2.tucson
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.topo.0x2.hudson
index de46ab4..87c47a2 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.topo.0x2.tucson
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.topo.0x2.hudson
@@ -8,7 +8,7 @@
             <connect_order>1</connect_order>
             <home>~/onos</home>   # defines where onos home is on the build machine. Defaults to "~/onos/" if empty.
             <COMPONENTS>
-                <kubeConfig>~/.kube/dev-pairedleaves-tucson</kubeConfig>  # If set, will attempt to use this file for setting up port-forwarding
+                <kubeConfig>~/.kube/01-ci1-sdfabric.yaml</kubeConfig>  # If set, will attempt to use this file for setting up port-forwarding
                 <useDocker>True</useDocker>  # Whether to use docker for ONOS nodes
                 <docker_prompt>\$</docker_prompt>
                 <cluster_name></cluster_name>  # Used as a prefix for cluster components. Defaults to 'ONOS'
@@ -27,7 +27,7 @@
         </ONOScell>
 
         <Leaf1>
-            <host>10.76.28.70</host>
+            <host>10.70.10.94</host>
             <user>root</user>
             <password>onl</password>
             <type>StratumOSSwitchDriver</type>
@@ -42,7 +42,7 @@
         </Leaf1>
 
         <Leaf2>
-            <host>10.76.28.71</host>
+            <host>10.70.10.95</host>
             <user>root</user>
             <password>onl</password>
             <type>StratumOSSwitchDriver</type>
@@ -56,9 +56,9 @@
             </COMPONENTS>
         </Leaf2>
 
-        <Compute1>
-            <host>10.76.28.74</host>
-            <user>jenkins</user>
+        <Host1>
+            <host>10.70.10.105</host>
+            <user>sdfab</user>
             <password></password>
             <type>HostDriver</type>
             <connect_order>6</connect_order>
@@ -67,27 +67,19 @@
                 <mac></mac>
                 <inband>false</inband>
                 <dhcp>False</dhcp>
-                <ip>10.32.11.2</ip>
+                <ip>10.32.11.1</ip>
                 <shortName>h1</shortName>
                 <port1></port1>
                 <link1></link1>
-                <ifaceName>pairbond</ifaceName>
+                <ifaceName>bond0</ifaceName>
                 <scapy_path>/usr/bin/scapy</scapy_path>
-                <routes>
-                    <route1>
-                        <network>10.32.11.126</network>
-                        <netmask>25</netmask>
-                        <gw>10.32.11.126</gw>
-                        <interface>pairbond</interface>
-                    </route1>
-                </routes>
                 <sudo_required>true</sudo_required>
             </COMPONENTS>
-        </Compute1>
+        </Host1>
 
-        <Compute2>
-            <host>10.76.28.72</host>
-            <user>jenkins</user>
+        <Host2>
+            <host>10.70.10.106</host>
+            <user>sdfab</user>
             <password></password>
             <type>HostDriver</type>
             <connect_order>7</connect_order>
@@ -96,27 +88,19 @@
                 <mac></mac>
                 <inband>false</inband>
                 <dhcp>False</dhcp>
-                <ip>10.32.11.3</ip>
+                <ip>10.32.11.2</ip>
                 <shortName>h2</shortName>
                 <port1></port1>
                 <link1></link1>
-                <ifaceName>pairbond</ifaceName>
+                <ifaceName>bond0</ifaceName>
                 <scapy_path>/usr/bin/scapy</scapy_path>
-                <routes>
-                    <route1>
-                        <network>10.32.11.126</network>
-                        <netmask>25</netmask>
-                        <gw>10.32.11.126</gw>
-                        <interface>pairbond</interface>
-                    </route1>
-                </routes>
                 <sudo_required>true</sudo_required>
             </COMPONENTS>
-        </Compute2>
+        </Host2>
 
-        <Compute3>
-            <host>10.76.28.68</host>
-            <user>jenkins</user>
+        <Host3>
+            <host>10.70.10.107</host>
+            <user>sdfab</user>
             <password></password>
             <type>HostDriver</type>
             <connect_order>8</connect_order>
@@ -125,25 +109,17 @@
                 <mac></mac>
                 <inband>false</inband>
                 <dhcp>False</dhcp>
-                <ip>10.32.11.194</ip>
+                <ip>10.32.11.3</ip>
                 <shortName>h3</shortName>
                 <port1></port1>
                 <link1></link1>
-                <ifaceName>eno2</ifaceName>
+                <ifaceName>ens16</ifaceName>
                 <scapy_path>/usr/bin/scapy</scapy_path>
-                <routes>
-                    <route1>
-                        <network>10.32.11.254</network>
-                        <netmask>26</netmask>
-                        <gw>10.32.11.254</gw>
-                        <interface>eno2</interface>
-                    </route1>
-                </routes>
                 <sudo_required>true</sudo_required>
             </COMPONENTS>
-        </Compute3>
+        </Host3>
 
-        <ManagmentServer>
+        <!-- <ManagmentServer>
             <host>10.76.28.66</host>
             <user>jenkins</user>
             <password></password>
@@ -170,11 +146,12 @@
                 <sudo_required>true</sudo_required>
 
             </COMPONENTS>
-        </ManagmentServer>
+        </ManagmentServer> -->
+
 
         <NetworkBench>
-            <host>10.76.28.66</host>
-            <user>jenkins</user>
+            <host>10.70.10.105</host>
+            <user>sdfab</user>
             <password></password>
             <type>NetworkDriver</type>
             <connect_order>10</connect_order>
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE06.chart.tucson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE06.chart.hudson
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE06.chart.tucson
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE06.chart.hudson
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE16.chart.tucson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE16.chart.hudson
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE16.chart.tucson
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE16.chart.hudson
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE26.chart.tucson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE26.chart.hudson
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE26.chart.tucson
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE26.chart.hudson
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE36.chart.tucson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE36.chart.hudson
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE36.chart.tucson
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE36.chart.hudson
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE46.chart.tucson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE46.chart.hudson
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE46.chart.tucson
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE46.chart.hudson
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE56.chart.tucson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE56.chart.hudson
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE56.chart.tucson
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE56.chart.hudson
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE66.chart.tucson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE66.chart.hudson
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE66.chart.tucson
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE66.chart.hudson
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE76.chart.tucson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE76.chart.hudson
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE76.chart.tucson
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE76.chart.hudson
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE06.json.hudson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE06.json.hudson
new file mode 100644
index 0000000..24fb20f
--- /dev/null
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE06.json.hudson
@@ -0,0 +1,72 @@
+{
+  "ports": {
+    "device:leaf1/16": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25",
+            "10.32.11.254/26"
+          ],
+          "vlan-tagged": [111, 113],
+          "name": "leaf1-pair"
+        }
+      ]
+    },
+    "device:leaf2/16": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25",
+            "10.32.11.254/26"
+          ],
+          "vlan-tagged": [111, 113],
+          "name": "leaf2-pair"
+        }
+      ]
+    },
+    "device:leaf1/100": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25"
+          ],
+          "vlan-untagged": 111,
+          "name": "host-1-1"
+        }
+      ]
+    },
+    "device:leaf1/101": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25"
+          ],
+          "vlan-untagged": 111,
+          "name": "host-2-1"
+        }
+      ]
+    }
+  },
+  "device:leaf2/100": {
+    "interfaces": [
+      {
+        "ips": [
+          "10.32.11.126/25"
+        ],
+        "vlan-untagged": 111,
+        "name": "host-1-2"
+      }
+    ]
+  },
+  "device:leaf2/101": {
+    "interfaces": [
+      {
+        "ips": [
+          "10.32.11.126/25"
+        ],
+        "vlan-untagged": 111,
+        "name": "host-2-2"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE06.json.tucson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE06.json.tucson
deleted file mode 100644
index 11dab81..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE06.json.tucson
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-"ports":{
-        "device:leaf1/9":{
-            "interfaces":[
-                {
-                    "ips":[
-                        "10.32.11.126/25"
-                    ],
-                    "vlan-untagged":111,
-                    "name": "compute-1-1"
-                }
-            ]
-        },
-        "device:leaf2/9":{
-            "interfaces":[
-                {
-                    "ips":[
-                        "10.32.11.126/25"
-                    ],
-                    "vlan-untagged":111,
-                    "name": "compute-1-2"
-                }
-            ]
-        },
-        "device:leaf1/11": {
-            "interfaces": [
-              {
-                "ips": [
-                  "10.32.11.126/25"
-                ],
-                "vlan-untagged":111,
-                "name": "compute-2-1"
-              }
-            ]
-          },
-          "device:leaf2/11": {
-            "interfaces": [
-              {
-                "ips": [
-                  "10.32.11.126/25"
-                ],
-                "vlan-untagged":111,
-                "name": "compute-2-2"
-              }
-            ]
-          }
-    }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE16.json.hudson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE16.json.hudson
new file mode 100644
index 0000000..98dbfa3
--- /dev/null
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE16.json.hudson
@@ -0,0 +1,80 @@
+{
+  "ports": {
+    "device:leaf1/16": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25",
+            "10.32.11.254/26"
+          ],
+          "vlan-tagged": [111, 113],
+          "name": "leaf1-pair"
+        }
+      ]
+    },
+    "device:leaf2/16": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25",
+            "10.32.11.254/26"
+          ],
+          "vlan-tagged": [111, 113],
+          "name": "leaf2-pair"
+        }
+      ]
+    },
+    "device:leaf1/100": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25"
+          ],
+          "vlan-tagged": [
+            111
+          ],
+          "name": "host-1-1"
+        }
+      ]
+    },
+    "device:leaf1/101": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25"
+          ],
+          "vlan-tagged": [
+            111
+          ],
+          "name": "host-2-1"
+        }
+      ]
+    },
+    "device:leaf2/100": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25"
+          ],
+          "vlan-tagged": [
+            111
+          ],
+          "name": "host-1-2"
+        }
+      ]
+    },
+    "device:leaf2/101": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25"
+          ],
+          "vlan-tagged": [
+            111
+          ],
+          "name": "host-2-2"
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE16.json.tucson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE16.json.tucson
deleted file mode 100644
index c3f743e..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE16.json.tucson
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-"ports":{
-        "device:leaf1/9":{
-            "interfaces":[
-                {
-                    "ips":[
-                        "10.32.11.126/25"
-                    ],
-                    "vlan-tagged":[111],
-                    "name": "compute-1-1"
-                }
-            ]
-        },
-        "device:leaf2/9":{
-            "interfaces":[
-                {
-                    "ips":[
-                        "10.32.11.126/25"
-                    ],
-                    "vlan-tagged":[111],
-                    "name": "compute-1-2"
-                }
-            ]
-        },
-        "device:leaf1/11": {
-            "interfaces": [
-              {
-                "ips": [
-                  "10.32.11.126/25"
-                ],
-                "vlan-tagged":[111],
-                "name": "compute-2-1"
-              }
-            ]
-          },
-          "device:leaf2/11": {
-            "interfaces": [
-              {
-                "ips": [
-                  "10.32.11.126/25"
-                ],
-                "vlan-tagged":[111],
-                "name": "compute-2-2"
-              }
-            ]
-          }
-    }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE26.json.hudson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE26.json.hudson
new file mode 100644
index 0000000..8742ff1
--- /dev/null
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE26.json.hudson
@@ -0,0 +1,84 @@
+{
+  "ports": {
+    "device:leaf1/16": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25",
+            "10.32.11.254/26"
+          ],
+          "vlan-tagged": [111, 113, 120],
+          "name": "leaf1-pair"
+        }
+      ]
+    },
+    "device:leaf2/16": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25",
+            "10.32.11.254/26"
+          ],
+          "vlan-tagged": [111, 113, 120],
+          "name": "leaf1-pair"
+        }
+      ]
+    },
+    "device:leaf1/100": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25"
+          ],
+          "vlan-native": 111,
+          "vlan-tagged": [
+            120
+          ],
+          "name": "host-1-1"
+        }
+      ]
+    },
+    "device:leaf1/101": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25"
+          ],
+          "vlan-native": 111,
+          "vlan-tagged": [
+            120
+          ],
+          "name": "host-2-1"
+        }
+      ]
+    },
+    "device:leaf2/100": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25"
+          ],
+          "vlan-native": 111,
+          "vlan-tagged": [
+            120
+          ],
+          "name": "host-1-2"
+        }
+      ]
+    },
+    "device:leaf2/101": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25"
+          ],
+          "vlan-native": 111,
+          "vlan-tagged": [
+            120
+          ],
+          "name": "host-2-2"
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE26.json.tucson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE26.json.tucson
deleted file mode 100644
index 4981a51..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE26.json.tucson
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-"ports":{
-        "device:leaf1/9":{
-            "interfaces":[
-                {
-                    "ips":[
-                        "10.32.11.126/25"
-                    ],
-                    "vlan-native":111,
-                    "vlan-tagged":[120],
-                    "name": "compute-1-1"
-                }
-            ]
-        },
-        "device:leaf2/9":{
-            "interfaces":[
-                {
-                    "ips":[
-                        "10.32.11.126/25"
-                    ],
-                    "vlan-native":111,
-                    "vlan-tagged":[120],
-                    "name": "compute-1-2"
-                }
-            ]
-        },
-        "device:leaf1/11": {
-            "interfaces": [
-              {
-                "ips": [
-                  "10.32.11.126/25"
-                ],
-                "vlan-native":111,
-                "vlan-tagged":[120],
-                "name": "compute-2-1"
-              }
-            ]
-          },
-          "device:leaf2/11": {
-            "interfaces": [
-              {
-                "ips": [
-                  "10.32.11.126/25"
-                ],
-                "vlan-native":111,
-                "vlan-tagged":[120],
-                "name": "compute-2-2"
-              }
-            ]
-          }
-    }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE36.json.hudson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE36.json.hudson
new file mode 100644
index 0000000..5231100
--- /dev/null
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE36.json.hudson
@@ -0,0 +1,86 @@
+{
+  "ports": {
+    "device:leaf1/16": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25",
+            "10.32.11.254/26"
+          ],
+          "vlan-tagged": [
+            111,
+            113,
+            120
+          ],
+          "name": "leaf1-pair"
+        }
+      ]
+    },
+    "device:leaf2/16": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25",
+            "10.32.11.254/26"
+          ],
+          "vlan-tagged": [
+            111,
+            113,
+            120
+          ],
+          "name": "leaf2-pair"
+        }
+      ]
+    },
+    "device:leaf1/100": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25"
+          ],
+          "vlan-native": 111,
+          "vlan-tagged": [
+            120
+          ],
+          "name": "host-1-1"
+        }
+      ]
+    },
+    "device:leaf1/101": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25"
+          ],
+          "vlan-untagged": 111,
+          "name": "host-2-1"
+        }
+      ]
+    },
+    "device:leaf2/100": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25"
+          ],
+          "vlan-native": 111,
+          "vlan-tagged": [
+            120
+          ],
+          "name": "host-1-2"
+        }
+      ]
+    },
+    "device:leaf2/101": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25"
+          ],
+          "vlan-untagged": 111,
+          "name": "host-2-2"
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE36.json.tucson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE36.json.tucson
deleted file mode 100644
index 4a5ab72..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE36.json.tucson
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-"ports":{
-        "device:leaf1/9":{
-            "interfaces":[
-                {
-                    "ips":[
-                        "10.32.11.126/25"
-                    ],
-                    "vlan-native":111,
-                    "vlan-tagged":[120],
-                    "name": "compute-1-1"
-                }
-            ]
-        },
-        "device:leaf2/9":{
-            "interfaces":[
-                {
-                    "ips":[
-                        "10.32.11.126/25"
-                    ],
-                    "vlan-native":111,
-                    "vlan-tagged":[120],
-                    "name": "compute-1-2"
-                }
-            ]
-        },
-        "device:leaf1/11": {
-            "interfaces": [
-              {
-                "ips": [
-                  "10.32.11.126/25"
-                ],
-                "vlan-untagged":111,
-                "name": "compute-2-1"
-              }
-            ]
-          },
-          "device:leaf2/11": {
-            "interfaces": [
-              {
-                "ips": [
-                  "10.32.11.126/25"
-                ],
-                "vlan-untagged":111,
-                "name": "compute-2-2"
-              }
-            ]
-          }
-    }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE46.json.hudson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE46.json.hudson
new file mode 100644
index 0000000..5cadd37
--- /dev/null
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE46.json.hudson
@@ -0,0 +1,72 @@
+{
+  "ports": {
+    "device:leaf1/16": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25",
+            "10.32.11.254/26"
+          ],
+          "vlan-tagged": [111, 113],
+          "name": "leaf1-pair"
+        }
+      ]
+    },
+    "device:leaf2/16": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25",
+            "10.32.11.254/26"
+          ],
+          "vlan-tagged": [111, 113],
+          "name": "leaf2-pair"
+        }
+      ]
+    },
+    "device:leaf1/100": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25"
+          ],
+          "vlan-untagged": 111,
+          "name": "host-1-1"
+        }
+      ]
+    },
+    "device:leaf1/101": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25"
+          ],
+          "vlan-tagged": [111],
+          "name": "host-2-1"
+        }
+      ]
+    },
+    "device:leaf2/100": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25"
+          ],
+          "vlan-untagged": 111,
+          "name": "host-1-2"
+        }
+      ]
+    },
+    "device:leaf2/101": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25"
+          ],
+          "vlan-tagged": [111],
+          "name": "host-2-2"
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE46.json.tucson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE46.json.tucson
deleted file mode 100644
index 4149d79..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE46.json.tucson
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-"ports":{
-        "device:leaf1/9":{
-            "interfaces":[
-                {
-                    "ips":[
-                        "10.32.11.126/25"
-                    ],
-                    "vlan-untagged":111,
-                    "name": "compute-1-1"
-                }
-            ]
-        },
-        "device:leaf2/9":{
-            "interfaces":[
-                {
-                    "ips":[
-                        "10.32.11.126/25"
-                    ],
-                    "vlan-untagged":111,
-                    "name": "compute-1-2"
-                }
-            ]
-        },
-        "device:leaf1/11": {
-            "interfaces": [
-              {
-                "ips": [
-                  "10.32.11.126/25"
-                ],
-                "vlan-tagged":111,
-                "name": "compute-2-1"
-              }
-            ]
-          },
-          "device:leaf2/11": {
-            "interfaces": [
-              {
-                "ips": [
-                  "10.32.11.126/25"
-                ],
-                "vlan-tagged":111,
-                "name": "compute-2-2"
-              }
-            ]
-          }
-    }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE56.json.hudson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE56.json.hudson
new file mode 100644
index 0000000..13b7382
--- /dev/null
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE56.json.hudson
@@ -0,0 +1,72 @@
+{
+  "ports": {
+    "device:leaf1/16": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25",
+            "10.32.11.254/26"
+          ],
+          "vlan-tagged": [111, 113, 120],
+          "name": "leaf1-pair"
+        }
+      ]
+    },
+    "device:leaf2/16": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25",
+            "10.32.11.254/26"
+          ],
+          "vlan-tagged": [111, 113, 120],
+          "name": "leaf2-pair"
+        }
+      ]
+    },
+    "device:leaf1/100": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25"
+          ],
+          "vlan-untagged": 111,
+          "name": "host-1-1"
+        }
+      ]
+    },
+    "device:leaf1/101": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25"
+          ],
+          "vlan-untagged": 120,
+          "name": "host-2-1"
+        }
+      ]
+    },
+    "device:leaf2/100": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25"
+          ],
+          "vlan-untagged": 111,
+          "name": "host-1-2"
+        }
+      ]
+    },
+    "device:leaf2/101": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25"
+          ],
+          "vlan-untagged": 120,
+          "name": "host-2-2"
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE56.json.tucson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE56.json.tucson
deleted file mode 100644
index 5f3408c..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE56.json.tucson
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-"ports":{
-        "device:leaf1/9":{
-            "interfaces":[
-                {
-                    "ips":[
-                        "10.32.11.126/25"
-                    ],
-                    "vlan-untagged":111,
-                    "name": "compute-1-1"
-                }
-            ]
-        },
-        "device:leaf2/9":{
-            "interfaces":[
-                {
-                    "ips":[
-                        "10.32.11.126/25"
-                    ],
-                    "vlan-untagged":111,
-                    "name": "compute-1-2"
-                }
-            ]
-        },
-        "device:leaf1/11": {
-            "interfaces": [
-              {
-                "ips": [
-                  "10.32.11.126/25"
-                ],
-                "vlan-untagged":120,
-                "name": "compute-2-1"
-              }
-            ]
-          },
-          "device:leaf2/11": {
-            "interfaces": [
-              {
-                "ips": [
-                  "10.32.11.126/25"
-                ],
-                "vlan-untagged":120,
-                "name": "compute-2-2"
-              }
-            ]
-          }
-    }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE66.json.hudson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE66.json.hudson
new file mode 100644
index 0000000..eef4501
--- /dev/null
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE66.json.hudson
@@ -0,0 +1,80 @@
+{
+  "ports": {
+    "device:leaf1/16": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25",
+            "10.32.11.254/26"
+          ],
+          "vlan-tagged": [111, 113, 120],
+          "name": "leaf1-pair"
+        }
+      ]
+    },
+    "device:leaf2/16": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25",
+            "10.32.11.254/26"
+          ],
+          "vlan-tagged": [111, 113, 120],
+          "name": "leaf2-pair"
+        }
+      ]
+    },
+    "device:leaf1/100": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25"
+          ],
+          "vlan-tagged": [
+            111
+          ],
+          "name": "host-1-1"
+        }
+      ]
+    },
+    "device:leaf1/101": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25"
+          ],
+          "vlan-tagged": [
+            120
+          ],
+          "name": "host-2-1"
+        }
+      ]
+    },
+    "device:leaf2/100": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25"
+          ],
+          "vlan-tagged": [
+            111
+          ],
+          "name": "host-1-2"
+        }
+      ]
+    },
+    "device:leaf2/101": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25"
+          ],
+          "vlan-tagged": [
+            120
+          ],
+          "name": "host-2-2"
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE66.json.tucson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE66.json.tucson
deleted file mode 100644
index 002d9db..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE66.json.tucson
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-"ports":{
-        "device:leaf1/9":{
-            "interfaces":[
-                {
-                    "ips":[
-                        "10.32.11.126/25"
-                    ],
-                    "vlan-tagged":[111],
-                    "name": "compute-1-1"
-                }
-            ]
-        },
-        "device:leaf2/9":{
-            "interfaces":[
-                {
-                    "ips":[
-                        "10.32.11.126/25"
-                    ],
-                    "vlan-tagged":[111],
-                    "name": "compute-1-2"
-                }
-            ]
-        },
-        "device:leaf1/11": {
-            "interfaces": [
-              {
-                "ips": [
-                  "10.32.11.126/25"
-                ],
-                "vlan-tagged":[120],
-                "name": "compute-2-1"
-              }
-            ]
-          },
-          "device:leaf2/11": {
-            "interfaces": [
-              {
-                "ips": [
-                  "10.32.11.126/25"
-                ],
-                "vlan-tagged":[120],
-                "name": "compute-2-2"
-              }
-            ]
-          }
-    }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE76.json.hudson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE76.json.hudson
new file mode 100644
index 0000000..15044d3
--- /dev/null
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE76.json.hudson
@@ -0,0 +1,76 @@
+{
+  "ports": {
+    "device:leaf1/16": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25",
+            "10.32.11.254/26"
+          ],
+          "vlan-tagged": [111, 113, 120],
+          "name": "leaf1-pair"
+        }
+      ]
+    },
+    "device:leaf2/16": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25",
+            "10.32.11.254/26"
+          ],
+          "vlan-tagged": [111, 113, 120],
+          "name": "leaf2-pair"
+        }
+      ]
+    },
+    "device:leaf1/100": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25"
+          ],
+          "vlan-untagged": 111,
+          "name": "host-1-1"
+        }
+      ]
+    },
+    "device:leaf1/101": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25"
+          ],
+          "vlan-tagged": [
+            120
+          ],
+          "name": "host-2-1"
+        }
+      ]
+    },
+    "device:leaf2/100": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25"
+          ],
+          "vlan-untagged": 111,
+          "name": "host-1-2"
+        }
+      ]
+    },
+    "device:leaf2/101": {
+      "interfaces": [
+        {
+          "ips": [
+            "10.32.11.126/25"
+          ],
+          "vlan-tagged": [
+            120
+          ],
+          "name": "host-2-2"
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE76.json.tucson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE76.json.tucson
deleted file mode 100644
index 19088e5..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE76.json.tucson
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-"ports":{
-        "device:leaf1/9":{
-            "interfaces":[
-                {
-                    "ips":[
-                        "10.32.11.126/25"
-                    ],
-                    "vlan-untagged":111,
-                    "name": "compute-1-1"
-                }
-            ]
-        },
-        "device:leaf2/9":{
-            "interfaces":[
-                {
-                    "ips":[
-                        "10.32.11.126/25"
-                    ],
-                    "vlan-untagged":111,
-                    "name": "compute-1-2"
-                }
-            ]
-        },
-        "device:leaf1/11": {
-            "interfaces": [
-              {
-                "ips": [
-                  "10.32.11.126/25"
-                ],
-                "vlan-tagged":[120],
-                "name": "compute-2-1"
-              }
-            ]
-          },
-          "device:leaf2/11": {
-            "interfaces": [
-              {
-                "ips": [
-                  "10.32.11.126/25"
-                ],
-                "vlan-tagged":[120],
-                "name": "compute-2-2"
-              }
-            ]
-          }
-    }
-}