Moved import dependency to main scope and minor checks added
diff --git a/TestON/tests/FuncPlatform/Dependency/App.py b/TestON/tests/FuncPlatform/Dependency/App.py
index 3e205d6..5410c32 100644
--- a/TestON/tests/FuncPlatform/Dependency/App.py
+++ b/TestON/tests/FuncPlatform/Dependency/App.py
@@ -43,6 +43,10 @@
main.log.error( 'There was an error with the key '+
str(app) + '. Check the appList dictionary' )
return main.FALSE
+ except Exception:
+ main.log.error( 'Uncaught exception error while ' +
+ 'activating applications: ' + str(app) )
+ return main.FALSE
return main.TRUE
diff --git a/TestON/tests/FuncPlatform/Dependency/Startup.py b/TestON/tests/FuncPlatform/Dependency/Startup.py
index 97b4dd7..f3f90a9 100644
--- a/TestON/tests/FuncPlatform/Dependency/Startup.py
+++ b/TestON/tests/FuncPlatform/Dependency/Startup.py
@@ -199,9 +199,15 @@
'onos-service server command ' +
str( main.ONOSnode[node].handle.before ) )
return main.FALSE
+
+ iu = main.TRUE
+ for node in nodeIps:
+ iu = iu and main.ONOSbench.isup( node )
- # TODO: Check for startup (isup)
- return main.TRUE
+ if iu == main.TRUE:
+ return main.TRUE
+ else:
+ return main.FALSE
def addAndStartOnosNode( nodeIps ):
"""