SAMP tests now use the same way to start ONOS as other tests
Change-Id: I2d1fb795d421ec89183cf5db45bfd917a9d7a28d
diff --git a/TestON/tests/SAMP/SAMPstartTemplate_1node/SAMPstartTemplate_1node.py b/TestON/tests/SAMP/SAMPstartTemplate_1node/SAMPstartTemplate_1node.py
index 37020b3..c940bde 100644
--- a/TestON/tests/SAMP/SAMPstartTemplate_1node/SAMPstartTemplate_1node.py
+++ b/TestON/tests/SAMP/SAMPstartTemplate_1node/SAMPstartTemplate_1node.py
@@ -34,15 +34,8 @@
test env. We want Jenkins jobs to pull&build for flexibility to handle
different versions of ONOS.
"""
- try:
- from tests.dependencies.ONOSSetup import ONOSSetup
- except ImportError:
- main.log.error( "ONOSSetup not found. exiting the test" )
- main.cleanAndExit()
- try:
- main.testSetUp
- except ( NameError, AttributeError ):
- main.testSetUp = ONOSSetup()
+ from tests.dependencies.ONOSSetup import ONOSSetup
+ main.testSetUp = ONOSSetup()
main.testSetUp.gitPulling()
def CASE1( self, main ):
@@ -51,16 +44,6 @@
Uninstall all running cells in test env defined in .topo file
"""
- try:
- from tests.dependencies.ONOSSetup import ONOSSetup
- except ImportError:
- main.log.error( "ONOSSetup not found. exiting the test" )
- main.cleanAndExit()
- try:
- main.testSetUp
- except ( NameError, AttributeError ):
- main.testSetUp = ONOSSetup()
-
main.testSetUp.envSetupDescription()
stepResult = main.FALSE
try:
@@ -95,27 +78,14 @@
3 ) configure onos via ONOSCliDriver;
"""
import time
- try:
- from tests.dependencies.ONOSSetup import ONOSSetup
- except ImportError:
- main.log.error( "ONOSSetup not found. exiting the test" )
- main.cleanAndExit()
- try:
- main.testSetUp
- except ( NameError, AttributeError ):
- main.testSetUp = ONOSSetup()
main.case( "Start up " + str( main.Cluster.numCtrls ) + "-node onos cluster." )
main.step( "Start ONOS cluster with basic (drivers) app." )
- stepResult = main.ONOSbench.startBasicONOS( nodeList=main.Cluster.getIps(),
- opSleep=200,
- onosUser=main.ONOScell.karafUser )
+ stepResult = main.testSetUp.ONOSSetUp( main.Mininet1, main.Cluster )
utilities.assert_equals( expect=main.TRUE,
actual=stepResult,
onpass="Successfully started basic ONOS cluster ",
onfail="Failed to start basic ONOS Cluster " )
- main.testSetUp.startOnosClis( main.Cluster )
-
main.step( "Activate onos apps." )
main.apps = main.params[ 'CASE10' ].get( 'Apps' )
if main.apps: