Add initial support for SFB qdisc, still needs tuning

10 files changed, 39 insertions, 2 deletions

diff --git a/templates/traffic-policy/fair-blue/node.def b/templates/traffic-policy/fair-blue/node.def
new file mode 100644
index 0000000..f49d59b
--- /dev/null
+++ b/templates/traffic-policy/fair-blue/node.def
@@ -0,0 +1,8 @@
+tag:
+type: txt
+help: Stochastic Fair Blue policy
+syntax:expression: pattern $VAR(@) "^[[:alnum:]][-_[:alnum:]]*$"
+                   ; "only alpha-numeric policy name allowed"
+create: /opt/vyatta/sbin/vyatta-qos.pl --create-policy $VAR(.) $VAR(@)
+delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-policy $VAR(@)
+end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy $VAR(@)
diff --git a/templates/traffic-policy/fair-blue/node.tag/description/node.def b/templates/traffic-policy/fair-blue/node.tag/description/node.def
new file mode 100644
index 0000000..c0e6cce
--- /dev/null
+++ b/templates/traffic-policy/fair-blue/node.tag/description/node.def
@@ -0,0 +1,2 @@
+type: txt
+help: Description for queuing policy
diff --git a/templates/traffic-policy/fair-blue/node.tag/penalty/burst/node.def b/templates/traffic-policy/fair-blue/node.tag/penalty/burst/node.def
new file mode 100644
index 0000000..c4efacd
--- /dev/null
+++ b/templates/traffic-policy/fair-blue/node.tag/penalty/burst/node.def
@@ -0,0 +1,4 @@
+type: u32
+help: Burst size (packets)
+syntax:expression: $VAR(@) > 0; "Burst must be greater than zero"
+val_help: u32:1-4294967295; Burst size in packets
diff --git a/templates/traffic-policy/fair-blue/node.tag/penalty/node.def b/templates/traffic-policy/fair-blue/node.tag/penalty/node.def
new file mode 100644
index 0000000..15b40ed
--- /dev/null
+++ b/templates/traffic-policy/fair-blue/node.tag/penalty/node.def
@@ -0,0 +1 @@
+help: Penalty box for non-responsive aggregates
diff --git a/templates/traffic-policy/fair-blue/node.tag/penalty/rate/node.def b/templates/traffic-policy/fair-blue/node.tag/penalty/rate/node.def
new file mode 100644
index 0000000..c7e87a9
--- /dev/null
+++ b/templates/traffic-policy/fair-blue/node.tag/penalty/rate/node.def
@@ -0,0 +1,4 @@
+type: u32
+help: Penalty rate (packets per second)
+syntax:expression: $VAR(@) > 0; "Penalty rate must be greater than zero"
+val_help: u32:1-4294967295; "Penalty rate in packets per second"
diff --git a/templates/traffic-policy/fair-blue/node.tag/queue-limit/node.def b/templates/traffic-policy/fair-blue/node.tag/queue-limit/node.def
new file mode 100644
index 0000000..9f2b313
--- /dev/null
+++ b/templates/traffic-policy/fair-blue/node.tag/queue-limit/node.def
@@ -0,0 +1,4 @@
+type: u32
+help: Hard maximum queue size (packets)
+syntax:expression: $VAR(@) > 0;  "Queue limit must be greater than zero"
+val_help: u32:1-4294967295; Queue size in packets
diff --git a/templates/traffic-policy/fair-blue/node.tag/queue-target/node.def b/templates/traffic-policy/fair-blue/node.tag/queue-target/node.def
new file mode 100644
index 0000000..ed8ddf3
--- /dev/null
+++ b/templates/traffic-policy/fair-blue/node.tag/queue-target/node.def
@@ -0,0 +1,4 @@
+type: u32
+help: Target queue size (packets)
+syntax:expression: $VAR(@) > 0;  "Queue target must be greater than zero"
+val_help: u32:1-4294967295; Target queue size in packets
diff --git a/templates/traffic-policy/fair-blue/node.tag/queue-type/node.def b/templates/traffic-policy/fair-blue/node.tag/queue-type/node.def
new file mode 100644
index 0000000..c3e613f
--- /dev/null
+++ b/templates/traffic-policy/fair-blue/node.tag/queue-type/node.def
@@ -0,0 +1,8 @@
+type: txt
+default: "fair-queue"
+syntax:expression: $VAR(@) in "fair-queue", "priority", "drop-tail";\
+                   "Unknown queue-type"
+help: Queue type for default traffic
+val_help: fair-queue; Stochastic Fair Queue (SFQ)
+val_help: drop-tail; First-In-First-Out (FIFO)
+val_help: priority; Priority queueing based on DSCP
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/queue-type/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/queue-type/node.def
index 6b44648..2771022 100644
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/queue-type/node.def
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/queue-type/node.def
@@ -1,6 +1,6 @@
 type: txt
 default: "fair-queue"
-syntax:expression: $VAR(@) in "fair-queue", "priority", "drop-tail", "random-detect";\
+syntax:expression: $VAR(@) in "fair-queue", "priority", "drop-tail", "random-detect", "fair-blue";\
                    "Unknown queue-type"
 help: Queue type for this class
 
@@ -8,4 +8,5 @@ val_help: fair-queue; Stochastic Fair Queue (SFQ)
 val_help: drop-tail; First-In-First-Out (FIFO)
 val_help: priority; Priority queueing based on DSCP
 val_help: random-detect; Random Early Detection (RED)
+val_help: fair-blue; Stochastic Fair Blue (SFB)
 
diff --git a/templates/traffic-policy/shaper/node.tag/default/queue-type/node.def b/templates/traffic-policy/shaper/node.tag/default/queue-type/node.def
index caf6818..ea3f280 100644
--- a/templates/traffic-policy/shaper/node.tag/default/queue-type/node.def
+++ b/templates/traffic-policy/shaper/node.tag/default/queue-type/node.def
@@ -1,9 +1,10 @@
 type: txt
 default: "fair-queue"
-syntax:expression: $VAR(@) in "fair-queue", "priority", "drop-tail", "random-detect";\
+syntax:expression: $VAR(@) in "fair-queue", "priority", "drop-tail", "random-detect", "fair-blue";\
                    "Unknown queue-type"
 help: Queue type for default traffic
 val_help: fair-queue; Stochastic Fair Queue (SFQ)
 val_help: drop-tail; First-In-First-Out (FIFO)
 val_help: priority; Priority queueing based on DSCP
 val_help: random-detect; Random Early Detection (RED)
+val_help: fair-blue; Stochastic Fair Blue (SFB)