diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/SRRouting.py b/TestON/tests/USECASE/SegmentRouting/SRRouting/SRRouting.py
index 34845f2..e452901 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/SRRouting.py
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/SRRouting.py
@@ -5,8 +5,7 @@
 
     def CASE1( self, main ):
         """
-        Tests routing between single-homed untagged host and single-homed
-        untagged host residing on the same leaf.
+        Ping between all ipv4 hosts in the topology.
         """
 
         from tests.USECASE.SegmentRouting.SRRouting.dependencies.SRRoutingTest import SRRoutingTest
@@ -18,9 +17,6 @@
                                 routers=0,
                                 ipv4=1,
                                 ipv6=0,
-                                h1="h1v4",
-                                h2="h2v4",
-                                description = "Routing test for untagged to\
-                              untagged single homed hosts residing on the same\
-                              leaf")
+                                description = "Ping between all ipv4 hosts in
+                              the topology")
 
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/SRRoutingTest.py b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/SRRoutingTest.py
index 33c7be0..c79a446 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/SRRoutingTest.py
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/SRRoutingTest.py
@@ -29,7 +29,7 @@
         self.default = ''
 
     @staticmethod
-    def runTest( main, test_idx, onosNodes, dhcp, routers, ipv4, ipv6, h1, h2, description):
+    def runTest( main, test_idx, onosNodes, dhcp, routers, ipv4, ipv6, description):
 
         skipPackage = False
         init = False
@@ -63,7 +63,7 @@
             pass
 
         # ping hosts
-        main.Network.pingHost(src=h1, target=h2)
+        main.Network.pingAll()
 
         if hasattr(main, 'Mininet1'):
             run.cleanup(main)
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG.chart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG.chart
deleted file mode 100644
index 4438f56..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG.chart
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "leaf1": {"expect": "True",
-    "hosts":["h1", "h2"]}
-}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=0_routers=0.chart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=0_routers=0.chart
index b4cf1dd..8fc87ff 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=0_routers=0.chart
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=0_routers=0.chart
@@ -1,307 +1,4 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.1.0.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.1.10.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.0.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.30.254/24" ],
-                    "vlan-untagged": 15
-                }
-            ]
-        },
-        "of:0000000000000002/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.20.254/24" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        },
-        "of:0000000000000003/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.10.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-	"of:0000000000000003/9" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.40.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000003/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.30.254/24" ],
-                    "vlan-untagged": 15
-                }
-            ]
-        },
-        "of:0000000000000003/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.20.254/24" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        }, 
-        "of:0000000000000004/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.0.254/24" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        },
-        "of:0000000000000004/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.10.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000004/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.30.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000005/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.20.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000005/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.10.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000005/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.30.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        } 
-    },
-    "hosts" : { 
- 	"00:aa:00:00:00:01/None" : {
-		"basic": {
-			"locations": ["of:0000000000000001/3"],
-			"ips": ["10.1.0.1"]
-		     }
-	    },
-	"00:aa:00:00:01:01/None" : {
-		"basic": {
-			"locations": ["of:0000000000000001/4"],
-			"ips": ["10.1.10.1"]
-		     }
-	    },
-	"00:aa:00:00:00:02/None" : {
-		"basic": {
-			"locations": ["of:0000000000000002/6"],
-			"ips": ["10.2.0.1"]
-		     }
-	    },
-	"00:aa:00:00:00:03/None" : {
-		"basic": {
-			"locations": ["of:0000000000000002/7", "of:0000000000000003/6"],
-			"ips": ["10.2.30.1"]
-		     }
-	    },
-	"00:aa:00:00:00:04/30" : {
-		"basic": {
-			"locations": ["of:0000000000000003/7","of:0000000000000002/8"],
-			"ips": ["10.2.20.1"]
-		     }
-	    },
-	"00:aa:00:00:00:05/20" : {
-		"basic": {
-			"locations": ["of:0000000000000003/8"],
-			"ips": ["10.2.10.1"]
-		     }
-	    },
-	"00:aa:00:00:01:05/40" : {
-		"basic": {
-			"locations": ["of:0000000000000003/9"],
-			"ips": ["10.2.40.1"]
-		     }
-	    },
-	"00:aa:00:00:00:06/30" : {
-		"basic": {
-			"locations": ["of:0000000000000004/6"],
-			"ips": ["10.3.0.1"]
-		     }
-	    },
-	"00:aa:00:00:00:07/40" : {
-		"basic": {
-			"locations": ["of:0000000000000005/6", "of:0000000000000004/7"],
-			"ips": ["10.3.10.1"]
-		     }
-	    },
-	"00:aa:00:00:00:08/40" : {
-		"basic": {
-			"locations": ["of:0000000000000004/8","of:0000000000000005/7"],
-			"ips": ["10.3.30.1"]
-		     }
-	    },
-	"00:aa:00:00:00:0A/40" : {
-		"basic": {
-			"locations": ["of:0000000000000005/8"],
-			"ips": ["10.3.20.1"]
-		     }
-	    }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "name" : "s001",
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-105
-            }
-        },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "name" : "s002",
-                "ipv4NodeSid" : 2,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000003",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-95
-            }
-        },
-        "of:0000000000000003" : {
-            "segmentrouting" : {
-                "name" : "s003",
-                "ipv4NodeSid" : 3,
-                "ipv4Loopback" : "192.168.0.3",
-                "routerMac" : "00:00:00:00:00:03",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000002",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-90
-            }
-        },
-        "of:0000000000000004" : {
-            "segmentrouting" : {
-                "name" : "s004",
-                "ipv4NodeSid" : 4,
-                "ipv4Loopback" : "192.168.0.4",
-                "routerMac" : "00:00:00:00:00:04",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000005",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-85
-            }
-        },
-        "of:0000000000000005" : {
-            "segmentrouting" : {
-                "name" : "s005",
-                "ipv4NodeSid" : 5,
-                "ipv4Loopback" : "192.168.0.5",
-                "routerMac" : "00:00:00:00:00:05",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000004",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-80
-            }
-        },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "name" : "s101",
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs",
-		"latitude":42,
-                "longitude":-100
-            }
-        },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "name" : "s102",
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                 "driver" : "ofdpa-ovs",
-		 "latitude":42,
-		 "longitude":-95
-            }
-        }   
-    }
+  "ipv4": {"expect": "True",
+    "hosts":["h1v4", "h2v4" ,"h3v4", "h4v4", "h5v4", "h6v4", "h7v4", "h8v4", "h9v4", "h10v4", "h11v4"]}
 }
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/comcast_fabric.py b/TestON/tests/USECASE/SegmentRouting/dependencies/comcast_fabric.py
index 6691e11..7b4c19e 100644
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/comcast_fabric.py
+++ b/TestON/tests/USECASE/SegmentRouting/dependencies/comcast_fabric.py
@@ -38,6 +38,7 @@
 
     def __init__(self, name, ip, gateway, dhcp, vlan, *args, **kwargs):
         super(DualHomedTaggedHostWithIpv4, self).__init__(name, **kwargs)
+        self.vlanBond0 = None
         self.bond0 = None
         self.ip = ip
         self.gateway = gateway
@@ -70,8 +71,8 @@
         self.cmd('ip route add default via %s' % self.gateway)
 
         default_intf = self.defaultIntf()
-        default_intf.name = self.bond0
-        self.nameToIntf[self.bond0] = default_intf
+        default_intf.name = self.vlanBondIntf
+        self.nameToIntf[self.vlanBond0] = default_intf
 
     def terminate(self, **kwargs):
         self.cmd('ip link set %s down' % self.bond0)