commit a4295713fc07b821130086a90e8222e67c276a92
author suibin zhang <suibin@onlab.us> Thu Apr 07 20:33:57 2016 -0700
committer suibin zhang <suibin@onlab.us> Thu Apr 07 20:33:57 2016 -0700
tree 577c52d216652ead8b6cfe71e90ef834e71e0be5
parent 8a0a27893969967b02b0b7b9a7857a33e0d6807e

move adaptiveFlowSampling setup to case 10

Change-Id: Ib242f6ce49da8220280defb15201fcd0d4d748e8

TestON/tests/COMPflow/COMPflow.py

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()