[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_3node/SAMPstartTemplate_3node.py b/TestON/tests/SAMP/SAMPstartTemplate_3node/SAMPstartTemplate_3node.py
index ba9a3cc..8d8faed 100644
--- a/TestON/tests/SAMP/SAMPstartTemplate_3node/SAMPstartTemplate_3node.py
+++ b/TestON/tests/SAMP/SAMPstartTemplate_3node/SAMPstartTemplate_3node.py
@@ -97,7 +97,8 @@
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 )
+ stepResult = main.ONOSbench.startBasicONOS( nodeList=main.ONOSip, opSleep=200,
+ 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_3node/SAMPstartTemplate_3node.topo b/TestON/tests/SAMP/SAMPstartTemplate_3node/SAMPstartTemplate_3node.topo
index 367633b..9d8298e 100755
--- a/TestON/tests/SAMP/SAMPstartTemplate_3node/SAMPstartTemplate_3node.topo
+++ b/TestON/tests/SAMP/SAMPstartTemplate_3node/SAMPstartTemplate_3node.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,9 @@
<type>OnosCliDriver</type>
<connect_order>2</connect_order>
<COMPONENTS>
+ <karaf_username></karaf_username>
+ <karaf_password></karaf_password>
+ <prompt></prompt>
</COMPONENTS>
</ONOScli1>
@@ -33,6 +37,7 @@
<type>OnosCliDriver</type>
<connect_order>3</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOScli2>
@@ -43,6 +48,7 @@
<type>OnosCliDriver</type>
<connect_order>4</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOScli3>
@@ -65,6 +71,7 @@
<type>OnosRestDriver</type>
<connect_order>6</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOSrest1>
@@ -76,6 +83,7 @@
<type>OnosRestDriver</type>
<connect_order>7</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOSrest2>
@@ -87,6 +95,7 @@
<type>OnosRestDriver</type>
<connect_order>8</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOSrest3>