[ONOS-6619] Allow different bash prompts in TestON components, Also including part of ONOS-6595
Change-Id: I31c923347dd8fac018aaf47868394552a2deefbc
diff --git a/TestON/tests/USECASE/USECASE_SdnipFunctionCluster/USECASE_SdnipFunctionCluster.topo b/TestON/tests/USECASE/USECASE_SdnipFunctionCluster/USECASE_SdnipFunctionCluster.topo
index 0daf513..a666721 100644
--- a/TestON/tests/USECASE/USECASE_SdnipFunctionCluster/USECASE_SdnipFunctionCluster.topo
+++ b/TestON/tests/USECASE/USECASE_SdnipFunctionCluster/USECASE_SdnipFunctionCluster.topo
@@ -7,7 +7,9 @@
<password>rocks</password>
<type>OnosDriver</type>
<connect_order>1</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOSbench>
<ONOScli1>
@@ -16,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>
<ONOScli2>
<host>127.0.0.1</host>
@@ -24,7 +30,9 @@
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>3</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOScli2>
<ONOScli3>
<host>127.0.0.1</host>
@@ -32,7 +40,9 @@
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>3</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOScli3>
<QuaggaCliSpeaker1>
@@ -41,7 +51,9 @@
<password>rocks</password>
<type>QuaggaCliDriver</type>
<connect_order>4</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</QuaggaCliSpeaker1>
<Mininet>
@@ -52,6 +64,7 @@
<connect_order>5</connect_order>
<COMPONENTS>
<home>~/Mininet/mininet/custom/</home>
+ <prompt></prompt>
</COMPONENTS>
</Mininet>