commit 6437c9ccd2de6b4bbc78f6907845bffd6f6ba267
author Devin Lim <devin@opennetworking.org> Mon Jan 29 17:24:16 2018 -0800
committer Devin Lim <devin@opennetworking.org> Mon Jan 29 17:24:16 2018 -0800
tree d4061b5cf99cadfdb30082ace6b299246444994f
parent a6771b3fb53ee825df6c020dcff13fe58465fa4e

redesign the ONOSSetup steps

Change-Id: I6e1dadc94a240c45e9fe0137d1b6cfce71ebac15

TestON/tests/dependencies/ONOSSetup.py

diff --git a/TestON/tests/dependencies/ONOSSetup.py b/TestON/tests/dependencies/ONOSSetup.py
index 98f1d5b..cbf7f8c 100644
--- a/TestON/tests/dependencies/ONOSSetup.py
+++ b/TestON/tests/dependencies/ONOSSetup.py
@@ -355,7 +355,7 @@
     def ONOSSetUp( self, cluster, hasMultiNodeRounds=False, startOnos=True, newCell=True,
                    cellName="temp", cellApps="drivers", mininetIp="", removeLog=False, extraApply=None, applyArgs=None,
                    extraClean=None, cleanArgs=None, skipPack=False, installMax=False, useSSH=True,
-                   killRemoveMax=True, stopOnos=False, installParallel=True ):
+                   killRemoveMax=True, stopOnos=False, installParallel=True, cellApply=True ):
         """
         Description:
             Initial ONOS setting up of the tests. It will also verify the result of each steps.
@@ -405,9 +405,8 @@
         main.log.info( "NODE COUNT = " + str( cluster.numCtrls ) )
         cellResult = main.TRUE
         packageResult = main.TRUE
-        onosUninstallResult = main.TRUE
         onosCliResult = main.TRUE
-        if not skipPack:
+        if cellApply:
             tempOnosIp = []
             for ctrl in cluster.runningNodes:
                 tempOnosIp.append( ctrl.ipAddress )
@@ -421,13 +420,15 @@
                                                cellName, cellApps,
                                                mininetIp, useSSH,
                                                tempOnosIp, installMax )
-            if removeLog:
-                main.log.info( "Removing raft logs" )
-                main.ONOSbench.onosRemoveRaftLogs()
 
-            onosUninstallResult = self.uninstallOnos( cluster, killRemoveMax )
-            self.processList( extraApply, applyArgs )
-            packageResult = self.buildOnos( cluster )
+        if removeLog:
+            main.log.info("Removing raft logs")
+            main.ONOSbench.onosRemoveRaftLogs()
+        onosUninstallResult = self.uninstallOnos( cluster, killRemoveMax )
+        self.processList( extraApply, applyArgs )
+
+        if not skipPack:
+            packageResult = self.buildOnos(cluster)
 
         onosInstallResult = self.installOnos( cluster, installMax, installParallel )