commit 34f0137e9d108c3897e597594d8e695d8ea2050a
author suibin zhang <suibin@onlab.us> Thu Apr 07 15:40:15 2016 -0700
committer suibin zhang <suibin@onlab.us> Thu Apr 07 15:40:15 2016 -0700
tree cd0a1ceada676100f6244fceef96bba539f03931
parent 9a8264f2212a47e5bb3e752944f28ded97c6689f

add onos config param of adaptiveFlowSampling

Change-Id: I7edfc3a532c99ef943bf64646dffd68c07d403e3

TestON/tests/COMPflow/COMPflow.params

diff --git a/TestON/tests/COMPflow/COMPflow.params b/TestON/tests/COMPflow/COMPflow.params
index ffc45c1..0d7df3d 100755
--- a/TestON/tests/COMPflow/COMPflow.params
+++ b/TestON/tests/COMPflow/COMPflow.params
@@ -56,7 +56,8 @@
     </CASE1000>
 
     <CASE2100>
-        <numThreads>8</numThreads>
+        <adaptiveFlowenabled>false</adaptiveFlowenabled>
+        <numThreads>4</numThreads>
         <RESTchkFlow>main.FALSE</RESTchkFlow>
         <chkFlowTO>200</chkFlowTO>
     </CASE2100>

TestON/tests/COMPflow/COMPflow.py

diff --git a/TestON/tests/COMPflow/COMPflow.py b/TestON/tests/COMPflow/COMPflow.py
index 077ce9c..697a7e6 100644
--- a/TestON/tests/COMPflow/COMPflow.py
+++ b/TestON/tests/COMPflow/COMPflow.py
@@ -205,7 +205,7 @@
         stepResult = main.ONOSbench.onosCli( ONOSIp = main.ONOSip[0],  cmdstr = "app activate org.onosproject.openflow-base" )
         time.sleep(10)
         print stepResult
-        time.sleep(5)
+        time.sleep(5
 
         main.step( "Setup Mininet Linear Topology with " + str(main.numSw) + " switches" )
         stepResult = main.Mininet1.startNet( args = main.params['CASE10']['mnArgs'] )
@@ -316,6 +316,12 @@
         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'])
+
+
         def postWorker(id):
             while True:
                 item = q.get()