Merge "Bug fix for mastership consistency check in CHOTestMonkey"
diff --git a/TestON/tests/FUNC/FUNCnetconf/dependencies/netconf.py b/TestON/tests/FUNC/FUNCnetconf/dependencies/netconf.py
index 631bd84..a97b2eb 100644
--- a/TestON/tests/FUNC/FUNCnetconf/dependencies/netconf.py
+++ b/TestON/tests/FUNC/FUNCnetconf/dependencies/netconf.py
@@ -89,13 +89,11 @@
This function prepares the command needed to upload the configuration
file to the REST API
"""
- ip = main.ONOSip[0]
- port = 8181
url = "/network/configuration"
method = "POST"
data = main.cfgJson
configResult = main.FALSE
- sendResult = main.CLIs[ 0 ].send( ip=ip, port=port, url=url, method=method, data=data )
+ sendResult = main.CLIs[ 0 ].send( url=url, method=method, data=data )
main.log.info( "Device configuration request response code: " + str( sendResult[ 0 ] ) )
if ( 200 <= sendResult[ 0 ] <= 299):
configResult = main.TRUE
diff --git a/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.py b/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.py
index bf34f83..6aee29e 100644
--- a/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.py
+++ b/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.py
@@ -477,13 +477,8 @@
main.log.warn( "Some intens did not install" )
main.log.info("Total Intents: {}".format( totalIntents) )
break
- # We don't want to check flows if intents not installed, because onos will drop flows
- temp = 0
- totalFlows = 0
- if temp < totalFlows:
- temp = totalFlows
- else:
- totalFlows = main.CLIs[0].getTotalFlowsNum(timeout=600, noExit=True)
+
+ totalFlows = main.CLIs[0].getTotalFlowsNum(timeout=600, noExit=True)
del main.scale[0]
utilities.assert_equals( expect = main.TRUE,
actual = intentsState,
diff --git a/TestON/tests/SCPF/SCPFscalingMaxIntentsWithFlowObj/SCPFscalingMaxIntentsWithFlowObj.py b/TestON/tests/SCPF/SCPFscalingMaxIntentsWithFlowObj/SCPFscalingMaxIntentsWithFlowObj.py
index b959666..7e6753e 100644
--- a/TestON/tests/SCPF/SCPFscalingMaxIntentsWithFlowObj/SCPFscalingMaxIntentsWithFlowObj.py
+++ b/TestON/tests/SCPF/SCPFscalingMaxIntentsWithFlowObj/SCPFscalingMaxIntentsWithFlowObj.py
@@ -479,13 +479,8 @@
main.log.warn( "Some intens did not install" )
main.log.info("Total Intents: {}".format( totalIntents) )
break
- # We don't want to check flows if intents not installed, because onos will drop flows
- temp = 0
- totalFlows = 0
- if temp < totalFlows:
- temp = totalFlows
- else:
- totalFlows = main.CLIs[0].getTotalFlowsNum(timeout=600, noExit=True)
+
+ totalFlows = main.CLIs[0].getTotalFlowsNum(timeout=600, noExit=True)
del main.scale[0]
utilities.assert_equals( expect = main.TRUE,
actual = intentsState,