Fix a small bug for DataBase file
Change-Id: If92bddd4b44bc70e3e897002f5a821a97a6f1c57
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>
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