commit dc78e201cd28657da9cd0644f00fcc45c78d84a2
author Devin Lim <devin@onlab.us> Fri Jun 09 18:30:07 2017 -0700
committer Devin Lim <devin@onlab.us> Mon Jun 12 17:13:04 2017 -0700
tree 4ff6817b39e60f6deaf2fe39ddf10dce25b38a8d
parent 7b60dcbb1f40ef92849bdc8a7774e023dd59ae02

[ONOS-6619] Allow different bash prompts in TestON components, Also including part of ONOS-6595

Change-Id: I31c923347dd8fac018aaf47868394552a2deefbc

TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.topo

diff --git a/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.topo b/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.topo
index 8373f13..7b01b63 100644
--- a/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.topo
+++ b/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.topo
@@ -10,7 +10,8 @@
             <connect_order>1</connect_order>
             <COMPONENTS>
                 <home>~/onos</home>
-                <nodes>7</nodes> 
+                <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>
 
         <Mininet1>
@@ -98,6 +117,7 @@
                 <arg3> --switch ovsk,protocols=OpenFlow13</arg3>
                 <controller> remote </controller>
                 <home>~/mininet/custom/</home>
+                <prompt></prompt>
             </COMPONENTS>
         </Mininet1>