commit 9043c90bf0c91a246a4556087f5cf089fa6eb2aa
author Jon Hall <jhall@onlab.us> Thu Jul 30 14:23:44 2015 -0700
committer Jon Hall <jhall@onlab.us> Thu Jul 30 23:51:59 2015 +0000
tree bf05f44b7c23ca8675795064931748a7f5cbd8a5
parent 605d480899bd1616a735b2c5f838624b78343767

[ONOS-2424] Move flowTable functions from remotemininetdriver to mininetdriver

also refactor getFlowTables
remove unused function

Change-Id: I7be74b4222d4b680e82a22eeded8b6a615783a16

TestON/tests/HAclusterRestart/HAclusterRestart.py

diff --git a/TestON/tests/HAclusterRestart/HAclusterRestart.py b/TestON/tests/HAclusterRestart/HAclusterRestart.py
index 8205ac9..85c5a3a 100644
--- a/TestON/tests/HAclusterRestart/HAclusterRestart.py
+++ b/TestON/tests/HAclusterRestart/HAclusterRestart.py
@@ -1407,7 +1407,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 )
@@ -2052,9 +2052,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