[ONOS-6595] Allow TestOn to run with non-default username additional fix
Change-Id: If0e039cfa6c52f70c45ee61dea60a372117e7c2f
diff --git a/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.py b/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.py
index 523a285..f4be0f7 100644
--- a/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.py
+++ b/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.py
@@ -134,7 +134,7 @@
main.log.report( "ONOS " + str(node) + " didn't start!" )
for node in range(1, clusterCount + 1):
- exec "a = main.ONOS%scli.startOnosCli" %str(node)
+ exec "a = main.ONOScli%s.startOnosCli" %str(node)
a(ONOSIp[node])
main.log.info("Startup sequence complete")
diff --git a/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.topo b/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.topo
index d521c3a..418f218 100644
--- a/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.topo
+++ b/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.topo
@@ -14,68 +14,68 @@
</COMPONENTS>
</ONOSbench>
- <ONOS1cli>
+ <ONOScli1>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>2</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS1cli>
+ </ONOScli1>
- <ONOS2cli>
+ <ONOScli2>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>3</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS2cli>
+ </ONOScli2>
- <ONOS3cli>
+ <ONOScli3>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>4</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS3cli>
+ </ONOScli3>
- <ONOS4cli>
+ <ONOScli4>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>5</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS4cli>
+ </ONOScli4>
- <ONOS5cli>
+ <ONOScli5>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>6</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS5cli>
+ </ONOScli5>
- <ONOS6cli>
+ <ONOScli6>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>7</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS6cli>
+ </ONOScli6>
- <ONOS7cli>
+ <ONOScli7>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>8</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS7cli>
+ </ONOScli7>
<ONOS1>
<host>OC1</host>
diff --git a/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.py b/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.py
index 36fa781..174d463 100644
--- a/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.py
+++ b/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.py
@@ -106,7 +106,7 @@
main.CLIs = []
main.log.info( "Creating list of ONOS cli handles" )
for i in range( main.numCtrls ):
- main.CLIs.append( getattr( main, 'ONOS%scli' % (i + 1) ) )
+ main.CLIs.append( getattr( main, 'ONOScli%s' % (i + 1) ) )
if not main.CLIs:
main.log.error( "Failed to create the list of ONOS cli handles" )
diff --git a/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.topo b/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.topo
index 3a1c9f9..f375c84 100644
--- a/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.topo
+++ b/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.topo
@@ -14,68 +14,68 @@
</COMPONENTS>
</ONOSbench>
- <ONOS1cli>
+ <ONOScli1>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>2</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS1cli>
+ </ONOScli1>
- <ONOS2cli>
+ <ONOScli2>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>3</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS2cli>
+ </ONOScli2>
- <ONOS3cli>
+ <ONOScli3>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>4</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS3cli>
+ </ONOScli3>
- <ONOS4cli>
+ <ONOScli4>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>5</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS4cli>
+ </ONOScli4>
- <ONOS5cli>
+ <ONOScli5>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>6</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS5cli>
+ </ONOScli5>
- <ONOS6cli>
+ <ONOScli6>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>7</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS6cli>
+ </ONOScli6>
- <ONOS7cli>
+ <ONOScli7>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>8</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS7cli>
+ </ONOScli7>
<ONOS1>
<host>OC1</host>
@@ -113,7 +113,6 @@
<COMPONENTS> </COMPONENTS>
</ONOS4>
-
<ONOS5>
<host>OC5</host>
<user>sdn</user>
diff --git a/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.py b/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.py
index 2c990c3..f47f032 100644
--- a/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.py
+++ b/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.py
@@ -104,7 +104,7 @@
main.CLIs = []
main.log.info("Creating list of ONOS cli handles")
for i in range(main.numCtrls):
- main.CLIs.append(getattr(main, 'ONOS%scli' % (i + 1)))
+ main.CLIs.append(getattr(main, 'ONOScli%s' %(i + 1)))
if not main.CLIs:
main.log.error("Failed to create the list of ONOS cli handles")
diff --git a/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.topo b/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.topo
index 915d033..226657f 100644
--- a/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.topo
+++ b/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.topo
@@ -14,68 +14,68 @@
</COMPONENTS>
</ONOSbench>
- <ONOS1cli>
+ <ONOScli1>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>2</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS1cli>
+ </ONOScli1>
- <ONOS2cli>
+ <ONOScli2>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>3</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS2cli>
+ </ONOScli2>
- <ONOS3cli>
+ <ONOScli3>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>4</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS3cli>
+ </ONOScli3>
- <ONOS4cli>
+ <ONOScli4>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>5</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS4cli>
+ </ONOScli4>
- <ONOS5cli>
+ <ONOScli5>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>6</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS5cli>
+ </ONOScli5>
- <ONOS6cli>
+ <ONOScli6>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>7</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS6cli>
+ </ONOScli6>
- <ONOS7cli>
+ <ONOScli7>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>8</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS7cli>
+ </ONOScli7>
<ONOS1>
<host>OC1</host>
diff --git a/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.py b/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.py
index 6a7c259..c2d1db6 100644
--- a/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.py
+++ b/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.py
@@ -130,7 +130,7 @@
main.CLIs = []
main.log.info("Creating list of ONOS cli handles")
for i in range(main.numCtrls):
- main.CLIs.append(getattr(main, 'ONOS%scli' % (i + 1)))
+ main.CLIs.append(getattr(main, 'ONOScli%s' % (i + 1)))
if not main.CLIs:
main.log.error("Failed to create the list of ONOS cli handles")
diff --git a/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.topo b/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.topo
index 915d033..226657f 100644
--- a/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.topo
+++ b/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.topo
@@ -14,68 +14,68 @@
</COMPONENTS>
</ONOSbench>
- <ONOS1cli>
+ <ONOScli1>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>2</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS1cli>
+ </ONOScli1>
- <ONOS2cli>
+ <ONOScli2>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>3</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS2cli>
+ </ONOScli2>
- <ONOS3cli>
+ <ONOScli3>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>4</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS3cli>
+ </ONOScli3>
- <ONOS4cli>
+ <ONOScli4>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>5</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS4cli>
+ </ONOScli4>
- <ONOS5cli>
+ <ONOScli5>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>6</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS5cli>
+ </ONOScli5>
- <ONOS6cli>
+ <ONOScli6>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>7</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS6cli>
+ </ONOScli6>
- <ONOS7cli>
+ <ONOScli7>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>8</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS7cli>
+ </ONOScli7>
<ONOS1>
<host>OC1</host>
diff --git a/TestON/tests/SCPF/SCPFportLat/SCPFportLat.py b/TestON/tests/SCPF/SCPFportLat/SCPFportLat.py
index 3236ef8..72df412 100644
--- a/TestON/tests/SCPF/SCPFportLat/SCPFportLat.py
+++ b/TestON/tests/SCPF/SCPFportLat/SCPFportLat.py
@@ -108,7 +108,7 @@
main.CLIs = []
main.log.info( "Creating list of ONOS cli handles" )
for i in range( main.numCtrls ):
- main.CLIs.append( getattr(main, 'ONOS%scli' % (i + 1)) )
+ main.CLIs.append( getattr(main, 'ONOScli%s' % (i + 1)) )
if not main.CLIs:
main.log.error( "Failed to create the list of ONOS cli handles" )
diff --git a/TestON/tests/SCPF/SCPFportLat/SCPFportLat.topo b/TestON/tests/SCPF/SCPFportLat/SCPFportLat.topo
index c988f13..750cd78 100644
--- a/TestON/tests/SCPF/SCPFportLat/SCPFportLat.topo
+++ b/TestON/tests/SCPF/SCPFportLat/SCPFportLat.topo
@@ -14,68 +14,68 @@
</COMPONENTS>
</ONOSbench>
- <ONOS1cli>
+ <ONOScli1>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>2</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS1cli>
+ </ONOScli1>
- <ONOS2cli>
+ <ONOScli2>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>3</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS2cli>
+ </ONOScli2>
- <ONOS3cli>
+ <ONOScli3>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>4</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS3cli>
+ </ONOScli3>
- <ONOS4cli>
+ <ONOScli4>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>5</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS4cli>
+ </ONOScli4>
- <ONOS5cli>
+ <ONOScli5>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>6</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS5cli>
+ </ONOScli5>
- <ONOS6cli>
+ <ONOScli6>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>7</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS6cli>
+ </ONOScli6>
- <ONOS7cli>
+ <ONOScli7>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>8</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS7cli>
+ </ONOScli7>
<Mininet1>
<host>OCN</host>
diff --git a/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.py b/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.py
index c921a67..3428685 100644
--- a/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.py
+++ b/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.py
@@ -111,7 +111,7 @@
main.CLIs = []
main.log.info("Creating list of ONOS cli handles")
for i in range(main.numCtrls):
- main.CLIs.append(getattr(main, 'ONOS%scli' % (i + 1)))
+ main.CLIs.append(getattr(main, 'ONOScli%s' % (i + 1)))
if not main.CLIs:
main.log.error("Failed to create the list of ONOS cli handles")
diff --git a/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.topo b/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.topo
index 4addd4a..8373f13 100644
--- a/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.topo
+++ b/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.topo
@@ -14,68 +14,68 @@
</COMPONENTS>
</ONOSbench>
- <ONOS1cli>
+ <ONOScli1>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>2</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS1cli>
+ </ONOScli1>
- <ONOS2cli>
+ <ONOScli2>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>3</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS2cli>
+ </ONOScli2>
- <ONOS3cli>
+ <ONOScli3>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>4</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS3cli>
+ </ONOScli3>
- <ONOS4cli>
+ <ONOScli4>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>5</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS4cli>
+ </ONOScli4>
- <ONOS5cli>
+ <ONOScli5>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>6</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS5cli>
+ </ONOScli5>
- <ONOS6cli>
+ <ONOScli6>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>7</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS6cli>
+ </ONOScli6>
- <ONOS7cli>
+ <ONOScli7>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>8</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS7cli>
+ </ONOScli7>
<ONOS1>
<host>OC1</host>