Fix Cbench Test
Change-Id: Ica6a620e11bba1e2c4a369e8c7fe03e6a04dd382
diff --git a/TestON/tests/SCPF/SCPFcbench/SCPFcbench.py b/TestON/tests/SCPF/SCPFcbench/SCPFcbench.py
index 5c40989..bd14c72 100644
--- a/TestON/tests/SCPF/SCPFcbench/SCPFcbench.py
+++ b/TestON/tests/SCPF/SCPFcbench/SCPFcbench.py
@@ -85,10 +85,6 @@
main.ONOSbench.onosUninstall( ONOSIp[i] )
time.sleep(10)
- main.ONOSbench.handle.sendline(" ")
- main.ONOSbench.handle.expect(":~")
- print "pexpect: \n" + main.ONOSbench.handle.before
-
print "Cellname is: "+ cellName + "ONOS IP is: " + str(ONOSIp)
main.ONOSbench.createCellFile(BENCHIp, cellName, MN1Ip,
@@ -97,10 +93,6 @@
main.step( "Set Cell" )
main.ONOSbench.setCell(cellName)
- #main.ONOSbench.handle.sendline(" ")
- #main.ONOSbench.handle.expect(":~")
- #print "pexpect: \n" + main.ONOSbench.handle.before
-
main.step( "Creating ONOS package" )
packageResult = main.ONOSbench.buckBuild()
@@ -111,6 +103,7 @@
for node in range(1, clusterCount + 1):
main.log.info("Starting ONOS " + str(node) + " at IP: " + ONOSIp[node])
main.ONOSbench.onosInstall( ONOSIp[node])
+ main.ONOSbench.onosSecureSSH( node=ONOSIp[node] )
for node in range(1, clusterCount + 1):
for i in range( 2 ):
@@ -144,8 +137,6 @@
onfail="Failed to configure onos for cbench test" )
-
-
def CASE2( self, main ):
main.case("Running Cbench")
main.step("Issuing cbench commands and grab returned results")
@@ -211,8 +202,3 @@
onpass="Successfully tested onos for cbench. ",
onfail="Failed to obtain valid onos cbench result!" )
-
-
-
-
-
diff --git a/TestON/tests/SCPF/SCPFcbench/SCPFcbench.topo b/TestON/tests/SCPF/SCPFcbench/SCPFcbench.topo
index d4637ad..4f3b35c 100644
--- a/TestON/tests/SCPF/SCPFcbench/SCPFcbench.topo
+++ b/TestON/tests/SCPF/SCPFcbench/SCPFcbench.topo
@@ -14,16 +14,16 @@
</COMPONENTS>
</ONOSbench>
- <ONOS1>
- <host>OC1</host>
+ <ONOScli1>
+ <host>localhost</host>
<user>sdn</user>
<password>rocks</password>
- <type>OnosDriver</type>
+ <type>OnosCliDriver</type>
<connect_order>9</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS1>
+ </ONOScli1>
</COMPONENT>
</TOPOLOGY>
-
+