commit 58046fa4b5b32b672ba6dbe87110a37466694efe
author Devin Lim <devin@onlab.us> Wed Jul 05 16:55:00 2017 -0700
committer Devin Lim <devin@opennetworking.org> Wed Jul 19 13:00:50 2017 -0700
tree feb60de7d8ef8c5052368c1737ec0ee5b140f6e8
parent 197fd465a217c4942c13f119562bec90d666ce70

[ONOS-6593]Review and Refactor ONOS startup procedures in TestON

Change-Id: I509a8ee7a26c198957bebf59da5c85a0edb8b995

TestON/core/teston.py

diff --git a/TestON/core/teston.py b/TestON/core/teston.py
index ebe8c1d..e4dde6e 100644
--- a/TestON/core/teston.py
+++ b/TestON/core/teston.py
@@ -54,7 +54,6 @@
 from core.utilities import Utilities
 from core.Thread import Thread
 
-
 class TestON:
     '''
     TestON will initiate the specified test.
@@ -860,20 +859,23 @@
     # Verifying onoscell option
     if options.onoscell:
         main.onoscell = options.onoscell
-        main.onosIPs = []
+        main.ONOSip = []
         main.mnIP = ""
-        cellCMD = ". ~/.profile; cell " + main.onoscell
+        cellCMD = ". ~/onos/tools/dev/bash_profile; cell " + main.onoscell
         output = subprocess.check_output( ["bash", '-c', cellCMD] )
         splitOutput = output.splitlines()
+        main.apps = ""
         for i in range( len( splitOutput ) ):
             if re.match( "OCN", splitOutput[i] ):
                 mnNode = splitOutput[i].split( "=" )
                 main.mnIP = mnNode[1]
             # cell already sorts OC variables in bash, so no need to
             # sort in TestON
-            if re.match( "OC[1-9]", splitOutput[i] ):
+            elif re.match( "OC[1-9]", splitOutput[i] ):
                 onosNodes = splitOutput[i].split( "=" )
-                main.onosIPs.append( onosNodes[1] )
+                main.ONOSip.append( onosNodes[1] )
+            elif re.match( "ONOS_APPS", splitOutput[i] ):
+                main.apps = ( splitOutput[i].split( "=" ) )[1]
     else:
         main.onoscell = main.FALSE