[ONOS-6619] Allow different bash prompts in TestON components, Also including part of ONOS-6595
Change-Id: I31c923347dd8fac018aaf47868394552a2deefbc
diff --git a/TestON/tests/FUNC/FUNCbgpls/FUNCbgpls.topo b/TestON/tests/FUNC/FUNCbgpls/FUNCbgpls.topo
index 17debe1..c59caec 100755
--- a/TestON/tests/FUNC/FUNCbgpls/FUNCbgpls.topo
+++ b/TestON/tests/FUNC/FUNCbgpls/FUNCbgpls.topo
@@ -8,6 +8,7 @@
<type>OnosDriver</type>
<connect_order>1</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOSbench>
@@ -17,7 +18,11 @@
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>2</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <karaf_username></karaf_username>
+ <karaf_password></karaf_password>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOScli1>
<ONOS1>
@@ -26,7 +31,9 @@
<password>rocks</password>
<type>OnosDriver</type>
<connect_order>3</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOS1>
<ONOSrest>
@@ -37,7 +44,9 @@
<password>rocks</password>
<type>OnosRestDriver</type>
<connect_order>4</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOSrest>
<Scapy1>
@@ -46,6 +55,9 @@
<password>rocks</password>
<type>ScapyCliDriver</type>
<connect_order>5</connect_order>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</Scapy1>
</COMPONENT>