commit 4c207b3a5c73cb41764584ca3fb5bfc146e3aad6
author You Wang <you@opennetworking.org> Thu Aug 23 23:29:49 2018 +0000
committer Gerrit Code Review <gerrit@onosproject.org> Thu Aug 23 23:29:49 2018 +0000
tree 27c615d7b2a00881b9c414cf7448c3dbab514bc8
parent 7288cb33a283abd353ebb82991dfbb0abdee22ab
parent f0854211327d3c5bdcff967e862aea3c7a0bb820

Merge "Activate intentperf app later to make sure that it gets all cluster nodes"

TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.params

diff --git a/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.params b/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.params
index ad3099e..c295a18 100644
--- a/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.params
+++ b/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.params
@@ -11,7 +11,7 @@
 
     <ENV>
     <cellName>intentTP</cellName>
-    <cellApps>drivers,null,intentperf</cellApps>
+    <cellApps>drivers,null</cellApps>
     </ENV>
 
     <SCALE>1,3,3,5,5,7,7</SCALE>

TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.py

diff --git a/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.py b/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.py
index bdd9dd7..327a60f 100644
--- a/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.py
+++ b/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.py
@@ -118,7 +118,11 @@
 
     def CASE2( self, main ):
         import numpy
-
+        # If we activate intentperf from the cell, there's chance that it doesn't get all cluster
+        # nodes when some of the nodes have a large startup delay
+        main.log.info( "Activate intentperf app" )
+        main.Cluster.active( 0 ).CLI.app( "intentperf", "activate" )
+        time.sleep( 5 )
         main.log.info( "Cluster Count = " + str( main.Cluster.numCtrls ) )
         neighbors = '0' if main.neighbor.pop( 0 ) == '0' else str( main.Cluster.numCtrls - 1 )
         main.log.info( "Neighbors: " + neighbors )