move adaptiveFlowSampling setup to case 10
Change-Id: Ib242f6ce49da8220280defb15201fcd0d4d748e8
diff --git a/TestON/tests/COMPflow/COMPflow.params b/TestON/tests/COMPflow/COMPflow.params
index 0d7df3d..c194067 100755
--- a/TestON/tests/COMPflow/COMPflow.params
+++ b/TestON/tests/COMPflow/COMPflow.params
@@ -40,6 +40,7 @@
</CASE2>
<CASE10>
+ <adaptiveFlowenabled>false</adaptiveFlowenabled>
<numSw>63</numSw>
<mnArgs> --topo linear,63 --switch ovsk,protocols=OpenFlow13 --controller remote,port=6653</mnArgs>
</CASE10>
@@ -56,7 +57,6 @@
</CASE1000>
<CASE2100>
- <adaptiveFlowenabled>false</adaptiveFlowenabled>
<numThreads>4</numThreads>
<RESTchkFlow>main.FALSE</RESTchkFlow>
<chkFlowTO>200</chkFlowTO>
diff --git a/TestON/tests/COMPflow/COMPflow.py b/TestON/tests/COMPflow/COMPflow.py
index 37e29e4..7e08124 100755
--- a/TestON/tests/COMPflow/COMPflow.py
+++ b/TestON/tests/COMPflow/COMPflow.py
@@ -208,6 +208,12 @@
print stepResult
time.sleep(5)
+
+ main.step( "Disable AdaptiveFlowSampling ")
+ main.ONOSbench.onosCfgSet( main.ONOSip[0], "org.onosproject.provider.of.flow.impl.OpenFlowRuleProvider",
+ "adaptiveFlowSampling " + main.params['CASE10']['adaptiveFlowenabled'])
+ time.sleep(5)
+
main.step( "Setup Mininet Linear Topology with " + str(main.numSw) + " switches" )
stepResult = main.Mininet1.startNet( args = main.params['CASE10']['mnArgs'] )
@@ -317,12 +323,6 @@
q = Queue()
tAllAdded = 0
-
- main.step( "Disable AdaptiveFlowSampling ")
- main.ONOSbench.onosCfgSet( main.ONOSip[0], "org.onosproject.provider.of.flow.impl.OpenFlowRuleProvider",
- "adaptiveFlowSampling " + main.params['CASE2100']['adaptiveFlowenabled'])
- time.sleep(5)
-
def postWorker(id):
while True:
item = q.get()