commit a23eff90c99468d2c0c549dfc421d20b89169164
author Jon Hall <jhall@onlab.us> Tue Sep 01 17:57:30 2015 +0000
committer Gerrit Code Review <gerrit@onlab.us> Tue Sep 01 17:57:30 2015 +0000
tree 9cf673dc98c42df65b14653945c421c2b9805160
parent acdd8fe4b9aa7918f84ee02d0d8249890eaa49bf
parent ebb6fe46fc1b39647e6783afffc3940e13e08232

Merge "add mininet testbed scripts for SDN-IP performance test"

TestON/tests/SCPFcbench/SCPFcbench.params

diff --git a/TestON/tests/SCPFcbench/SCPFcbench.params b/TestON/tests/SCPFcbench/SCPFcbench.params
index 3e92294..3050d0e 100644
--- a/TestON/tests/SCPFcbench/SCPFcbench.params
+++ b/TestON/tests/SCPFcbench/SCPFcbench.params
@@ -11,6 +11,7 @@
 
     <TEST>
         <skipCleanInstall>yes</skipCleanInstall>
+        <cbenchCMD>cbench -c localhost -p 6633 -m 1000 -l 70 -s 16 -M 100000 -w 10 -D 5000 -</cbenchCMD>
         <mode>t</mode>                     #t throughput
     </TEST>
 

TestON/tests/SCPFcbench/SCPFcbench.py

diff --git a/TestON/tests/SCPFcbench/SCPFcbench.py b/TestON/tests/SCPFcbench/SCPFcbench.py
index 647bf52..a2cbee0 100644
--- a/TestON/tests/SCPFcbench/SCPFcbench.py
+++ b/TestON/tests/SCPFcbench/SCPFcbench.py
@@ -152,11 +152,12 @@
         main.case("Running Cbench")
         main.step("Issuing cbench commands and grab returned results")
         validFlag = False
+        cbenchCMD = main.params[ 'TEST' ][ 'cbenchCMD' ]
         mode = main.params[ 'TEST' ][ 'mode' ]
         if mode != "t":
             mode = " "
 
-        runCbench = ( "ssh " + CBENCHuser + "@" + ONOSIp[1] + " cbench -c localhost -p 6633 -m 1000 -l 25 -s 16 -M 100000 -w 15 -D 10000 -" + mode )
+        runCbench = ( "ssh " + CBENCHuser + "@" + ONOSIp[1] + " " + cbenchCMD + mode )
         main.ONOSbench.handle.sendline(runCbench)
         time.sleep(30)
         main.ONOSbench.handle.expect(":~")