commit aa7bc72e78ba2ba5656939232751b1501cc56ceb
author You Wang <you@opennetworking.org> Thu Feb 21 17:55:39 2019 -0800
committer You Wang <you@opennetworking.org> Fri Feb 22 16:30:54 2019 -0800
tree ad4db0d9f52fe783c554ff57750481660fec64aa
parent 0ce8e0ca3447d53a2a5065481fbad32a33f1a2d7

[ONOS-7937] Automatically check SCPF test results

Change-Id: Ifec2e7965fbc43ab9bb65338810ca62d7b120739

TestON/tests/SCPF/SCPFcbench/SCPFcbench.params

diff --git a/TestON/tests/SCPF/SCPFcbench/SCPFcbench.params b/TestON/tests/SCPF/SCPFcbench/SCPFcbench.params
index 80b2382..8feaeaf 100644
--- a/TestON/tests/SCPF/SCPFcbench/SCPFcbench.params
+++ b/TestON/tests/SCPF/SCPFcbench/SCPFcbench.params
@@ -11,8 +11,8 @@
     <availableNodes>1</availableNodes>
 
     <ENV>
-    <cellName>Cbenchcell</cellName>
-    <cellApps>drivers,openflow-base,fwd</cellApps>
+        <cellName>Cbenchcell</cellName>
+        <cellApps>drivers,openflow-base,fwd</cellApps>
     </ENV>
 
     <TEST>
@@ -44,7 +44,8 @@
         <user>sdn</user>
     </CBENCH>
 
-    <JSON>
-    </JSON>
+    <ALARM>
+        <minTp>1000000</minTp>
+    </ALARM>
 
 </PARAMS>

TestON/tests/SCPF/SCPFcbench/SCPFcbench.py

diff --git a/TestON/tests/SCPF/SCPFcbench/SCPFcbench.py b/TestON/tests/SCPF/SCPFcbench/SCPFcbench.py
index 4a09129..d74ff8f 100644
--- a/TestON/tests/SCPF/SCPFcbench/SCPFcbench.py
+++ b/TestON/tests/SCPF/SCPFcbench/SCPFcbench.py
@@ -117,6 +117,12 @@
                 main.log.info( "Average: \t\t\t" + avg )
                 main.log.info( "Standard Deviation: \t" + stdev )
 
+                # Check cbench test results
+                threshold = float( main.params[ 'ALARM' ][ 'minTp' ].split( ',' )[ main.cycle - 1 ] )
+                if float( avg ) < threshold:
+                    main.log.alarm( "{}-node: {}/s < {}/s".format( main.Cluster.numCtrls,
+                                                                   avg, threshold ) )
+
                 try:
                     dbFileName = "/tmp/CbenchDB"
                     dbfile = open( dbFileName, "w+" )