[ONOS-6595] Allow TestOn to run with non-default username
Change-Id: Ia88e0435c81b39582ad3125ece5a60ea69b0e9db
diff --git a/TestON/tests/SCPF/SCPFcbench/SCPFcbench.py b/TestON/tests/SCPF/SCPFcbench/SCPFcbench.py
index fee655b..ddadce2 100644
--- a/TestON/tests/SCPF/SCPFcbench/SCPFcbench.py
+++ b/TestON/tests/SCPF/SCPFcbench/SCPFcbench.py
@@ -96,7 +96,8 @@
print "Cellname is: "+ cellName + "ONOS IP is: " + str(ONOSIp)
- main.ONOSbench.createCellFile(BENCHIp,cellName,MN1Ip,cellApps,[ONOSIp[1]])
+ main.ONOSbench.createCellFile(BENCHIp, cellName, MN1Ip,
+ cellApps, [ONOSIp[1]], main.ONOScli1.user_name)
main.step( "Set Cell" )
main.ONOSbench.setCell(cellName)
diff --git a/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.py b/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.py
index 93bbee7..523a285 100644
--- a/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.py
+++ b/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.py
@@ -103,7 +103,8 @@
for node in range (1, clusterCount + 1):
cellIp.append(ONOSIp[node])
- main.ONOSbench.createCellFile(BENCHIp,cellName,"localhost",str(Apps), cellIp)
+ main.ONOSbench.createCellFile(BENCHIp, cellName, "localhost",
+ str(Apps), cellIp, main.ONOScli1.user_name)
main.log.info("Cell Ip list: " + str(cellIp))
main.step( "Set Cell" )
diff --git a/TestON/tests/SCPF/SCPFhostLat/SCPFhostLat.py b/TestON/tests/SCPF/SCPFhostLat/SCPFhostLat.py
index 12b93e6..c221887 100644
--- a/TestON/tests/SCPF/SCPFhostLat/SCPFhostLat.py
+++ b/TestON/tests/SCPF/SCPFhostLat/SCPFhostLat.py
@@ -129,7 +129,8 @@
"temp",
main.Mininet1.ip_address,
main.apps,
- tempOnosIp )
+ tempOnosIp,
+ main.ONOScli1.user_name )
main.step( "Apply cell to environment" )
cellResult = main.ONOSbench.setCell( "temp" )
diff --git a/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.py b/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.py
index f77342a..36fa781 100644
--- a/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.py
+++ b/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.py
@@ -128,7 +128,8 @@
main.cellName,
main.MN1Ip,
main.Apps,
- main.ONOSip)
+ main.ONOSip,
+ main.ONOScli1.user_name )
main.step( "Apply cell to environment" )
cellResult = main.ONOSbench.setCell( main.cellName )
verifyResult = main.ONOSbench.verifyCell()
diff --git a/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.py b/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.py
index bc04cbe..2c990c3 100644
--- a/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.py
+++ b/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.py
@@ -126,7 +126,8 @@
main.cellName,
main.MN1Ip,
main.apps,
- main.ONOSip)
+ main.ONOSip,
+ main.ONOScli1.user_name )
main.step("Apply cell to environment")
cellResult = main.ONOSbench.setCell(main.cellName)
verifyResult = main.ONOSbench.verifyCell()
diff --git a/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.py b/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.py
index 278176b..6a7c259 100644
--- a/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.py
+++ b/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.py
@@ -152,7 +152,8 @@
main.cellName,
main.MN1Ip,
main.apps,
- main.ONOSip)
+ main.ONOSip,
+ main.ONOScli1.user_name)
main.step("Apply cell to environment")
cellResult = main.ONOSbench.setCell(main.cellName)
verifyResult = main.ONOSbench.verifyCell()
diff --git a/TestON/tests/SCPF/SCPFportLat/SCPFportLat.py b/TestON/tests/SCPF/SCPFportLat/SCPFportLat.py
index b29ca81..3236ef8 100644
--- a/TestON/tests/SCPF/SCPFportLat/SCPFportLat.py
+++ b/TestON/tests/SCPF/SCPFportLat/SCPFportLat.py
@@ -130,7 +130,8 @@
main.cellName,
main.MN1Ip,
main.Apps,
- main.ONOSip)
+ main.ONOSip,
+ main.ONOScli1.user_name)
main.step( "Apply cell to environment" )
cellResult = main.ONOSbench.setCell( main.cellName )
verifyResult = main.ONOSbench.verifyCell()
diff --git a/TestON/tests/SCPF/SCPFscaleTopo/SCPFscaleTopo.py b/TestON/tests/SCPF/SCPFscaleTopo/SCPFscaleTopo.py
index a94dfe8..24ccb4b 100644
--- a/TestON/tests/SCPF/SCPFscaleTopo/SCPFscaleTopo.py
+++ b/TestON/tests/SCPF/SCPFscaleTopo/SCPFscaleTopo.py
@@ -177,7 +177,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" )
diff --git a/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.py b/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.py
index dd1e984..9032e1f 100644
--- a/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.py
+++ b/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.py
@@ -153,7 +153,7 @@
"temp",
main.Mininet1.ip_address,
main.apps,
- tempOnosIp )
+ tempOnosIp, main.ONOScli1.user_name )
main.step( "Apply cell to environment" )
cellResult = main.ONOSbench.setCell( "temp" )
diff --git a/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.py b/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.py
index e62951a..c921a67 100644
--- a/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.py
+++ b/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.py
@@ -133,7 +133,7 @@
main.cellName,
main.MN1Ip,
main.Apps,
- main.ONOSip)
+ main.ONOSip, main.ONOScli1.user_name)
main.step("Apply cell to environment")
cellResult = main.ONOSbench.setCell(main.cellName)
verifyResult = main.ONOSbench.verifyCell()