Fix checkStatus function in drivers
Change-Id: I62f521ea2a1f643fa69375a4655fa028232901a3
diff --git a/TestON/tests/CHO/CHOtest/CHOtest.py b/TestON/tests/CHO/CHOtest/CHOtest.py
index a1fb04f..8c92c20 100644
--- a/TestON/tests/CHO/CHOtest/CHOtest.py
+++ b/TestON/tests/CHO/CHOtest/CHOtest.py
@@ -243,7 +243,7 @@
time.sleep( 5 )
topology_output = main.ONOScli1.topology()
- topology_result = main.ONOSbench.getTopology( topology_output )
+ topology_result = main.ONOScli1.getTopology( topology_output )
case2Result = ( switch_mastership and startStatus )
utilities.assert_equals(
expect=main.TRUE,
@@ -396,7 +396,7 @@
main.case( "Collect and Store Topology Details from ONOS" )
main.step( "Collect and store current number of switches and links" )
topology_output = main.ONOScli1.topology()
- topology_result = main.ONOSbench.getTopology( topology_output )
+ topology_result = main.ONOScli1.getTopology( topology_output )
numOnosDevices = topology_result[ 'devices' ]
numOnosLinks = topology_result[ 'links' ]
topoResult = main.TRUE
diff --git a/TestON/tests/CHO/CHOtest/dependencies/CHOtestFunctions.py b/TestON/tests/CHO/CHOtest/dependencies/CHOtestFunctions.py
index 7441a5b..c8d40ac 100644
--- a/TestON/tests/CHO/CHOtest/dependencies/CHOtestFunctions.py
+++ b/TestON/tests/CHO/CHOtest/dependencies/CHOtestFunctions.py
@@ -140,7 +140,7 @@
for e in range( int( main.numCtrls ) ):
main.log.info( "Checking link number on ONOS%s" % (e+1) )
topology_output = main.CLIs[e].topology()
- linkResultIndividual = main.ONOSbench.checkStatus( topology_output,
+ linkResultIndividual = main.ONOScli1.checkStatus( topology_output,
main.numMNswitches,
str( linkNum ) )
if not linkResultIndividual:
diff --git a/TestON/tests/FUNC/FUNCintent/dependencies/FuncIntentFunction.py b/TestON/tests/FUNC/FUNCintent/dependencies/FuncIntentFunction.py
index a596a01..88a0cad 100644
--- a/TestON/tests/FUNC/FUNCintent/dependencies/FuncIntentFunction.py
+++ b/TestON/tests/FUNC/FUNCintent/dependencies/FuncIntentFunction.py
@@ -1530,7 +1530,7 @@
for i in range( main.numCtrls ):
topologyResult = main.CLIs[ i ].topology()
- statusResult = main.ONOSbench.checkStatus( topologyResult,
+ statusResult = main.CLIs[ i ].checkStatus( topologyResult,
main.numSwitch,
expectedLink )\
and statusResult
diff --git a/TestON/tests/FUNC/FUNCintentRest/dependencies/FuncIntentFunction.py b/TestON/tests/FUNC/FUNCintentRest/dependencies/FuncIntentFunction.py
index 8a48a13..4ad42b2 100644
--- a/TestON/tests/FUNC/FUNCintentRest/dependencies/FuncIntentFunction.py
+++ b/TestON/tests/FUNC/FUNCintentRest/dependencies/FuncIntentFunction.py
@@ -1413,7 +1413,7 @@
for i in range( main.numCtrls ):
topologyResult = main.CLIs[ i ].topology()
- statusResult = main.ONOSbench.checkStatus( topologyResult,
+ statusResult = main.CLIs[ i ].checkStatus( topologyResult,
main.numSwitch,
expectedLink )\
and statusResult
diff --git a/TestON/tests/FUNC/FUNCipv6Intent/dependencies/FUNCIpv6IntentFunction.py b/TestON/tests/FUNC/FUNCipv6Intent/dependencies/FUNCIpv6IntentFunction.py
index d7b2d82..40a125b 100644
--- a/TestON/tests/FUNC/FUNCipv6Intent/dependencies/FUNCIpv6IntentFunction.py
+++ b/TestON/tests/FUNC/FUNCipv6Intent/dependencies/FUNCIpv6IntentFunction.py
@@ -1845,7 +1845,7 @@
for i in range( main.numCtrls ):
topologyResult = main.CLIs[ i ].topology()
- statusResult = main.ONOSbench.checkStatus( topologyResult,
+ statusResult = main.CLIs[ i ].checkStatus( topologyResult,
main.numSwitch,
expectedLink )\
and statusResult
diff --git a/TestON/tests/FUNC/FUNCoptical/dependencies/FuncIntentFunction.py b/TestON/tests/FUNC/FUNCoptical/dependencies/FuncIntentFunction.py
index 377fd20..1d45f62 100644
--- a/TestON/tests/FUNC/FUNCoptical/dependencies/FuncIntentFunction.py
+++ b/TestON/tests/FUNC/FUNCoptical/dependencies/FuncIntentFunction.py
@@ -1437,7 +1437,7 @@
for i in range( main.numCtrls ):
topologyResult = main.CLIs[ i ].topology()
- statusResult = main.ONOSbench.checkStatus( topologyResult,
+ statusResult = main.CLIs[ i ].checkStatus( topologyResult,
main.numSwitch,
expectedLink )\
and statusResult