[ONOS-2424] Move flowTable functions from remotemininetdriver to mininetdriver
also refactor getFlowTables
remove unused function
Change-Id: I7be74b4222d4b680e82a22eeded8b6a615783a16
diff --git a/TestON/tests/HAminorityRestart/HAminorityRestart.py b/TestON/tests/HAminorityRestart/HAminorityRestart.py
index 94482ea..1103309 100644
--- a/TestON/tests/HAminorityRestart/HAminorityRestart.py
+++ b/TestON/tests/HAminorityRestart/HAminorityRestart.py
@@ -1380,7 +1380,7 @@
global flows
flows = []
for i in range( 1, 29 ):
- flows.append( main.Mininet2.getFlowTable( 1.3, "s" + str( i ) ) )
+ flows.append( main.Mininet1.getFlowTable( 1.3, "s" + str( i ) ) )
if flowCheck == main.FALSE:
for table in flows:
main.log.warn( table )
@@ -1995,9 +1995,9 @@
flows2 = []
for i in range( 28 ):
main.log.info( "Checking flow table on s" + str( i + 1 ) )
- tmpFlows = main.Mininet2.getFlowTable( 1.3, "s" + str( i + 1 ) )
+ tmpFlows = main.Mininet1.getFlowTable( 1.3, "s" + str( i + 1 ) )
flows2.append( tmpFlows )
- tempResult = main.Mininet2.flowComp(
+ tempResult = main.Mininet1.flowComp(
flow1=flows[ i ],
flow2=tmpFlows )
FlowTables = FlowTables and tempResult