[ONOS-7765] Run SRMulticast test case 1 on Flex POD
Change-Id: I854d0ddf55754fd89ae8b29709e1589674c0a5fc
diff --git a/TestON/tests/dependencies/ONOSSetup.py b/TestON/tests/dependencies/ONOSSetup.py
index 66d104d..fc6ceab 100644
--- a/TestON/tests/dependencies/ONOSSetup.py
+++ b/TestON/tests/dependencies/ONOSSetup.py
@@ -517,14 +517,9 @@
" node(s) ONOS cluster" )
main.caseExplanation = "Set up ONOS with " + str( cluster.numCtrls ) + \
" node(s) ONOS cluster"
- atomixKillResult = self.killingAllAtomix( cluster, killRemoveMax, stopAtomix )
- onosKillResult = self.killingAllOnos( cluster, killRemoveMax, stopOnos )
- killResult = atomixKillResult and onosKillResult
main.log.info( "NODE COUNT = " + str( cluster.numCtrls ) )
cellResult = main.TRUE
- packageResult = main.TRUE
- onosCliResult = main.TRUE
if cellApply:
try:
apps = main.apps
@@ -545,6 +540,10 @@
mininetIp, useSSH,
tempOnosIp, installMax )
+ atomixKillResult = self.killingAllAtomix( cluster, killRemoveMax, stopAtomix )
+ onosKillResult = self.killingAllOnos( cluster, killRemoveMax, stopOnos )
+ killResult = atomixKillResult and onosKillResult
+
if removeLog:
main.log.info("Removing raft logs")
main.ONOSbench.onosRemoveRaftLogs()
@@ -553,6 +552,7 @@
uninstallResult = atomixUninstallResult and onosUninstallResult
self.processList( extraApply, applyArgs )
+ packageResult = main.TRUE
if not skipPack:
packageResult = self.buildOnos(cluster)
@@ -565,6 +565,7 @@
onosServiceResult = self.checkOnosService( cluster )
+ onosCliResult = main.TRUE
if startOnos:
onosCliResult = self.startOnosClis( cluster )