[ONOS-6619] Allow different bash prompts in TestON components, Also including part of ONOS-6595
Change-Id: I31c923347dd8fac018aaf47868394552a2deefbc
diff --git a/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.topo b/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.topo
index 8e58be7..cb54fe8 100755
--- a/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.topo
+++ b/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.topo
@@ -10,7 +10,8 @@
<connect_order>1</connect_order>
<COMPONENTS>
<home>~/onos</home>
- <nodes>7</nodes>
+ <nodes>7</nodes>
+ <prompt></prompt>
</COMPONENTS>
</ONOSbench>
@@ -22,6 +23,7 @@
<type>OnosRestDriver</type>
<connect_order>3</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOSrest1>
<ONOScli1>
@@ -30,7 +32,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>
@@ -39,7 +45,9 @@
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>3</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOScli2>
<ONOScli3>
@@ -48,7 +56,9 @@
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>4</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOScli3>
<ONOScli4>
@@ -57,7 +67,9 @@
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>5</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOScli4>
<ONOScli5>
@@ -66,7 +78,9 @@
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>6</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOScli5>
<ONOScli6>
@@ -75,7 +89,9 @@
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>7</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOScli6>
<ONOScli7>
@@ -84,7 +100,9 @@
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>8</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOScli7>
<Mininet1>
@@ -94,6 +112,7 @@
<type>MininetCliDriver</type>
<connect_order>5</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</Mininet1>