[ONOS-6619] Allow different bash prompts in TestON components, Also including part of ONOS-6595
Change-Id: I31c923347dd8fac018aaf47868394552a2deefbc
diff --git a/TestON/tests/SAMP/SAMPstartTemplate_1node/SAMPstartTemplate_1node.py b/TestON/tests/SAMP/SAMPstartTemplate_1node/SAMPstartTemplate_1node.py
index a0e3e7b..96ac3d8 100644
--- a/TestON/tests/SAMP/SAMPstartTemplate_1node/SAMPstartTemplate_1node.py
+++ b/TestON/tests/SAMP/SAMPstartTemplate_1node/SAMPstartTemplate_1node.py
@@ -98,7 +98,7 @@
main.case( "Start up " + str( main.numCtrls ) + "-node onos cluster.")
main.step( "Start ONOS cluster with basic (drivers) app.")
stepResult = main.ONOSbench.startBasicONOS( nodeList=main.ONOSip, opSleep=200,
- onosUser=main.ONOScli1.user_name )
+ onosUser=main.ONOScli1.karafUser )
utilities.assert_equals( expect=main.TRUE,
actual=stepResult,
onpass="Successfully started basic ONOS cluster ",
diff --git a/TestON/tests/SAMP/SAMPstartTemplate_1node/SAMPstartTemplate_1node.topo b/TestON/tests/SAMP/SAMPstartTemplate_1node/SAMPstartTemplate_1node.topo
index cda1ed6..3cea19b 100755
--- a/TestON/tests/SAMP/SAMPstartTemplate_1node/SAMPstartTemplate_1node.topo
+++ b/TestON/tests/SAMP/SAMPstartTemplate_1node/SAMPstartTemplate_1node.topo
@@ -13,6 +13,7 @@
<connect_order>1</connect_order>
<COMPONENTS>
<home></home> #defines where onos home is
+ <prompt></prompt>
</COMPONENTS>
</ONOSbench>
@@ -23,6 +24,7 @@
<type>OnosCliDriver</type>
<connect_order>2</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOScli1>
@@ -34,6 +36,7 @@
<connect_order>5</connect_order>
<COMPONENTS>
<home>~/mininet/custom/</home>
+ <prompt></prompt>
</COMPONENTS>
</Mininet1>
@@ -45,6 +48,7 @@
<type>OnosRestDriver</type>
<connect_order>6</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOSrest1>