commit | dbb95d67111d0760519b33ed0221234c8e73bf75 | [log] [tgz] |
---|---|---|
author | You Wang <you@opennetworking.org> | Wed Sep 05 15:58:08 2018 -0700 |
committer | You Wang <you@opennetworking.org> | Wed Sep 05 16:16:33 2018 -0700 |
tree | 892676ec63ad7a0d2872e84c072938c352d11f58 | |
parent | ca37a2f0fc39f6251fb755735d8cca82801deb77 [diff] |
Allow skipping onos/atomix cluster restart in TestON startup Change-Id: Ib0cb59cb1c2d2f11d792e839b3c91bb236842c56
diff --git a/TestON/tests/SAMP/SAMPstartTemplate_3node/SAMPstartTemplate_3node.params b/TestON/tests/SAMP/SAMPstartTemplate_3node/SAMPstartTemplate_3node.params index d7f8c7d..4d50882 100755 --- a/TestON/tests/SAMP/SAMPstartTemplate_3node/SAMPstartTemplate_3node.params +++ b/TestON/tests/SAMP/SAMPstartTemplate_3node/SAMPstartTemplate_3node.params
@@ -36,6 +36,7 @@ </CASE1> <CASE10> + <restartCluster>True</restartCluster> <Apps> org.onosproject.openflow </Apps>
diff --git a/TestON/tests/SAMP/SAMPstartTemplate_3node/SAMPstartTemplate_3node.py b/TestON/tests/SAMP/SAMPstartTemplate_3node/SAMPstartTemplate_3node.py index a8634ae..745fbfb 100644 --- a/TestON/tests/SAMP/SAMPstartTemplate_3node/SAMPstartTemplate_3node.py +++ b/TestON/tests/SAMP/SAMPstartTemplate_3node/SAMPstartTemplate_3node.py
@@ -84,7 +84,8 @@ main.case( "Start up " + str( main.Cluster.numCtrls ) + "-node onos cluster." ) main.step( "Start ONOS cluster with basic (drivers) app." ) - stepResult = main.testSetUp.ONOSSetUp( main.Cluster ) + main.restartCluster = True if main.params[ 'CASE10' ][ 'restartCluster' ] == 'True' else False + stepResult = main.testSetUp.ONOSSetUp( main.Cluster, restartCluster=main.restartCluster ) utilities.assert_equals( expect=main.TRUE, actual=stepResult, onpass="Successfully started basic ONOS cluster ",