Fix function call to match updated function
Change-Id: I09674cb15eed72a9095c406789ed41620895ea1d
diff --git a/TestON/drivers/common/cli/emulator/mininetclidriver.py b/TestON/drivers/common/cli/emulator/mininetclidriver.py
index 7afcfa8..3c891fc 100644
--- a/TestON/drivers/common/cli/emulator/mininetclidriver.py
+++ b/TestON/drivers/common/cli/emulator/mininetclidriver.py
@@ -1961,7 +1961,7 @@
try:
switches = []
if type(sw) is list:
- switches.extends(sw)
+ switches.extend(sw)
else: switches.append(sw)
flows = []
diff --git a/TestON/tests/HAclusterRestart/HAclusterRestart.py b/TestON/tests/HAclusterRestart/HAclusterRestart.py
index 7197d5e..2dc2b8f 100644
--- a/TestON/tests/HAclusterRestart/HAclusterRestart.py
+++ b/TestON/tests/HAclusterRestart/HAclusterRestart.py
@@ -1413,7 +1413,7 @@
global flows
flows = []
for i in range( 1, 29 ):
- flows.append( main.Mininet1.getFlowTable( 1.3, "s" + str( i ) ) )
+ flows.append( main.Mininet1.getFlowTable( "s" + str( i ), version="1.3" ) )
if flowCheck == main.FALSE:
for table in flows:
main.log.warn( table )
@@ -2063,7 +2063,7 @@
flows2 = []
for i in range( 28 ):
main.log.info( "Checking flow table on s" + str( i + 1 ) )
- tmpFlows = main.Mininet1.getFlowTable( 1.3, "s" + str( i + 1 ) )
+ tmpFlows = main.Mininet1.getFlowTable( "s" + str( i + 1 ), version="1.3" )
flows2.append( tmpFlows )
tempResult = main.Mininet1.flowComp(
flow1=flows[ i ],
diff --git a/TestON/tests/HAkillNodes/HAkillNodes.py b/TestON/tests/HAkillNodes/HAkillNodes.py
index 9bfe947..5002305 100644
--- a/TestON/tests/HAkillNodes/HAkillNodes.py
+++ b/TestON/tests/HAkillNodes/HAkillNodes.py
@@ -1437,7 +1437,7 @@
global flows
flows = []
for i in range( 1, 29 ):
- flows.append( main.Mininet1.getFlowTable( 1.3, "s" + str( i ) ) )
+ flows.append( main.Mininet1.getFlowTable( "s" + str( i ), version="1.3" ) )
if flowCheck == main.FALSE:
for table in flows:
main.log.warn( table )
@@ -2052,7 +2052,7 @@
flows2 = []
for i in range( 28 ):
main.log.info( "Checking flow table on s" + str( i + 1 ) )
- tmpFlows = main.Mininet1.getFlowTable( 1.3, "s" + str( i + 1 ) )
+ tmpFlows = main.Mininet1.getFlowTable( "s" + str( i + 1 ), version="1.3" )
flows2.append( tmpFlows )
tempResult = main.Mininet1.flowComp(
flow1=flows[ i ],
diff --git a/TestON/tests/HAsanity/HAsanity.py b/TestON/tests/HAsanity/HAsanity.py
index c64e05e..8202609 100644
--- a/TestON/tests/HAsanity/HAsanity.py
+++ b/TestON/tests/HAsanity/HAsanity.py
@@ -1392,7 +1392,7 @@
global flows
flows = []
for i in range( 1, 29 ):
- flows.append( main.Mininet1.getFlowTable( 1.3, "s" + str( i ) ) )
+ flows.append( main.Mininet1.getFlowTable( "s" + str( i ), version="1.3" ) )
if flowCheck == main.FALSE:
for table in flows:
main.log.warn( table )
@@ -1956,7 +1956,7 @@
flows2 = []
for i in range( 28 ):
main.log.info( "Checking flow table on s" + str( i + 1 ) )
- tmpFlows = main.Mininet1.getFlowTable( 1.3, "s" + str( i + 1 ) )
+ tmpFlows = main.Mininet1.getFlowTable( "s" + str( i + 1 ), version="1.3" )
flows2.append( tmpFlows )
tempResult = main.Mininet1.flowComp(
flow1=flows[ i ],
diff --git a/TestON/tests/HAsingleInstanceRestart/HAsingleInstanceRestart.py b/TestON/tests/HAsingleInstanceRestart/HAsingleInstanceRestart.py
index a1652e9..c376340 100644
--- a/TestON/tests/HAsingleInstanceRestart/HAsingleInstanceRestart.py
+++ b/TestON/tests/HAsingleInstanceRestart/HAsingleInstanceRestart.py
@@ -1044,7 +1044,7 @@
global flows
flows = []
for i in range( 1, 29 ):
- flows.append( main.Mininet1.getFlowTable( 1.3, "s" + str( i ) ) )
+ flows.append( main.Mininet1.getFlowTable( "s" + str( i ), version="1.3" ) )
if flowCheck == main.FALSE:
for table in flows:
main.log.warn( table )
@@ -1371,7 +1371,7 @@
flows2 = []
for i in range( 28 ):
main.log.info( "Checking flow table on s" + str( i + 1 ) )
- tmpFlows = main.Mininet1.getFlowTable( 1.3, "s" + str( i + 1 ) )
+ tmpFlows = main.Mininet1.getFlowTable( "s" + str( i + 1 ), version="1.3" )
flows2.append( tmpFlows )
tempResult = main.Mininet1.flowComp(
flow1=flows[ i ],
diff --git a/TestON/tests/HAstopNodes/HAstopNodes.py b/TestON/tests/HAstopNodes/HAstopNodes.py
index 1088374..3de6064 100644
--- a/TestON/tests/HAstopNodes/HAstopNodes.py
+++ b/TestON/tests/HAstopNodes/HAstopNodes.py
@@ -1426,7 +1426,7 @@
global flows
flows = []
for i in range( 1, 29 ):
- flows.append( main.Mininet1.getFlowTable( 1.3, "s" + str( i ) ) )
+ flows.append( main.Mininet1.getFlowTable( "s" + str( i ), version="1.3" ) )
if flowCheck == main.FALSE:
for table in flows:
main.log.warn( table )
@@ -2041,7 +2041,7 @@
flows2 = []
for i in range( 28 ):
main.log.info( "Checking flow table on s" + str( i + 1 ) )
- tmpFlows = main.Mininet1.getFlowTable( 1.3, "s" + str( i + 1 ) )
+ tmpFlows = main.Mininet1.getFlowTable( "s" + str( i + 1 ), version="1.3" )
flows2.append( tmpFlows )
tempResult = main.Mininet1.flowComp(
flow1=flows[ i ],