commit 501404a851c09afbc4b4f7afba162b405bda316a
author Jon Hall <jhall@opennetworking.org> Wed Feb 20 00:04:07 2019 +0000
committer Gerrit Code Review <gerrit@onosproject.org> Wed Feb 20 00:04:07 2019 +0000
tree 596ea87a06dac43b27f4988f4533ba80a580b5d9
parent fea75169bd97475de441ec6b624df347f4f02d03
parent 47bbfde97ddbd06a4e70b5643066c209b967562b

Merge "Remove outdated tests from automated test schedule"

TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.params

diff --git a/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.params b/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.params
index 7501bf5..d4d1971 100644
--- a/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.params
+++ b/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.params
@@ -27,6 +27,7 @@
 
     <TEST>
         <warmUp>5</warmUp>
+        <maxLatency>1000</maxLatency>
         <sampleSize>20</sampleSize>
         <intents>1,100,1000</intents>                       #list format, will be split on ','
         <FObjintents>1,100</FObjintents>

TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.py

diff --git a/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.py b/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.py
index 7a8a294..40790fb 100644
--- a/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.py
+++ b/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.py
@@ -282,8 +282,10 @@
 
                     firstLocalLatnecy, lastLocalLatnecy, firstGlobalLatency, lastGlobalLatnecy \
                         = main.intentRerouteLatFuncs.calculateLatency( main, topologyTimestamps, intentTimestamps )
-                    if firstLocalLatnecy < 0:
-                        main.log.info( "Got negative latency, skipping this iteration..." )
+                    maxLatency = float( main.params[ 'TEST' ][ 'maxLatency' ] )
+                    if firstLocalLatnecy < 0 or lastLocalLatnecy < 0 or \
+                       firstLocalLatnecy > maxLatency or lastLocalLatnecy > maxLatency:
+                        main.log.info( "Got invalid latency, skipping this iteration..." )
                         main.intentRerouteLatFuncs.bringBackTopology( main )
                         if main.validRun >= main.warmUp:
                             main.invalidRun += 1