Merge "bug fix, portResultDB file is no longer deleted by sudo mn -c"
diff --git a/TestON/tests/SCPFportLat/SCPFportLat.params b/TestON/tests/SCPFportLat/SCPFportLat.params
index 00c8c19..bc3d704 100644
--- a/TestON/tests/SCPFportLat/SCPFportLat.params
+++ b/TestON/tests/SCPFportLat/SCPFportLat.params
@@ -59,12 +59,12 @@
</topoConfigName>
#Number of times to iterate each case
- <numIter>2</numIter>
+ <numIter>25</numIter>
<numSwitch>2</numSwitch>
#Number of iterations to ignore initially
- <iterIgnore>0</iterIgnore>
+ <iterIgnore>5</iterIgnore>
- <portUpThreshold>0,1000</portUpThreshold>
+ <portUpThreshold>0,5000</portUpThreshold>
<portDownThreshold>0,1000</portDownThreshold>
<tabletFile>tablets_3node.json</tabletFile>
diff --git a/TestON/tests/SCPFportLat/SCPFportLat.py b/TestON/tests/SCPFportLat/SCPFportLat.py
index 9c75cb8..66e8228 100644
--- a/TestON/tests/SCPFportLat/SCPFportLat.py
+++ b/TestON/tests/SCPFportLat/SCPFportLat.py
@@ -32,7 +32,7 @@
homeDir = os.path.expanduser('~')
topoCfgFile = main.params['TEST']['topoConfigFile']
topoCfgName = main.params['TEST']['topoConfigName']
- portEventResultPath = main.params['DB']['portEventResultPath']
+ resultPath = main.params['DB']['portEventResultPath']
skipMvn = main.params ['TEST']['mci']
testONpath = os.getcwd() #testON/bin
@@ -90,7 +90,7 @@
commit = (commit.split(" "))[1]
main.step("Creating results file")
- resultsDB = open("IntentEventTPDB", "w+")
+ resultsDB = open(resultPath, "w+")
resultsDB.close()
main.log.report('Commit information - ')
@@ -137,10 +137,6 @@
main.step('Starting mininet topology ')
main.Mininet1.startNet()
- main.step('Clearing previous DB log file')
- fPortLog = open(portEventResultPath, 'w+')
- fPortLog.close()
-
main.log.report( "Initializeing " + str( clusterCount ) + " node cluster." )
for node in range(clusterCount):
main.log.info("Starting ONOS " + str(node) + " at IP: " + ONOSIp[node])
@@ -352,6 +348,8 @@
main.Mininet1.handle.sendline('sh ifconfig ' + interfaceConfig + ' up')
main.Mininet1.handle.expect('mininet>')
+ time.sleep(5)
+
jsonStrPtUp = []
for node in range (0, clusterCount):
metricsPortUp = CLIs[node].topologyEventsMetrics()
@@ -391,7 +389,7 @@
linkTimestamp = 0
- main.log.info('ptDownTimestamp: ' + str(timestampBeginPtDown))
+ main.log.info('ptUpTimestamp: ' + str(timestampBeginPtUp))
main.log.info("graphTimestamp: " + str(graphTimestamp))
main.log.info("deviceTimestamp: " + str(deviceTimestamp))
main.log.info("linkTimestamp: " + str(linkTimestamp))