commit 78b33055983d34d0a93b0c90e436e5462b06d227
author You Wang <you@opennetworking.org> Mon Aug 07 23:59:39 2017 +0000
committer Gerrit Code Review <gerrit@onosproject.org> Mon Aug 07 23:59:39 2017 +0000
tree 69f073a2a36379c2c03aeb5274dde53ca2a66ea4
parent 1fbfa461b86ba8f954e68f01f68b5505ad47ad91
parent 51f903b71c28c50db530373b3bea345729a5e71c

Merge "Fix interation number in port and switch latency test"

TestON/tests/SCPF/SCPFportLat/SCPFportLat.py

diff --git a/TestON/tests/SCPF/SCPFportLat/SCPFportLat.py b/TestON/tests/SCPF/SCPFportLat/SCPFportLat.py
index c1dd9cc..f5edd3e 100644
--- a/TestON/tests/SCPF/SCPFportLat/SCPFportLat.py
+++ b/TestON/tests/SCPF/SCPFportLat/SCPFportLat.py
@@ -150,10 +150,10 @@
                 resultDict[ d ][ 'node' + str( i ) ][ 'PtoD' ] = []
                 resultDict[ d ][ 'node' + str( i ) ][ 'DtoL' ] = []
                 resultDict[ d ][ 'node' + str( i ) ][ 'LtoG' ] = []
-        for i in range( 1, main.sampleSize + main.warmUp ):
+        for i in range( 0, main.sampleSize + main.warmUp ):
             main.log.info( "==========================================" )
-            main.log.info( "================iteration:{}==============".format( str ( i ) ) )
-            if i > main.warmUp:
+            main.log.info( "================iteration:{}==============".format( str ( i + 1 ) ) )
+            if i >= main.warmUp:
                 # Portdown iteration
                 main.portFunc.capturePortStatusPack( main,
                                                      main.device,

TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.py

diff --git a/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.py b/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.py
index d3138f7..66aa0bf 100644
--- a/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.py
+++ b/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.py
@@ -164,9 +164,9 @@
             resultDict[ 'down' ][ 'node' + str( i ) ][ 'A_D' ] = []#Ack to Device
             resultDict[ 'down' ][ 'node' + str( i ) ][ 'D_G' ] = []#Device to Graph
             resultDict[ 'down' ][ 'node' + str( i ) ][ 'E_E' ] = []#fin_ack to Graph
-        for i in range( 1 , main.sampleSize + main.warmUp ):
+        for i in range( 0, main.sampleSize + main.warmUp ):
             main.log.info( "************************************************************" )
-            main.log.info( "************************ Iteration: {} **********************" .format( str( i ) ) )
+            main.log.info( "************************ Iteration: {} **********************" .format( str( i + 1 ) ) )
             if i < main.warmUp:
                 main.switchFunc.captureOfPack( main, main.device, main.ofPackage,
                                                "up", resultDict, True )