FUNCflow test suite

Change-Id: I9dd2ce19736a702fd22549dd93933052ca6a6858
diff --git a/TestON/tests/FUNCflow/FUNCflow.params b/TestON/tests/FUNCflow/FUNCflow.params
index 396686e..e0dde55 100755
--- a/TestON/tests/FUNCflow/FUNCflow.params
+++ b/TestON/tests/FUNCflow/FUNCflow.params
@@ -7,38 +7,37 @@
     # 9 - Report logs
     # 10 - Start mininet and assign switches to controller
     # 1000 - Add flows
-    # 2000 - Delete flows
-    # 3000 - Modify flow rule selectors
-    # 4000 - Modify flow rule treatments
-    # 5000 - flow rule controller
-    # 100 - Compare switch flow table with ONOS
-    <testcases>1,2,10,8,1000</testcases>
+    # 2000 - Verify flows are in the ADDED state
+    # 3000 - Delete flows
+    <testcases>1,2,10,11,1000,2000,3000,100</testcases>
 
     <SCALE>
-        <max>3</max>
+        <max>1</max>
     </SCALE>
 
     <DEPENDENCY>
         <path>/tests/FUNCflow/Dependency/</path>
         <wrapper1>startUp</wrapper1>
         <wrapper2>topo</wrapper2>
-        <topology>flow-2sw.py</topology>
+        <topology>topo-flow.py</topology>
     </DEPENDENCY>
 
 
     <TOPO>
         <numSwitches>1</numSwitches>
         <numHosts>2</numHosts>
-        <numLinks>2</numLinks>
+        <numLinks>0</numLinks>
+    </TOPO>
+
+    <MININET>
         <deviceId>of:0000000000000001</deviceId>
         <hostMac1>00:00:00:00:00:01</hostMac1>
         <hostMac2>00:00:00:00:00:02</hostMac2>
-        <ethType>IPV4</ethType>
-    </TOPO>
+    </MININET>
 
     <ENV>
         <cellName>productionCell</cellName>
-        <cellApps>drivers,openflow,fwd</cellApps>
+        <cellApps>drivers,openflow</cellApps>
     </ENV>
 
     <GIT>