[ONOS-6619] Allow different bash prompts in TestON components, Also including part of ONOS-6595
Change-Id: I31c923347dd8fac018aaf47868394552a2deefbc
diff --git a/TestON/tests/FUNC/FUNCintent/FUNCintent.topo b/TestON/tests/FUNC/FUNCintent/FUNCintent.topo
index 500fc3c..7f0a7f7 100755
--- a/TestON/tests/FUNC/FUNCintent/FUNCintent.topo
+++ b/TestON/tests/FUNC/FUNCintent/FUNCintent.topo
@@ -9,6 +9,7 @@
<connect_order>1</connect_order>
<COMPONENTS>
<nodes>3</nodes>
+ <prompt></prompt>
</COMPONENTS>
</ONOSbench>
@@ -18,7 +19,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>
<ONOScli2>
@@ -27,7 +32,9 @@
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>3</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOScli2>
<ONOScli3>
@@ -36,7 +43,9 @@
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>4</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOScli3>
<Mininet1>
@@ -47,6 +56,7 @@
<connect_order>5</connect_order>
<COMPONENTS>
<home>~/mininet/</home>
+ <prompt></prompt>
</COMPONENTS>
</Mininet1>
@@ -56,6 +66,9 @@
<password>rocks</password>
<type>ScapyCliDriver</type>
<connect_order>6</connect_order>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</Scapy1>
</COMPONENT>