Hotfix again...
Change-Id: I7c2ba1a7fc59c024153be6c311f2c7adb8201e2a
diff --git a/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.py b/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.py
index dff2a22..6aee29e 100644
--- a/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.py
+++ b/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.py
@@ -476,14 +476,9 @@
# If some intents are not installed, grep the previous flows list, and finished this test case
main.log.warn( "Some intens did not install" )
main.log.info("Total Intents: {}".format( totalIntents) )
- temp = 0
- totalFlows = 0
- if temp < totalFlows:
- temp = totalFlows
- else:
- totalFlows = main.CLIs[0].getTotalFlowsNum(timeout=600, noExit=True)
break
- # We don't want to check flows if intents not installed, because onos will drop flows
+
+ 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 3c35012..7e6753e 100644
--- a/TestON/tests/SCPF/SCPFscalingMaxIntentsWithFlowObj/SCPFscalingMaxIntentsWithFlowObj.py
+++ b/TestON/tests/SCPF/SCPFscalingMaxIntentsWithFlowObj/SCPFscalingMaxIntentsWithFlowObj.py
@@ -478,14 +478,9 @@
# If some intents are not installed, grep the previous flows list, and finished this test case
main.log.warn( "Some intens did not install" )
main.log.info("Total Intents: {}".format( totalIntents) )
- temp = 0
- totalFlows = 0
- if temp < totalFlows:
- temp = totalFlows
- else:
- totalFlows = main.CLIs[0].getTotalFlowsNum(timeout=600, noExit=True)
break
- # We don't want to check flows if intents not installed, because onos will drop flows
+
+ totalFlows = main.CLIs[0].getTotalFlowsNum(timeout=600, noExit=True)
del main.scale[0]
utilities.assert_equals( expect = main.TRUE,
actual = intentsState,