commit 0b9039d7ba99e943dd969923126c786965781f58
author You Wang <you@onlab.us> Thu Jan 12 16:51:29 2017 -0800
committer You Wang <you@onlab.us> Mon Feb 27 15:30:39 2017 -0800
tree 415cb3a448a1a7320e1c1f41f7098785e12f2770
parent fb49d4dc83189983ffc37e1e23dda208bdde0a61

Improve stability of intent reroute test

Change-Id: I38cbfec749de322626a5d3abfcdc92a73cf94dc3

TestON/tests/SCPF/SCPFintentRerouteLat/dependencies/intentRerouteLatFuncs.py

diff --git a/TestON/tests/SCPF/SCPFintentRerouteLat/dependencies/intentRerouteLatFuncs.py b/TestON/tests/SCPF/SCPFintentRerouteLat/dependencies/intentRerouteLatFuncs.py
index fc18cb6..24cf32b 100644
--- a/TestON/tests/SCPF/SCPFintentRerouteLat/dependencies/intentRerouteLatFuncs.py
+++ b/TestON/tests/SCPF/SCPFintentRerouteLat/dependencies/intentRerouteLatFuncs.py
@@ -21,13 +21,19 @@
 
 def bringBackTopology( main ):
     main.log.info( "Bring back topology " )
-    main.CLIs[ 0 ].removeAllIntents(purge=True, sync=True, timeout=main.timeout)
-    time.sleep( 1 )
+    main.CLIs[ 0 ].pushTestIntents(main.ingress, main.egress, main.batchSize,
+                                 offset=1, options="-w", timeout=main.timeout)
     main.CLIs[ 0 ].purgeWithdrawnIntents()
     main.CLIs[ 0 ].setCfg( "org.onosproject.provider.nil.NullProviders", "deviceCount", value=0)
     main.CLIs[ 0 ].setCfg( "org.onosproject.provider.nil.NullProviders", "enabled", value="false")
     main.CLIs[ 0 ].setCfg( "org.onosproject.provider.nil.NullProviders", "deviceCount", value=main.deviceCount)
     main.CLIs[ 0 ].setCfg( "org.onosproject.provider.nil.NullProviders", "enabled", value="true")
+    main.CLIs[ 0 ].balanceMasters()
+    time.sleep( main.setMasterSleep )
+    if len( main.ONOSip ) > 1:
+        main.CLIs[ 0 ].deviceRole(main.end1[ 'name' ], main.ONOSip[ 0 ])
+        main.CLIs[ 0 ].deviceRole(main.end2[ 'name' ], main.ONOSip[ 0 ])
+    time.sleep( main.setMasterSleep )
 
 def getValues( main ):
     '''