[ONOS-6619] Allow different bash prompts in TestON components, Also including part of ONOS-6595
Change-Id: I31c923347dd8fac018aaf47868394552a2deefbc
diff --git a/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.topo b/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.topo
index 226657f..dfe92bc 100644
--- a/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.topo
+++ b/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.topo
@@ -11,6 +11,7 @@
<COMPONENTS>
<home>~/onos</home>
<nodes>7</nodes>
+ <prompt></prompt>
</COMPONENTS>
</ONOSbench>
@@ -20,7 +21,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>
@@ -29,7 +34,9 @@
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>3</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOScli2>
<ONOScli3>
@@ -38,7 +45,9 @@
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>4</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOScli3>
<ONOScli4>
@@ -47,7 +56,9 @@
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>5</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOScli4>
<ONOScli5>
@@ -56,7 +67,9 @@
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>6</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOScli5>
<ONOScli6>
@@ -65,7 +78,9 @@
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>7</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOScli6>
<ONOScli7>
@@ -74,7 +89,9 @@
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>8</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOScli7>
<ONOS1>
@@ -83,7 +100,9 @@
<password>rocks</password>
<type>OnosDriver</type>
<connect_order>9</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOS1>
<ONOS2>
@@ -92,7 +111,9 @@
<password>rocks</password>
<type>OnosDriver</type>
<connect_order>10</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOS2>
<ONOS3>
@@ -101,7 +122,9 @@
<password>rocks</password>
<type>OnosDriver</type>
<connect_order>11</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOS3>
<ONOS4>
@@ -110,7 +133,9 @@
<password>rocks</password>
<type>OnosDriver</type>
<connect_order>12</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOS4>
@@ -120,7 +145,9 @@
<password>rocks</password>
<type>OnosDriver</type>
<connect_order>13</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOS5>
<ONOS6>
@@ -129,7 +156,9 @@
<password>rocks</password>
<type>OnosDriver</type>
<connect_order>14</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOS6>
<ONOS7>
@@ -138,7 +167,9 @@
<password>rocks</password>
<type>OnosDriver</type>
<connect_order>15</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOS7>
</COMPONENT>