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/FUNC/FUNCoptical/FUNCoptical.py

diff --git a/TestON/tests/FUNC/FUNCoptical/FUNCoptical.py b/TestON/tests/FUNC/FUNCoptical/FUNCoptical.py
index 1e68327..c2a3483 100644
--- a/TestON/tests/FUNC/FUNCoptical/FUNCoptical.py
+++ b/TestON/tests/FUNC/FUNCoptical/FUNCoptical.py
@@ -123,7 +123,7 @@
 
         main.ONOSbench.createCellFile( main.ONOSbench.ip_address,
                                        "temp", main.Mininet1.ip_address,
-                                       main.apps, tempOnosIp, main.ONOScli1.user_name )
+                                       main.apps, tempOnosIp, main.ONOScli1.karafUser )
 
         main.step( "Apply cell to environment" )
         cellResult = main.ONOSbench.setCell( "temp" )

TestON/tests/FUNC/FUNCoptical/FUNCoptical.topo

diff --git a/TestON/tests/FUNC/FUNCoptical/FUNCoptical.topo b/TestON/tests/FUNC/FUNCoptical/FUNCoptical.topo
index c8037cd..72629b9 100755
--- a/TestON/tests/FUNC/FUNCoptical/FUNCoptical.topo
+++ b/TestON/tests/FUNC/FUNCoptical/FUNCoptical.topo
@@ -9,6 +9,7 @@
             <connect_order>1</connect_order>
             <COMPONENTS>
                 <nodes>3</nodes>
+                <prompt></prompt>
             </COMPONENTS>
         </ONOSbench>
 
@@ -18,7 +19,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>
@@ -27,7 +32,9 @@
             <password>rocks</password>
             <type>OnosCliDriver</type>
             <connect_order>3</connect_order>
-            <COMPONENTS> </COMPONENTS>
+            <COMPONENTS>
+                <prompt></prompt>
+            </COMPONENTS>
         </ONOScli2>
 
          <ONOScli3>
@@ -36,7 +43,9 @@
             <password>rocks</password>
             <type>OnosCliDriver</type>
             <connect_order>4</connect_order>
-            <COMPONENTS> </COMPONENTS>
+            <COMPONENTS>
+                <prompt></prompt>
+            </COMPONENTS>
         </ONOScli3>
 
         <Mininet1>
@@ -47,6 +56,7 @@
             <connect_order>5</connect_order>
             <COMPONENTS>
                 <home>~/mininet/custom/</home>
+                <prompt></prompt>
             </COMPONENTS>
         </Mininet1>
 
@@ -57,6 +67,7 @@
             <type>LincOEMininetDriver</type>
             <connect_order>7</connect_order>
             <COMPONENTS>
+                <prompt></prompt>
             </COMPONENTS>
         </LincOE>