commit 5665f1b5aafb3a4b4062bf43c076035d7e7e8e45
author Jeremy Songster <jeremy@onlab.us> Mon Jun 20 14:38:22 2016 -0700
committer Jeremy Songster <jeremy@onlab.us> Thu Jul 07 14:00:01 2016 -0700
tree 151a0c20606a9a18484a62df9e5e1c51bdb83c4c
parent 16c7708249cc091c5f66791a2357c4616790859d

modifying FUNCoptical to use new topology

Change-Id: Ib1762ea4713eb9fc87e060d48d2a6dc04da32256

TestON/tests/FUNC/FUNCoptical/FUNCoptical.params

diff --git a/TestON/tests/FUNC/FUNCoptical/FUNCoptical.params b/TestON/tests/FUNC/FUNCoptical/FUNCoptical.params
index 50bb652..ee70b7b 100644
--- a/TestON/tests/FUNC/FUNCoptical/FUNCoptical.params
+++ b/TestON/tests/FUNC/FUNCoptical/FUNCoptical.params
@@ -4,6 +4,7 @@
     # 2 - Install ONOS
     # 10 - Start Mininet opticalTest Topology
     # 14 - Stop Mininet
+    # 16 - Balance Mastership of switches
     # 17 - Activate Flow Objectives
     # 19 - Copy karaf logs from ONOS nodes to TestON log directory
     # 21 - Run pingall to discover all hosts
@@ -12,7 +13,7 @@
     # 31 - Add and test bidirectional point intents
     # 32 - Add and test bidirectional host intents
 
-    <testcases>1,[2,10,21,22,23,31,32,14,19,2,10,21,22,23,31,32,14,19]*1,[2,10,17,21,22,23,31,32,14,19,2,10,17,21,22,23,31,32,14,19]*1</testcases>
+    <testcases>1,[2,10,21,22,23,31,32,14,19,2,10,16,21,22,23,31,32,14,19]*1,[2,10,17,21,22,23,31,32,14,19,2,10,16,17,21,22,23,31,32,14,19]*1</testcases>
 
     <SCALE>
         <size>1,3,1,3</size>
@@ -20,13 +21,11 @@
 
     <DEPENDENCY>
         <path>/tests/FUNC/FUNCoptical/dependencies/</path>
-        <wrapper1>startUp</wrapper1>
-        <wrapper2>FuncIntentFunction</wrapper2>
-        <wrapper3>topo</wrapper3>
+        <wrapper1>topo</wrapper1>
     </DEPENDENCY>
 
     <ENV>
-        <cellApps>drivers,openflow,proxyarp,mobility,optical,fwd</cellApps>
+        <cellApps>drivers,openflow,proxyarp,mobility,optical,fwd,drivers.optical</cellApps>
     </ENV>
     <GIT>
         <pull>False</pull>
@@ -35,24 +34,17 @@
 
     <SLEEP>
         <startup>15</startup>
-        <reroute>5</reroute>
-        <removeintent>10</removeintent>
         <checkintent>5</checkintent>
-        <fwd>10</fwd>
         <topoAttempts>3</topoAttempts>
     </SLEEP>
 
+    # make sure that these numbers reflect the number of switches, links, and
+    # hosts in the optical topology specified below
     <MININET>
-        <switch>7</switch>
-        <links>20</links>
+        <switch>5</switch>
+        <links>10</links>
+        <hosts>2</hosts>
+        <toponame>ectopo</toponame>
     </MININET>
 
-    # Intent tests params
-    <SDNIP>
-        <tcpProto>6</tcpProto>
-        <icmpProto>1</icmpProto>
-        <srcPort>5001</srcPort>
-        <dstPort>5001</dstPort>
-    </SDNIP>
-
 </PARAMS>