commit fb49d4dc83189983ffc37e1e23dda208bdde0a61
author You Wang <you@onlab.us> Mon Feb 27 20:08:29 2017 +0000
committer Gerrit Code Review <gerrit@onlab.us> Mon Feb 27 20:08:29 2017 +0000
tree 766ea6d3cad6167f483cb1fc7f7b1531b6b9f72c
parent 1847760ac35f8e339a5fb975c140a4ba9cd46e49
parent e1427338406f0cf0d3f9a1fb2695750f048de4d3

Merge "WIP: Submit fewer intents in intent throughput test with FlowObjective"

TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.params

diff --git a/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.params b/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.params
index cf4c6ac..620982d 100644
--- a/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.params
+++ b/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.params
@@ -64,6 +64,7 @@
         <duration>400</duration>
         <log_interval>20</log_interval>
         <numKeys>40000</numKeys>
+        <numKeysFlowObj>4000</numKeysFlowObj>
         <cyclePeriod>1000</cyclePeriod>
         <neighbors>0,a</neighbors>           #a == all nodes (-1)
         <flowRuleBUEnabled>true</flowRuleBUEnabled>

TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.py

diff --git a/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.py b/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.py
index cf91077..75c0aa1 100644
--- a/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.py
+++ b/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.py
@@ -74,15 +74,16 @@
         main.testDuration = main.params[ 'TEST' ][ 'duration' ]
         main.logInterval = main.params[ 'TEST' ][ 'log_interval' ]
         main.debug = main.params[ 'debugMode' ]
-        main.numKeys = main.params[ 'TEST' ][ 'numKeys' ]
         main.timeout = int(main.params['SLEEP']['timeout'])
         main.cyclePeriod = main.params[ 'TEST' ][ 'cyclePeriod' ]
         if main.flowObj == "True":
             main.flowObj = True
             main.dbFileName = main.params['DATABASE']['dbFlowObj']
+            main.numKeys = main.params[ 'TEST' ][ 'numKeysFlowObj' ]
         else:
             main.flowObj = False
             main.dbFileName = main.params['DATABASE']['dbName']
+            main.numKeys = main.params[ 'TEST' ][ 'numKeys' ]
         # Create DataBase file
         main.log.info( "Create Database file " + main.dbFileName )
         resultsDB = open( main.dbFileName, "w+" )