on't use "cell" for persistant setups
Change-Id: I755dd43dc7730dfe155c051ea7d3c81c454a20fa
diff --git a/TestON/tests/USECASE/SegmentRouting/SRStaging/SRStaging.topo b/TestON/tests/USECASE/SegmentRouting/SRStaging/SRStaging.topo
index d4a6801..781aa97 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRStaging/SRStaging.topo
+++ b/TestON/tests/USECASE/SegmentRouting/SRStaging/SRStaging.topo
@@ -18,7 +18,7 @@
<karaf_password>karaf</karaf_password>
<web_user>karaf</web_user>
<web_pass>karaf</web_pass>
- <karafPromptUser>karaf</karafPromptUser>
+ <karafPrompt_username>karaf</karafPrompt_username>
<rest_port></rest_port>
<prompt></prompt> # TODO: we technically need a few of these, one per component
<onos_home>~/Projects/onos/</onos_home> # defines where onos home is on the target cell machine. Defaults to entry in "home" if empty.
diff --git a/TestON/tests/dependencies/ONOSSetup.py b/TestON/tests/dependencies/ONOSSetup.py
index 042eff5..20a5494 100644
--- a/TestON/tests/dependencies/ONOSSetup.py
+++ b/TestON/tests/dependencies/ONOSSetup.py
@@ -266,6 +266,7 @@
Returns:
Returns main.TRUE if it successfully executed.
"""
+ stepResult = main.TRUE
if atomixClusterSize is None:
atomixClusterSize = len( cluster.runningNodes )
if atomixClusterSize is 1:
@@ -274,11 +275,12 @@
cluster.setAtomixNodes( atomixClusterSize )
atomixIps = [ node.ipAddress for node in cluster.atomixNodes ]
main.log.info( "Atomix Cluster Size = {} ".format( atomixClusterSize ) )
- if newCell:
- cluster.createCell( cellName, cellApps, mininetIp, useSSH, onosIps,
- atomixIps, installMax )
- main.step( "Apply cell to environment" )
- stepResult = cluster.applyCell( cellName )
+ if not main.persistentSetup:
+ if newCell:
+ cluster.createCell( cellName, cellApps, mininetIp, useSSH, onosIps,
+ atomixIps, installMax )
+ main.step( "Apply cell to environment" )
+ stepResult = cluster.applyCell( cellName )
utilities.assert_equals( expect=main.TRUE,
actual=stepResult,
onpass="Successfully applied cell to " +