commit 7bb9c467a1c0edfd05f58903821a41fbca0a21b1
author You Wang <you@onlab.us> Wed Aug 10 14:18:16 2016 -0700
committer You Wang <you@onlab.us> Wed Aug 10 14:18:16 2016 -0700
tree 0bedee7d9d2becf40fafacfd2ba011310f1d4ec2
parent ce7e5130ec4f437b011a178bfcde0455e21707e1

Fix and speed up SCPFscaleTopo test a little

Change-Id: Ib4af5565f41a8c8cd933815016e00d84bb89f887

TestON/tests/SCPF/SCPFscaleTopo/SCPFscaleTopo.params

diff --git a/TestON/tests/SCPF/SCPFscaleTopo/SCPFscaleTopo.params b/TestON/tests/SCPF/SCPFscaleTopo/SCPFscaleTopo.params
index c27398d..0abc6b7 100755
--- a/TestON/tests/SCPF/SCPFscaleTopo/SCPFscaleTopo.params
+++ b/TestON/tests/SCPF/SCPFscaleTopo/SCPFscaleTopo.params
@@ -38,7 +38,7 @@
         <nodeSleep>10</nodeSleep>
         <pingall>15</pingall>
         <MNsleep>60</MNsleep>
-        <host>0.2</host>
+        <host>0</host>
     </SLEEP>
 
     <TIMEOUT>

TestON/tests/SCPF/SCPFscaleTopo/SCPFscaleTopo.py

diff --git a/TestON/tests/SCPF/SCPFscaleTopo/SCPFscaleTopo.py b/TestON/tests/SCPF/SCPFscaleTopo/SCPFscaleTopo.py
index 14f8635..e8e5b94 100644
--- a/TestON/tests/SCPF/SCPFscaleTopo/SCPFscaleTopo.py
+++ b/TestON/tests/SCPF/SCPFscaleTopo/SCPFscaleTopo.py
@@ -335,10 +335,10 @@
                         break
                 if totalHost == int( main.currScale ) *  int( main.currScale ):
                     main.log.info( "Discovered all hosts" )
-                    stepResult = stepResult and True
+                    stepResult = stepResult and main.TRUE
                 else:
                     main.log.warn( "Some hosts ware not discovered by ONOS... Topology doesn't match!" )
-                    stepResult = False
+                    stepResult = main.FALSE
                 utilities.assert_equals(expect=main.TRUE,
                                         actual=stepResult,
                                         onpass=" Topology match Mininet",