commit 51d108e751bbde21e8ef4ff1305f83f6ef99514f
author GlennRC <glenn@onlab.us> Thu Dec 10 20:15:03 2015 +0000
committer Gerrit Code Review <gerrit@onlab.us> Thu Dec 10 20:15:03 2015 +0000
tree 3dae1c99a9e9566abeea07b1eeff788775f90254
parent e9b1fa3be2c22a2f53e47619a0bcbe300a655be6
parent f6826f10ad611eacd10e955836450ac15b788ae1

Merge "Installing only openflow-base"

TestON/tests/SCPFcbench/SCPFcbench.params

diff --git a/TestON/tests/SCPFcbench/SCPFcbench.params b/TestON/tests/SCPFcbench/SCPFcbench.params
index 161c657..13ba597 100644
--- a/TestON/tests/SCPFcbench/SCPFcbench.params
+++ b/TestON/tests/SCPFcbench/SCPFcbench.params
@@ -7,6 +7,7 @@
 
     <ENV>
     <cellName>Cbenchcell</cellName>
+    <cellApps>drivers,openflow-base,fwd</cellApps>
     </ENV>
 
     <TEST>

TestON/tests/SCPFcbench/SCPFcbench.py

diff --git a/TestON/tests/SCPFcbench/SCPFcbench.py b/TestON/tests/SCPFcbench/SCPFcbench.py
index 382b16f..403e0fe 100644
--- a/TestON/tests/SCPFcbench/SCPFcbench.py
+++ b/TestON/tests/SCPFcbench/SCPFcbench.py
@@ -37,6 +37,7 @@
         maxNodes = int(main.params[ 'availableNodes' ])
         skipMvn = main.params[ 'TEST' ][ 'skipCleanInstall' ]
         cellName = main.params[ 'ENV' ][ 'cellName' ]
+        cellApps = main.params[ 'ENV' ][ 'cellApps' ]
 
         # -- INIT SECTION, ONLY RUNS ONCE -- #
         if init == False:
@@ -94,7 +95,7 @@
 
 
         print "Cellname is: "+ cellName + "ONOS IP is: " + str(ONOSIp)
-        main.ONOSbench.createCellFile(BENCHIp,cellName,MN1Ip,"drivers,openflow,fwd",[ONOSIp[1]])
+        main.ONOSbench.createCellFile(BENCHIp,cellName,MN1Ip,cellApps,[ONOSIp[1]])
 
         main.step( "Set Cell" )
         main.ONOSbench.setCell(cellName)