diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/SRRoutingTest.py b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/SRRoutingTest.py
index 43c5265..68533bb 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/SRRoutingTest.py
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/SRRoutingTest.py
@@ -87,7 +87,7 @@
         if hasattr( main, 'Mininet1' ):
             # Run the test with Mininet
             mininet_args = ' --dhcp=%s --routers=%s --ipv6=%s --ipv4=%s' % ( dhcp, routers, ipv6, ipv4 )
-            run.startMininet( main, 'hagg_fabric.py', args=mininet_args )
+            run.startMininet( main, main.params['DEPENDENCY']['topology'], args=mininet_args )
         else:
             # Run the test with physical devices
             # TODO: connect TestON to the physical network
@@ -117,10 +117,10 @@
                 linksBefore = info['links_before']
                 linksAfter = info['links_after']
 
-                run.killLinkBatch( main, linksToRemove, linksAfter )
+                run.killLinkBatch( main, linksToRemove, linksAfter, 10 )
                 SRRoutingTest.runChecks( main, test_idx, countFlowsGroups )
 
-                run.restoreLinkBatch( main, linksToRemove, linksBefore )
+                run.restoreLinkBatch( main, linksToRemove, linksBefore, 10 )
                 SRRoutingTest.runChecks( main, test_idx, countFlowsGroups )
 
         # Test node failures
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.linkFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.linkFailureChart
index 9d971dd..784fbd3 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.linkFailureChart
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.linkFailureChart
@@ -1,19 +1,17 @@
 {
-    "link_batch_1" : { "links" : { "link1" : ["leaf1", "spine101"],
+    "link_batch_1" : { "links" : { "link1" : ["spine103", "spine101"],
 		      		   "link2" : ["leaf2", "spine101"],
 	              		   "link3" : ["leaf3", "spine101"],
 		      		   "link4" : ["leaf4", "spine101"],
 		      	           "link5" : ["leaf5", "spine101"] },
-			"links_before" : 40,
-			"links_after" : 22 },
-    "link_batch_2" : { "links" : { "link1" : ["leaf1", "spine102"],
+			"links_before" : 48,
+			"links_after" : 30 },
+    "link_batch_2" : { "links" : { "link1" : ["spine104", "spine102"],
 		      		   "link2" : ["leaf2", "spine102"],
 	              		   "link3" : ["leaf3", "spine102"],
 		      		   "link4" : ["leaf4", "spine102"],
 		      	           "link5" : ["leaf5", "spine102"] },
-			"links_before" : 40,
-			"links_after" : 22 }
-	
-	
+			"links_before" : 48,
+			"links_after" : 30 }
 }
 
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.linkFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.linkFailureChart
index 9d971dd..784fbd3 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.linkFailureChart
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.linkFailureChart
@@ -1,19 +1,17 @@
 {
-    "link_batch_1" : { "links" : { "link1" : ["leaf1", "spine101"],
+    "link_batch_1" : { "links" : { "link1" : ["spine103", "spine101"],
 		      		   "link2" : ["leaf2", "spine101"],
 	              		   "link3" : ["leaf3", "spine101"],
 		      		   "link4" : ["leaf4", "spine101"],
 		      	           "link5" : ["leaf5", "spine101"] },
-			"links_before" : 40,
-			"links_after" : 22 },
-    "link_batch_2" : { "links" : { "link1" : ["leaf1", "spine102"],
+			"links_before" : 48,
+			"links_after" : 30 },
+    "link_batch_2" : { "links" : { "link1" : ["spine104", "spine102"],
 		      		   "link2" : ["leaf2", "spine102"],
 	              		   "link3" : ["leaf3", "spine102"],
 		      		   "link4" : ["leaf4", "spine102"],
 		      	           "link5" : ["leaf5", "spine102"] },
-			"links_before" : 40,
-			"links_after" : 22 }
-	
-	
+			"links_before" : 48,
+			"links_after" : 30 }
 }
 
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.linkFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.linkFailureChart
index 9d971dd..784fbd3 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.linkFailureChart
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.linkFailureChart
@@ -1,19 +1,17 @@
 {
-    "link_batch_1" : { "links" : { "link1" : ["leaf1", "spine101"],
+    "link_batch_1" : { "links" : { "link1" : ["spine103", "spine101"],
 		      		   "link2" : ["leaf2", "spine101"],
 	              		   "link3" : ["leaf3", "spine101"],
 		      		   "link4" : ["leaf4", "spine101"],
 		      	           "link5" : ["leaf5", "spine101"] },
-			"links_before" : 40,
-			"links_after" : 22 },
-    "link_batch_2" : { "links" : { "link1" : ["leaf1", "spine102"],
+			"links_before" : 48,
+			"links_after" : 30 },
+    "link_batch_2" : { "links" : { "link1" : ["spine104", "spine102"],
 		      		   "link2" : ["leaf2", "spine102"],
 	              		   "link3" : ["leaf3", "spine102"],
 		      		   "link4" : ["leaf4", "spine102"],
 		      	           "link5" : ["leaf5", "spine102"] },
-			"links_before" : 40,
-			"links_after" : 22 }
-	
-	
+			"links_before" : 48,
+			"links_after" : 30 }
 }
 
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.linkFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.linkFailureChart
index 9d971dd..784fbd3 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.linkFailureChart
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.linkFailureChart
@@ -1,19 +1,17 @@
 {
-    "link_batch_1" : { "links" : { "link1" : ["leaf1", "spine101"],
+    "link_batch_1" : { "links" : { "link1" : ["spine103", "spine101"],
 		      		   "link2" : ["leaf2", "spine101"],
 	              		   "link3" : ["leaf3", "spine101"],
 		      		   "link4" : ["leaf4", "spine101"],
 		      	           "link5" : ["leaf5", "spine101"] },
-			"links_before" : 40,
-			"links_after" : 22 },
-    "link_batch_2" : { "links" : { "link1" : ["leaf1", "spine102"],
+			"links_before" : 48,
+			"links_after" : 30 },
+    "link_batch_2" : { "links" : { "link1" : ["spine104", "spine102"],
 		      		   "link2" : ["leaf2", "spine102"],
 	              		   "link3" : ["leaf3", "spine102"],
 		      		   "link4" : ["leaf4", "spine102"],
 		      	           "link5" : ["leaf5", "spine102"] },
-			"links_before" : 40,
-			"links_after" : 22 }
-	
-	
+			"links_before" : 48,
+			"links_after" : 30 }
 }
 
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.linkFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.linkFailureChart
index 9d971dd..784fbd3 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.linkFailureChart
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.linkFailureChart
@@ -1,19 +1,17 @@
 {
-    "link_batch_1" : { "links" : { "link1" : ["leaf1", "spine101"],
+    "link_batch_1" : { "links" : { "link1" : ["spine103", "spine101"],
 		      		   "link2" : ["leaf2", "spine101"],
 	              		   "link3" : ["leaf3", "spine101"],
 		      		   "link4" : ["leaf4", "spine101"],
 		      	           "link5" : ["leaf5", "spine101"] },
-			"links_before" : 40,
-			"links_after" : 22 },
-    "link_batch_2" : { "links" : { "link1" : ["leaf1", "spine102"],
+			"links_before" : 48,
+			"links_after" : 30 },
+    "link_batch_2" : { "links" : { "link1" : ["spine104", "spine102"],
 		      		   "link2" : ["leaf2", "spine102"],
 	              		   "link3" : ["leaf3", "spine102"],
 		      		   "link4" : ["leaf4", "spine102"],
 		      	           "link5" : ["leaf5", "spine102"] },
-			"links_before" : 40,
-			"links_after" : 22 }
-	
-	
+			"links_before" : 48,
+			"links_after" : 30 }
 }
 
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.linkFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.linkFailureChart
index 9d971dd..784fbd3 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.linkFailureChart
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.linkFailureChart
@@ -1,19 +1,17 @@
 {
-    "link_batch_1" : { "links" : { "link1" : ["leaf1", "spine101"],
+    "link_batch_1" : { "links" : { "link1" : ["spine103", "spine101"],
 		      		   "link2" : ["leaf2", "spine101"],
 	              		   "link3" : ["leaf3", "spine101"],
 		      		   "link4" : ["leaf4", "spine101"],
 		      	           "link5" : ["leaf5", "spine101"] },
-			"links_before" : 40,
-			"links_after" : 22 },
-    "link_batch_2" : { "links" : { "link1" : ["leaf1", "spine102"],
+			"links_before" : 48,
+			"links_after" : 30 },
+    "link_batch_2" : { "links" : { "link1" : ["spine104", "spine102"],
 		      		   "link2" : ["leaf2", "spine102"],
 	              		   "link3" : ["leaf3", "spine102"],
 		      		   "link4" : ["leaf4", "spine102"],
 		      	           "link5" : ["leaf5", "spine102"] },
-			"links_before" : 40,
-			"links_after" : 22 }
-	
-	
+			"links_before" : 48,
+			"links_after" : 30 }
 }
 
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.linkFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.linkFailureChart
index 9d971dd..784fbd3 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.linkFailureChart
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.linkFailureChart
@@ -1,19 +1,17 @@
 {
-    "link_batch_1" : { "links" : { "link1" : ["leaf1", "spine101"],
+    "link_batch_1" : { "links" : { "link1" : ["spine103", "spine101"],
 		      		   "link2" : ["leaf2", "spine101"],
 	              		   "link3" : ["leaf3", "spine101"],
 		      		   "link4" : ["leaf4", "spine101"],
 		      	           "link5" : ["leaf5", "spine101"] },
-			"links_before" : 40,
-			"links_after" : 22 },
-    "link_batch_2" : { "links" : { "link1" : ["leaf1", "spine102"],
+			"links_before" : 48,
+			"links_after" : 30 },
+    "link_batch_2" : { "links" : { "link1" : ["spine104", "spine102"],
 		      		   "link2" : ["leaf2", "spine102"],
 	              		   "link3" : ["leaf3", "spine102"],
 		      		   "link4" : ["leaf4", "spine102"],
 		      	           "link5" : ["leaf5", "spine102"] },
-			"links_before" : 40,
-			"links_after" : 22 }
-	
-	
+			"links_before" : 48,
+			"links_after" : 30 }
 }
 
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.linkFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.linkFailureChart
index 9d971dd..784fbd3 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.linkFailureChart
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.linkFailureChart
@@ -1,19 +1,17 @@
 {
-    "link_batch_1" : { "links" : { "link1" : ["leaf1", "spine101"],
+    "link_batch_1" : { "links" : { "link1" : ["spine103", "spine101"],
 		      		   "link2" : ["leaf2", "spine101"],
 	              		   "link3" : ["leaf3", "spine101"],
 		      		   "link4" : ["leaf4", "spine101"],
 		      	           "link5" : ["leaf5", "spine101"] },
-			"links_before" : 40,
-			"links_after" : 22 },
-    "link_batch_2" : { "links" : { "link1" : ["leaf1", "spine102"],
+			"links_before" : 48,
+			"links_after" : 30 },
+    "link_batch_2" : { "links" : { "link1" : ["spine104", "spine102"],
 		      		   "link2" : ["leaf2", "spine102"],
 	              		   "link3" : ["leaf3", "spine102"],
 		      		   "link4" : ["leaf4", "spine102"],
 		      	           "link5" : ["leaf5", "spine102"] },
-			"links_before" : 40,
-			"links_after" : 22 }
-	
-	
+			"links_before" : 48,
+			"links_after" : 30 }
 }
 
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.linkFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.linkFailureChart
index 9d971dd..784fbd3 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.linkFailureChart
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.linkFailureChart
@@ -1,19 +1,17 @@
 {
-    "link_batch_1" : { "links" : { "link1" : ["leaf1", "spine101"],
+    "link_batch_1" : { "links" : { "link1" : ["spine103", "spine101"],
 		      		   "link2" : ["leaf2", "spine101"],
 	              		   "link3" : ["leaf3", "spine101"],
 		      		   "link4" : ["leaf4", "spine101"],
 		      	           "link5" : ["leaf5", "spine101"] },
-			"links_before" : 40,
-			"links_after" : 22 },
-    "link_batch_2" : { "links" : { "link1" : ["leaf1", "spine102"],
+			"links_before" : 48,
+			"links_after" : 30 },
+    "link_batch_2" : { "links" : { "link1" : ["spine104", "spine102"],
 		      		   "link2" : ["leaf2", "spine102"],
 	              		   "link3" : ["leaf3", "spine102"],
 		      		   "link4" : ["leaf4", "spine102"],
 		      	           "link5" : ["leaf5", "spine102"] },
-			"links_before" : 40,
-			"links_after" : 22 }
-	
-	
+			"links_before" : 48,
+			"links_after" : 30 }
 }
 
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.switchFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.switchFailureChart
index a1d69ae..96e4982 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.switchFailureChart
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.switchFailureChart
@@ -1,10 +1,10 @@
 {
-    "spine101": { "switches_before_failure": 7,
-                  "links_before_failure": 40,
-                  "switches_after_failure": 6,
-                  "links_after_failure": 22 },
-    "spine102": { "switches_before_failure": 7,
-                  "links_before_failure": 40,
-                  "switches_after_failure": 6,
-                  "links_after_failure": 22 }
+    "spine101": { "switches_before_failure": 10,
+                  "links_before_failure": 48,
+                  "switches_after_failure": 9,
+                  "links_after_failure": 30 },
+    "spine102": { "switches_before_failure": 10,
+                  "links_before_failure": 48,
+                  "switches_after_failure": 9,
+                  "links_after_failure": 30 }
 }
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.switchFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.switchFailureChart
index a1d69ae..96e4982 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.switchFailureChart
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.switchFailureChart
@@ -1,10 +1,10 @@
 {
-    "spine101": { "switches_before_failure": 7,
-                  "links_before_failure": 40,
-                  "switches_after_failure": 6,
-                  "links_after_failure": 22 },
-    "spine102": { "switches_before_failure": 7,
-                  "links_before_failure": 40,
-                  "switches_after_failure": 6,
-                  "links_after_failure": 22 }
+    "spine101": { "switches_before_failure": 10,
+                  "links_before_failure": 48,
+                  "switches_after_failure": 9,
+                  "links_after_failure": 30 },
+    "spine102": { "switches_before_failure": 10,
+                  "links_before_failure": 48,
+                  "switches_after_failure": 9,
+                  "links_after_failure": 30 }
 }
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.switchFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.switchFailureChart
index a1d69ae..96e4982 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.switchFailureChart
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.switchFailureChart
@@ -1,10 +1,10 @@
 {
-    "spine101": { "switches_before_failure": 7,
-                  "links_before_failure": 40,
-                  "switches_after_failure": 6,
-                  "links_after_failure": 22 },
-    "spine102": { "switches_before_failure": 7,
-                  "links_before_failure": 40,
-                  "switches_after_failure": 6,
-                  "links_after_failure": 22 }
+    "spine101": { "switches_before_failure": 10,
+                  "links_before_failure": 48,
+                  "switches_after_failure": 9,
+                  "links_after_failure": 30 },
+    "spine102": { "switches_before_failure": 10,
+                  "links_before_failure": 48,
+                  "switches_after_failure": 9,
+                  "links_after_failure": 30 }
 }
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.switchFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.switchFailureChart
index a1d69ae..96e4982 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.switchFailureChart
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.switchFailureChart
@@ -1,10 +1,10 @@
 {
-    "spine101": { "switches_before_failure": 7,
-                  "links_before_failure": 40,
-                  "switches_after_failure": 6,
-                  "links_after_failure": 22 },
-    "spine102": { "switches_before_failure": 7,
-                  "links_before_failure": 40,
-                  "switches_after_failure": 6,
-                  "links_after_failure": 22 }
+    "spine101": { "switches_before_failure": 10,
+                  "links_before_failure": 48,
+                  "switches_after_failure": 9,
+                  "links_after_failure": 30 },
+    "spine102": { "switches_before_failure": 10,
+                  "links_before_failure": 48,
+                  "switches_after_failure": 9,
+                  "links_after_failure": 30 }
 }
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.switchFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.switchFailureChart
index a1d69ae..96e4982 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.switchFailureChart
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.switchFailureChart
@@ -1,10 +1,10 @@
 {
-    "spine101": { "switches_before_failure": 7,
-                  "links_before_failure": 40,
-                  "switches_after_failure": 6,
-                  "links_after_failure": 22 },
-    "spine102": { "switches_before_failure": 7,
-                  "links_before_failure": 40,
-                  "switches_after_failure": 6,
-                  "links_after_failure": 22 }
+    "spine101": { "switches_before_failure": 10,
+                  "links_before_failure": 48,
+                  "switches_after_failure": 9,
+                  "links_after_failure": 30 },
+    "spine102": { "switches_before_failure": 10,
+                  "links_before_failure": 48,
+                  "switches_after_failure": 9,
+                  "links_after_failure": 30 }
 }
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.switchFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.switchFailureChart
index a1d69ae..96e4982 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.switchFailureChart
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.switchFailureChart
@@ -1,10 +1,10 @@
 {
-    "spine101": { "switches_before_failure": 7,
-                  "links_before_failure": 40,
-                  "switches_after_failure": 6,
-                  "links_after_failure": 22 },
-    "spine102": { "switches_before_failure": 7,
-                  "links_before_failure": 40,
-                  "switches_after_failure": 6,
-                  "links_after_failure": 22 }
+    "spine101": { "switches_before_failure": 10,
+                  "links_before_failure": 48,
+                  "switches_after_failure": 9,
+                  "links_after_failure": 30 },
+    "spine102": { "switches_before_failure": 10,
+                  "links_before_failure": 48,
+                  "switches_after_failure": 9,
+                  "links_after_failure": 30 }
 }
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.switchFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.switchFailureChart
index a1d69ae..96e4982 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.switchFailureChart
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.switchFailureChart
@@ -1,10 +1,10 @@
 {
-    "spine101": { "switches_before_failure": 7,
-                  "links_before_failure": 40,
-                  "switches_after_failure": 6,
-                  "links_after_failure": 22 },
-    "spine102": { "switches_before_failure": 7,
-                  "links_before_failure": 40,
-                  "switches_after_failure": 6,
-                  "links_after_failure": 22 }
+    "spine101": { "switches_before_failure": 10,
+                  "links_before_failure": 48,
+                  "switches_after_failure": 9,
+                  "links_after_failure": 30 },
+    "spine102": { "switches_before_failure": 10,
+                  "links_before_failure": 48,
+                  "switches_after_failure": 9,
+                  "links_after_failure": 30 }
 }
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.switchFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.switchFailureChart
index a1d69ae..96e4982 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.switchFailureChart
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.switchFailureChart
@@ -1,10 +1,10 @@
 {
-    "spine101": { "switches_before_failure": 7,
-                  "links_before_failure": 40,
-                  "switches_after_failure": 6,
-                  "links_after_failure": 22 },
-    "spine102": { "switches_before_failure": 7,
-                  "links_before_failure": 40,
-                  "switches_after_failure": 6,
-                  "links_after_failure": 22 }
+    "spine101": { "switches_before_failure": 10,
+                  "links_before_failure": 48,
+                  "switches_after_failure": 9,
+                  "links_after_failure": 30 },
+    "spine102": { "switches_before_failure": 10,
+                  "links_before_failure": 48,
+                  "switches_after_failure": 9,
+                  "links_after_failure": 30 }
 }
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.switchFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.switchFailureChart
index a1d69ae..96e4982 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.switchFailureChart
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.switchFailureChart
@@ -1,10 +1,10 @@
 {
-    "spine101": { "switches_before_failure": 7,
-                  "links_before_failure": 40,
-                  "switches_after_failure": 6,
-                  "links_after_failure": 22 },
-    "spine102": { "switches_before_failure": 7,
-                  "links_before_failure": 40,
-                  "switches_after_failure": 6,
-                  "links_after_failure": 22 }
+    "spine101": { "switches_before_failure": 10,
+                  "links_before_failure": 48,
+                  "switches_after_failure": 9,
+                  "links_after_failure": 30 },
+    "spine102": { "switches_before_failure": 10,
+                  "links_before_failure": 48,
+                  "switches_after_failure": 9,
+                  "links_after_failure": 30 }
 }
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py b/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py
index 62982c3..43d0f81 100644
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py
+++ b/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py
@@ -524,7 +524,7 @@
                                  onfail="Failed to turn off link?" )
 
     @staticmethod
-    def killLinkBatch( main, links, linksAfter, switches=7):
+    def killLinkBatch( main, links, linksAfter, switches ):
         """
         links = list of links (src, dst) to bring down.
         """
@@ -552,7 +552,7 @@
                                  onfail="Link batch down failed" )
 
     @staticmethod
-    def restoreLinkBatch( main, links, linksAfter, switches=7):
+    def restoreLinkBatch( main, links, linksAfter, switches ):
         """
         links = list of link (src, dst) to bring up again.
         """