commit 461f0872e922af0a79f48643a59ca17fda06e7c0
author Devin Lim <devin@onlab.us> Mon Jun 05 16:49:33 2017 -0700
committer Devin Lim <devin@onlab.us> Tue Jun 06 17:40:26 2017 -0700
tree 8c2bef053a8bf389eb38865233a4cebbf8bc5a62
parent ffff6f6b40fd971e37e96e7390d4b6d70bb6c805

[ONOS-6595] Allow TestOn to run with non-default username

Change-Id: Ia88e0435c81b39582ad3125ece5a60ea69b0e9db

TestON/tests/FUNC/FUNCnetCfg/FUNCnetCfg.py

diff --git a/TestON/tests/FUNC/FUNCnetCfg/FUNCnetCfg.py b/TestON/tests/FUNC/FUNCnetCfg/FUNCnetCfg.py
index bb280d8..2c420aa 100644
--- a/TestON/tests/FUNC/FUNCnetCfg/FUNCnetCfg.py
+++ b/TestON/tests/FUNC/FUNCnetCfg/FUNCnetCfg.py
@@ -146,7 +146,7 @@
 
         main.ONOSbench.createCellFile( main.ONOSbench.ip_address,
                                        "temp", main.Mininet1.ip_address,
-                                       main.apps, tempOnosIp )
+                                       main.apps, tempOnosIp, main.ONOScli1.user_name )
 
         main.step( "Apply cell to environment" )
         cellResult = main.ONOSbench.setCell( "temp" )

TestON/tests/FUNC/FUNCnetCfg/FUNCnetCfg.topo

diff --git a/TestON/tests/FUNC/FUNCnetCfg/FUNCnetCfg.topo b/TestON/tests/FUNC/FUNCnetCfg/FUNCnetCfg.topo
index 4204c78..591e2cd 100755
--- a/TestON/tests/FUNC/FUNCnetCfg/FUNCnetCfg.topo
+++ b/TestON/tests/FUNC/FUNCnetCfg/FUNCnetCfg.topo
@@ -11,6 +11,36 @@
             </COMPONENTS>
         </ONOSbench>
 
+        <ONOScli1>
+            <host>localhost</host>
+            <user>sdn</user>
+            <password>rocks</password>
+            <type>OnosCliDriver</type>
+            <connect_order>2</connect_order>
+            <COMPONENTS>
+            </COMPONENTS>
+        </ONOScli1>
+
+        <ONOScli2>
+            <host>localhost</host>
+            <user>sdn</user>
+            <password>rocks</password>
+            <type>OnosCliDriver</type>
+            <connect_order>3</connect_order>
+            <COMPONENTS>
+            </COMPONENTS>
+        </ONOScli2>
+
+         <ONOScli3>
+            <host>localhost</host>
+            <user>sdn</user>
+            <password>rocks</password>
+            <type>OnosCliDriver</type>
+            <connect_order>4</connect_order>
+            <COMPONENTS>
+            </COMPONENTS>
+        </ONOScli3>
+
         <ONOSrest1>
             <host>OC1</host>
             <port>8181</port>