commit a3cbc05396148a18bd329d2d5e317edede1ea556
author You Wang <you@opennetworking.org> Thu Jul 27 12:22:12 2017 -0700
committer You Wang <you@opennetworking.org> Thu Jul 27 12:22:12 2017 -0700
tree eba6b015b66d4f76af3bffddf1d413548016c083
parent 227baa96d0f4b6752533f311fa010a64d4b3ac84

Make batchFlowResp compatible with ONOSSteup

Change-Id: I2289f5d6178e2a4c258a423177e3954d5499f7b4

TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.params

diff --git a/TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.params b/TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.params
index bfeeec3..549fed1 100755
--- a/TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.params
+++ b/TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.params
@@ -40,7 +40,7 @@
     </CASE1>
 
     <CASE2>
-        <incPackaging>true</incPackaging>
+        <skipPackaging>false</skipPackaging>
     </CASE2>
 
     <CASE10>

TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.py

diff --git a/TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.py b/TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.py
index 2757598..9512cd5 100644
--- a/TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.py
+++ b/TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.py
@@ -59,7 +59,11 @@
             main.addFlowSleep = float( main.params[ 'GLOBAL' ][ 'SLEEP' ][ 'addFlow' ] )
             main.delFlowSleep = float( main.params[ 'GLOBAL' ][ 'SLEEP' ][ 'delFlow' ] )
             main.chkFlowSleep = float( main.params[ 'GLOBAL' ][ 'SLEEP' ][ 'chkFlow' ] )
-            main.onosPackaging = main.params[ 'CASE2' ][ 'incPackaging' ] == "true"
+            main.skipPackaging = main.params[ 'CASE2' ][ 'skipPackaging' ]
+            if main.skipPackaging.lower() == "true":
+                main.skipPackaging = True
+            else:
+                main.skipPackaging = False
             main.cfgSleep = float( main.params[ 'GLOBAL' ][ 'SLEEP' ][ 'cfg' ] )
             main.numSw = int( main.params[ 'GLOBAL' ][ 'numSw' ] )
             main.numThreads = int( main.params[ 'GLOBAL' ][ 'numThreads' ] )
@@ -84,7 +88,7 @@
         - Install ONOS cluster
         - Connect to cli
         """
-        main.testSetUp.ONOSSetUp( main.Mininet1, skipPack=main.onosPackaging )
+        main.testSetUp.ONOSSetUp( main.Mininet1, skipPack=main.skipPackaging )
 
     def CASE10( self, main ):
         """