[ONOS-6619] Allow different bash prompts in TestON components, Also including part of ONOS-6595
Change-Id: I31c923347dd8fac018aaf47868394552a2deefbc
diff --git a/TestON/tests/FUNC/FUNCnetconf/FUNCnetconf.topo b/TestON/tests/FUNC/FUNCnetconf/FUNCnetconf.topo
index e027146..57676b1 100644
--- a/TestON/tests/FUNC/FUNCnetconf/FUNCnetconf.topo
+++ b/TestON/tests/FUNC/FUNCnetconf/FUNCnetconf.topo
@@ -9,6 +9,7 @@
<connect_order>1</connect_order>
<COMPONENTS>
<nodes>3</nodes>
+ <prompt></prompt>
</COMPONENTS>
</ONOSbench>
@@ -20,6 +21,7 @@
<type>OnosRestDriver</type>
<connect_order>2</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOSrest1>
@@ -31,6 +33,7 @@
<type>OnosRestDriver</type>
<connect_order>3</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOSrest2>
@@ -42,6 +45,7 @@
<type>OnosRestDriver</type>
<connect_order>4</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOSrest3>
@@ -51,7 +55,11 @@
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>5</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <karaf_username></karaf_username>
+ <karaf_password></karaf_password>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOScli1>
<ONOScli2>
@@ -60,7 +68,9 @@
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>6</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOScli2>
<ONOScli3>
@@ -69,7 +79,9 @@
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>7</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOScli3>
<Mininet1>
@@ -80,6 +92,7 @@
<connect_order>8</connect_order>
<COMPONENTS>
<home>~/mininet/</home>
+ <prompt></prompt>
</COMPONENTS>
</Mininet1>