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

Change-Id: If0e039cfa6c52f70c45ee61dea60a372117e7c2f
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>