commit 2d862227e5ec23b0d9adcb9105e2de4f1735522d
author Jon Hall <jhall@onlab.us> Thu Oct 22 16:16:37 2015 +0000
committer Gerrit Code Review <gerrit@onlab.us> Thu Oct 22 16:16:37 2015 +0000
tree 2994329309df8a4b922735f945eb6e40db36c560
parent 6ac11b164ffb2078f27071afeb84a1630d45d6d1
parent ed2122eaff2676b11067486f6a7e31d07ab4dffc

Merge "Always bringing down ONOS node 3 and increased the pingall timeout."

TestON/tests/SCPFscaleTopo/SCPFscaleTopo.params

diff --git a/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.params b/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.params
index c6b9b40..1e8635e 100755
--- a/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.params
+++ b/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.params
@@ -44,7 +44,7 @@
     </SLEEP>
 
     <TIMEOUT>
-        <pingall>60</pingall>
+        <pingall>1000</pingall>
     </TIMEOUT>
 
     <TOPOLOGY>

TestON/tests/SCPFscaleTopo/SCPFscaleTopo.py

diff --git a/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.py b/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.py
index b094c4b..b44d482 100644
--- a/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.py
+++ b/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.py
@@ -390,16 +390,15 @@
 
     def CASE200( self, main ):
         '''
-            Bring random node down
+            Bring third node down
         '''
-        import random
-        main.case( "Randomly stopping an ONOS service" )
-        main.step( "Bringing down an onos node" )
+        main.case( "Stopping an ONOS service" )
+        main.step( "Bringing down node 3" )
 
-        random.seed()
-        # Get the random index of the node
-        main.deadNode = random.randrange(0,main.numCtrls)
+        # Always bring down the third node
+        main.deadNode = 2
 
+        # Printing purposes
         node = main.deadNode + 1
 
         main.log.info( "deadnode: %s" % node )