Mininet startup and controller assignment is implemented
Change-Id: I1d32999ab02c2998fde2290200cdc3cecdb4d8e1
diff --git a/TestON/tests/FUNCflow/FUNCflow.params b/TestON/tests/FUNCflow/FUNCflow.params
index 6649295..e12ee6c 100755
--- a/TestON/tests/FUNCflow/FUNCflow.params
+++ b/TestON/tests/FUNCflow/FUNCflow.params
@@ -5,15 +5,14 @@
# 2 - install ONOS
# 8 - Compare topology
# 9 - Report logs
- # 10 - Start mininet
- # 11 - Assign switches to controller
+ # 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</testcases>
+ <testcases>1,2,10</testcases>
<SCALE>
<max>3</max>
@@ -22,9 +21,15 @@
<DEPENDENCY>
<path>/tests/FUNCflow/Dependency/</path>
<wrapper1>startUp</wrapper1>
- <topology>single.py</topology>
+ <topology>flow-2sw.py</topology>
</DEPENDENCY>
+ <TOPO>
+ <numSwitches>2</numSwitches>
+ <numHosts>4</numHosts>
+ <numLinks>10</numLinks>
+ </TOPO>
+
<ENV>
<cellName>productionCell</cellName>
<cellApps>drivers,openflow,proxyarp,mobility</cellApps>