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/FUNCvirNetNB/FUNCvirNetNB.py

diff --git a/TestON/tests/FUNC/FUNCvirNetNB/FUNCvirNetNB.py b/TestON/tests/FUNC/FUNCvirNetNB/FUNCvirNetNB.py
index 499aa77..7734bdd 100644
--- a/TestON/tests/FUNC/FUNCvirNetNB/FUNCvirNetNB.py
+++ b/TestON/tests/FUNC/FUNCvirNetNB/FUNCvirNetNB.py
@@ -64,7 +64,7 @@
         cellAppString = main.params[ 'ENV' ][ 'cellApps' ]
         main.ONOSbench.createCellFile( main.ONOSbench.ip_address, cellName,
                                        main.Mininet1.ip_address,
-                                       cellAppString, ipList, main.ONOScli1.user_name )
+                                       cellAppString, ipList, main.ONOScli1.karafUser )
 
         cellResult = main.ONOSbench.setCell( cellName )
         verifyResult = main.ONOSbench.verifyCell()

TestON/tests/FUNC/FUNCvirNetNB/FUNCvirNetNB.topo

diff --git a/TestON/tests/FUNC/FUNCvirNetNB/FUNCvirNetNB.topo b/TestON/tests/FUNC/FUNCvirNetNB/FUNCvirNetNB.topo
index 72a1b61..ba44745 100644
--- a/TestON/tests/FUNC/FUNCvirNetNB/FUNCvirNetNB.topo
+++ b/TestON/tests/FUNC/FUNCvirNetNB/FUNCvirNetNB.topo
@@ -8,6 +8,7 @@
             <type>OnosDriver</type>
             <connect_order>1</connect_order>
             <COMPONENTS>
+                <prompt></prompt>
             </COMPONENTS>
         </ONOSbench>
 
@@ -17,7 +18,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>
 
         <ONOS1>
@@ -26,7 +31,9 @@
             <password>rocks</password>
             <type>OnosDriver</type>
             <connect_order>3</connect_order>
-            <COMPONENTS> </COMPONENTS>
+            <COMPONENTS>
+                <prompt></prompt>
+            </COMPONENTS>
         </ONOS1>
 
         <ONOSrest>
@@ -35,7 +42,9 @@
             <password>rocks</password>
             <type>OnosRestDriver</type>
             <connect_order>4</connect_order>
-            <COMPONENTS> </COMPONENTS>
+            <COMPONENTS>
+                <prompt></prompt>
+            </COMPONENTS>
         </ONOSrest>
 
         <Mininet1>
@@ -46,6 +55,7 @@
             <connect_order>5</connect_order>
             <COMPONENTS>
                 <controller> none </controller>
+                <prompt></prompt>
             </COMPONENTS>
         </Mininet1>