[ONOS-7074]Investigate the SCPFscaleTopo
scale 40 problem..
Change-Id: Id15d3c29ffe440fd423e0a5f3f09b166ea0a2ec3
diff --git a/TestON/tests/SCPF/SCPFscaleTopo/dependencies/scaleTopoFunction.py b/TestON/tests/SCPF/SCPFscaleTopo/dependencies/scaleTopoFunction.py
index 7620354..964f0c2 100644
--- a/TestON/tests/SCPF/SCPFscaleTopo/dependencies/scaleTopoFunction.py
+++ b/TestON/tests/SCPF/SCPFscaleTopo/dependencies/scaleTopoFunction.py
@@ -70,6 +70,9 @@
except IndexError:
main.log.error( "Got wrong role request string from Tshark file" )
return -1
+ except ValueError:
+ main.log.error( "Got wrong string from log" )
+ return -1
def compareTimeDiffWithRoleRequest( main, term, Mode, index=0 ):
@@ -93,7 +96,9 @@
main.log.error( "Catch the wrong information of search term " )
main.writeData = -1
return -1
-
+ except ValueError:
+ main.log.error( "Got wrong string from log" )
+ return -1
def getInfoFromLog( main, term1, mode1, term2, mode2, index=0, funcMode='TD' ):
"""
@@ -139,7 +144,9 @@
main.log.error( "Catch the wrong information of search term" )
main.writeData = -1
return -1
-
+ except ValueError:
+ main.log.error( "Got wrong string from log" )
+ return -1
def testTopology( main, topoFile='', args='', mnCmd='', timeout=300, clean=True ):
"""
diff --git a/TestON/tests/SCPF/SCPFscaleTopo/dependencies/topo.py b/TestON/tests/SCPF/SCPFscaleTopo/dependencies/topo.py
index 373ed2b..4476dfd 100644
--- a/TestON/tests/SCPF/SCPFscaleTopo/dependencies/topo.py
+++ b/TestON/tests/SCPF/SCPFscaleTopo/dependencies/topo.py
@@ -37,14 +37,15 @@
if isinstance( hostList, list ):
for h in hostList:
main.Mininet1.arping( srcHost=h, dstHost="10.0.0.1", output=main.FALSE, noResult=True )
- time.sleep( 0.5 )
else:
main.Mininet1.arping( srcHost=hostList, dstHost="10.0.0.1", output=main.FALSE, noResult=True )
+
+def getHostNum( main ):
try:
summaryStr = ""
summaryStr = json.loads( main.Cluster.active( 0 ).CLI.summary().encode() )
hostNum = summaryStr.get( 'hosts' )
-
+ main.log.info( "host nums from ONOS : " + str( hostNum ) )
except ( TypeError, ValueError ):
main.log.exception( " Object not as expected: {!r}".format( summaryStr ) )
return -1