commit fc1c464aa3b5bab896ad6282a68097637bd269fb
author YPZhang <yunpeng@onlab.us> Mon Jun 20 22:52:26 2016 +0000
committer Gerrit Code Review <gerrit@onlab.us> Mon Jun 20 22:52:26 2016 +0000
tree eb0656c47ad567d6a23f6919189516a8f4ecb6a4
parent 0a05b8d5222d259da3d93f8d9d739e5af05087af
parent 28909bc38ad8544efe2c2f454d806c983714ce97

Merge "Fix a small bug for DataBase file"

TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.params

diff --git a/TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.params b/TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.params
index a413601..146faf4 100755
--- a/TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.params
+++ b/TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.params
@@ -20,7 +20,7 @@
         <maxNodes>1</maxNodes> # currently only runs in single node onos
         <numSw>63</numSw> # Number of devices used in topology
         <numThreads>4</numThreads> #Number of Threads to use for POST and DELETE
-        <cluster>BM</cluster>
+        <cluster>baremetal1</cluster>
         <SLEEP>
             <startup>15</startup>
             <startMN>15</startMN>

TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.py

diff --git a/TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.py b/TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.py
index b767835..4aff74d 100755
--- a/TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.py
+++ b/TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.py
@@ -44,8 +44,11 @@
         main.cellData = {} # for creating cell file
         main.CLIs = []
         main.ONOSip = []
+
         main.ONOSip = main.ONOSbench.getOnosIps()
         main.commit = main.ONOSbench.getVersion()
+        main.commit = main.commit.split(" ")[1]
+
         main.cluster = main.params['GLOBAL']['cluster']
 
         # Assigning ONOS cli handles to a list
@@ -482,12 +485,16 @@
             dbFileName="/tmp/SCPFbatchFlowRespData"
             dbfile = open(dbFileName, "w+")
             temp = "'" + main.commit + "',"
+            temp += "'1gig',"
             temp += "'" + str( main.scale ) + "',"
             temp += "'" + main.cluster + "',"
             temp += "'" + str( main.elapsePOST ) + "',"
             temp += "'" + str( main.POSTtoCONFRM ) + "',"
+            temp += "'" + str( main.numFlows / main.POSTtoCONFRM ) + "',"
             temp += "'" + str ( main.elapseDELETE ) + "',"
-            temp += "'" + str ( main.DELtoCONFRM ) + "'\n"
+            temp += "'" + str ( main.DELtoCONFRM ) + "',"
+            temp += "'" + str( main.numFlows / main.DELtoCONFRM ) + "',"
+            temp += "'" + str( main.numSw ) + "'\n"
             dbfile.write( temp )
             dbfile.close()
             stepResult = main.TRUE