commit ccce5c8b2dd5ae288c1e54ee8640f2b7c1698771
author Devin Lim <devin@opennetworking.org> Thu Aug 17 17:34:12 2017 -0700
committer Devin Lim <devin@opennetworking.org> Fri Aug 18 11:54:34 2017 -0700
tree bb688d72adba3c8c7a4e7395ca6da78af09df8e5
parent d262beecf159ea06320819a77943698bb8138293

Change SCPFFlowTp1g to use constant variable for the params variable

Change-Id: I266db6e1ee961a06dcc5d525dc8b324feb785dd8

TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.params

diff --git a/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.params b/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.params
index 9d6920d..1a910d3 100644
--- a/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.params
+++ b/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.params
@@ -18,7 +18,7 @@
         <sampleSize>20</sampleSize>                     #number of runs to take data from
         <neighbors>0,0,a,0,a,0,a</neighbors>                      #list of number of neighbors, a = all
         <flows>122500</flows>
-        <flowObj>false</flowObj>                         #flow objectives will be tested
+        <flowObj>False</flowObj>                         #flow objectives will be tested
         <flowObjectives>10000</flowObjectives>
         <flowObjType>filter</flowObjType>               #flow objective type i.e. either forward
         <switches>35</switches>

TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.py

diff --git a/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.py b/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.py
index 7a1f738..41b09aa 100644
--- a/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.py
+++ b/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.py
@@ -53,8 +53,8 @@
             main.flowRuleCfg = main.params[ 'CFG' ][ 'flowRule' ]
             main.neighbor = ( main.params[ 'TEST' ][ 'neighbors' ] ).split( "," )
             main.nullProviderCfg = main.params[ 'CFG' ][ 'nullProvider' ]
-            isFlowObj = main.params[ 'TEST' ][ 'flowObj' ]
-            if isFlowObj == 'true':
+            isFlowObj = main.params[ 'TEST' ][ 'flowObj' ] == "True"
+            if isFlowObj:
                resultFile = main.params[ 'TEST' ][ 'flowObjResultFile' ]
             else:
                resultFile = main.params[ 'TEST' ][ 'flowResultFile' ]
@@ -91,7 +91,6 @@
         testCMD[ 2 ] = main.params[ 'TEST' ][ 'testCMD2' ]
         testCMD[ 3 ] = main.params[ 'TEST' ][ 'testCMD3' ]
         flowObjType = main.params[ 'TEST' ][ 'flowObjType' ]
-        isFlowObj = main.params[ 'TEST' ][ 'flowObj' ]
         cooldown = main.params[ 'TEST' ][ 'cooldown' ]
         cellName = main.params[ 'ENV' ][ 'cellName' ]
         BENCHIp = main.params[ 'BENCH' ][ 'ip1' ]
@@ -149,7 +148,7 @@
             time.sleep( 5 )
 
         #divide flows/flowObjectives
-        if isFlowObj == 'true':
+        if isFlowObj:
            toInstall = "FlowObjectives"
            installCount = int( main.params[ 'TEST' ][ 'flowObjectives' ] )
            ifFailed = "FLOW_OBJ_TESTER.PY FAILURE"
@@ -173,7 +172,7 @@
         maxes = [ "" ]*int( sampleSize )
 
         flowCMD = "python3 " + homeDir + "/onos/tools/test/bin/"
-        if isFlowObj == 'true':
+        if isFlowObj:
            flowCMD += testCMD[ 2 ] + " " + str( installCountPerSwitch ) + " " + testCMD[ 1 ]
            flowCMD += " " + neighbors + " " + testCMD[ 3 ] + " " + str( flowObjType ) + " " + str( serverEnvVars ) + "-j"
         else: