airtime-fairness: add ATF to the data model

Signed-off-by: John Crispin <john@phrozen.org>

renderer/templates/interface/wmm.uc

@@ -30,18 +30,54 @@ let class = {
 	"VA": 44,
 	"LE": 1,
 	"DF": 0,
+
+	/* fake entry used by rfc8325 */
+	"MIN": 2
 };
 
 let profiles = {
+	"rfc8325": {
+		"defaults": {
+			"UP0": [ "MIN", "CS2" ],
+			"UP1": [ "LE" ],
+			"UP3": [ "AF21", "AF23" ],
+			"UP4": [ "CS3", "AF43" ],
+			"UP5": [ "CS5" ],
+			"UP6": [ "VA", "EF" ],
+			"UP7": [ "CS6", "CS7" ]
+		}
+	},
+	"3gpp": {
+		"defaults": {
+			"UP0": [ "DF" ],
+			"UP1": [ "CS1" ],
+			"UP2": [ "AF11", "AF13" ],
+			"UP3": [ "AF21", "AF23" ],
+			"UP4": [ "CS3", "AF33" ],
+			"UP5": [ "CS5", "AF43" ],
+			"UP6": [ "CS4" ],
+			"UP7": [ "CS6" ]
+		},
+		"exceptions": {
+			"UP6": [ "EF" ]
+		}
+	},
 	"enterprise": {
-		"UP0": [ "DF"],
-		"UP1": [ "CS1" ],
-		"UP2": [ "AF11", "AF12", "AF13" ],
-		"UP3": [ "CS2", "AF21", "AF22", "AF23" ],
-		"UP4": [ "CS3", "AF31", "AF32", "AF33" ],
-		"UP5": [ "CS5", "AF41", "AF42", "AF43" ],
-		"UP6": [ "CS4", "EF" ],
-		"UP7": [ "CS6" ]
+		"defaults": {
+			"UP0": [ "DF" ],
+			"UP1": [ "CS1" ],
+			"UP2": [ "AF11", "AF13" ],
+			"UP3": [ "CS2", "AF23" ],
+			"UP4": [ "CS3", "AF33" ],
+			"UP5": [ "CS5" ],
+			"UP6": [ "CS4" ],
+			"UP7": [ "CS6" ]
+		},
+		"exceptions": {
+			"UP5": [ "AF41", "AF42", "AF43" ],
+			"UP6": [ "EF" ],
+			"UP7": [ "CS6" ]
+		}
 	}
 };
 
@@ -51,25 +87,31 @@ function qos_map() {
 	if (wmm.profile)
 		wmm = profiles[wmm.profile];
 
+	if (!length(wmm.defaults))
+		wmm.defaults = { };
+
+	if (!length(wmm.exceptions))
+		wmm.exceptions = { };
+
 	for (let prio = 0; prio < 8; prio++) {
-		let up = wmm["UP" + prio];
+		let up = wmm.exceptions["UP" + prio] || [];
 		let len = length(up);
 
-		if (length(up) < 2)
+		if (!length(up))
 			continue;
 
-		for (let idx = 1; idx < len; idx++) {
+		for (let idx = 0; idx < len; idx++) {
 			push(up_map, class[up[idx]]);
 			push(up_map, prio);
 		}
 	}
 
 	for (let prio = 0; prio < 8; prio++) {
-		let up = wmm["UP" + prio];
+		let up = wmm.defaults["UP" + prio];
 
 		if (length(up)) {
 			push(up_map, class[up[0]]);
-			push(up_map, class[up[0]]);
+			push(up_map, class[up[1] || up[0]]);
 		} else {
 			push(up_map, 255);
 			push(up_map, 255);

renderer/templates/services/airtime_fairness.uc

@@ -0,0 +1,17 @@
+{%
+let enable = airtime_fairness;
+if (!services.is_present("atfpolicy"))
+	return;
+services.set_enabled("atfpolicy", enable);
+if (!enable)
+	return;
+%}
+
+set atfpolicy.@defaults[0].vo_queue_weight={{ airtime_fairness.voice_weight }}
+set atfpolicy.@defaults[0].update_pkt_threshold={{ airtime_fairness.packet_threshold }}
+set atfpolicy.@defaults[0].bulk_percent_thresh={{ airtime_fairness.bulk_threshold }}
+set atfpolicy.@defaults[0].prio_percent_thresh={{ airtime_fairness.priority_threshold }}
+set atfpolicy.@defaults[0].weight_normal={{ airtime_fairness.weight_normal }}
+set atfpolicy.@defaults[0].weight_prio={{ airtime_fairness.weight_priority }}
+set atfpolicy.@defaults[0].weight_bulk={{ airtime_fairness.weight_bulk }}
+

schema/globals.wireless-multimedia-profile.yml → schema/globals.wireless-multimedia.profile.yml

@@ -4,3 +4,5 @@ description:
 type: string
 enum:
 - enterprise
+- rfc8325
+- 3gpp

schema/globals.wireless-multimedia.raw.yml

@@ -0,0 +1,40 @@
+description:
+  Define the default WMM behaviour of all SSIDs on the device. Each access
+  category can be assigned a default class selector range that gets used for packet
+  matching. It is possible to also define a list of override exceptions.
+type: object
+properties:
+  defaults:
+    UP0:
+      $ref: 'https://ucentral.io/schema/v1/globals/wireless-multimedia/class-selector/'
+    UP1:
+      $ref: 'https://ucentral.io/schema/v1/globals/wireless-multimedia/class-selector/'
+    UP2:
+      $ref: 'https://ucentral.io/schema/v1/globals/wireless-multimedia/class-selector/'
+    UP3:
+      $ref: 'https://ucentral.io/schema/v1/globals/wireless-multimedia/class-selector/'
+    UP4:
+      $ref: 'https://ucentral.io/schema/v1/globals/wireless-multimedia/class-selector/'
+    UP5:
+      $ref: 'https://ucentral.io/schema/v1/globals/wireless-multimedia/class-selector/'
+    UP6:
+      $ref: 'https://ucentral.io/schema/v1/globals/wireless-multimedia/class-selector/'
+    UP7:
+      $ref: 'https://ucentral.io/schema/v1/globals/wireless-multimedia/class-selector/'
+  exceptions:
+    UP0:
+      $ref: 'https://ucentral.io/schema/v1/globals/wireless-multimedia/class-selector/'
+    UP1:
+      $ref: 'https://ucentral.io/schema/v1/globals/wireless-multimedia/class-selector/'
+    UP2:
+      $ref: 'https://ucentral.io/schema/v1/globals/wireless-multimedia/class-selector/'
+    UP3:
+      $ref: 'https://ucentral.io/schema/v1/globals/wireless-multimedia/class-selector/'
+    UP4:
+      $ref: 'https://ucentral.io/schema/v1/globals/wireless-multimedia/class-selector/'
+    UP5:
+      $ref: 'https://ucentral.io/schema/v1/globals/wireless-multimedia/class-selector/'
+    UP6:
+      $ref: 'https://ucentral.io/schema/v1/globals/wireless-multimedia/class-selector/'
+    UP7:
+      $ref: 'https://ucentral.io/schema/v1/globals/wireless-multimedia/class-selector/'

schema/globals.yml

@@ -21,5 +21,5 @@ properties:
     - fdca:1234:4567::/48
   wireless-multimedia:
     oneOf:
-     - $ref: 'https://ucentral.io/schema/v1/globals/wireless-multimedia/'
-     - $ref: 'https://ucentral.io/schema/v1/globals/wireless-multimedia-profile/'
+     - $ref: 'https://ucentral.io/schema/v1/globals/wireless-multimedia/raw/'
+     - $ref: 'https://ucentral.io/schema/v1/globals/wireless-multimedia/profile/'

schema/service.airtime-fairness.yml

@@ -0,0 +1,46 @@
+description:
+  This section describes the vlan behaviour of a logical network interface.
+type: object
+properties:
+  voice-weight:
+    description:
+      Voice traffic does not get aggregated. As voice and video are both considered
+      priotity voice is considered to have a heavier weight when calculation priority
+      average.
+    type: number
+    default: 4
+  packet-threshold:
+    description:
+      The amount of packets that need to be received for a specific type of traffic
+      before new averageg is calculated.
+    type: number
+    default: 100
+  bulk-threshold:
+    description:
+      This option is a percentual value. If more the X% of the traffic is bulk, we assign
+      the bulk weight.
+    type: number
+    default: 50
+  priority-threshold:
+    description:
+      This option is a percentual value. If more the X% of the traffic is priority, we assign
+      the priority weight. Priority classification will take precedence over bulk.
+    type: number
+    default: 30
+  weight-normal:
+    description:
+      The default ATF weight that UEs get assigned.
+    type: number
+    default: 256
+  weight-priority:
+    description:
+      The default ATF weight that UEs get assigned when priority traffic above the configured
+      percentage is detected.
+    type: number
+    default: 394
+  weight-bulk:
+    description:
+      The default ATF weight that UEs get assigned when bulk traffic above the configured
+      percentage is detected.
+    type: number
+    default: 128

schema/service.yml

@@ -35,5 +35,5 @@ properties:
     $ref: "https://ucentral.io/schema/v1/service/quality-of-service/"
   facebook-wifi:
     $ref: "https://ucentral.io/schema/v1/service/facebook-wifi/"
-  airtime-policies:
-    $ref: "https://ucentral.io/schema/v1/service/airtime-policies/"
+  airtime-fairness:
+    $ref: "https://ucentral.io/schema/v1/service/airtime-fairness/"