Merge branch 'Development'

Wi5 · Nov 2, 2017 · 6a79e04 · 6a79e04
2 parents 011f144 + fc0acdd
commit 6a79e04
Show file tree

Hide file tree

Showing 9 changed files with 496 additions and 10 deletions.
diff --git a/poolfile b/poolfile
@@ -48,6 +48,11 @@ NETWORKS wi5-demo
 ####### Continuous loop (10 sec) between the 11 channels of 2.4 GHz. The application moves an AP between all the channels
 # APPLICATION net.floodlightcontroller.odin.applications.ChannelLoop
 
+####### Smart Ap Selection params
+####### SMARTAPSELECTION TimeToStart(sec) ScanningInterval(msec) AddedTime(msec) SignalThreshold(dBm) Hysteresis(sec) Alpha(0-1) Pause(sec)
+# APPLICATION net.floodlightcontroller.odin.applications.SmartApSelection
+# SMARTAPSELECTION 30 200 0 -56 4 0.2 0
+
 # Pool-2
 #NAME pool-2
 #NODES 192.168.1.5 192.168.1.6

diff --git a/src/main/java/net/floodlightcontroller/odin/applications/MobilityManager.java b/src/main/java/net/floodlightcontroller/odin/applications/MobilityManager.java
@@ -42,14 +42,14 @@ public MobilityManager () {
 	 *
 	 * Example of params in poolfile imported in MOBILITY_PARAMS:
 	 *
-	 * MOBILITY_PARAMS.HYSTERESIS_THRESHOLD = 15000;
-	 * MOBILITY_PARAMS.SIGNAL_THRESHOLD = 200;
+	 * MOBILITY_PARAMS.HYSTERESIS_THRESHOLD = 15;
+	 * MOBILITY_PARAMS.SIGNAL_THRESHOLD = -56;
 	 * MOBILITY_PARAMS.NUMBER_OF_TRIGGERS = 5;  
-	 * MOBILITY_PARAMS.TIME_RESET_TRIGGER = 1000;
+	 * MOBILITY_PARAMS.TIME_RESET_TRIGGER = 1;
 	 *
 	 * With these parameters a hand off will start when:
 	 *
-	 * At least 5 packets below 200 (-56dBm) have been received by a client during 1000 ms, and a previous hand off has not happened in the last 15000 ms
+	 * At least 5 packets below -56dBm have been received from a specific client during 1000 ms, and a previous hand off has not happened in the last 15000 ms
 	 *
 	 */