Regression tests asserting various HFSC and FQ-CoDel functionality

25 files changed, 40 insertions, 3 deletions

diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile
index d536ff69ea4..ff9c38e28a8 100644
--- a/regress/sbin/pfctl/Makefile
+++ b/regress/sbin/pfctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.225 2017/07/07 23:55:21 bluhm Exp $
+# $OpenBSD: Makefile,v 1.226 2017/07/19 13:02:46 mikeb Exp $
 
 # TARGETS
 # pf: feed pfNN.in through pfctl and check whether the output matches pfNN.ok
@@ -16,9 +16,9 @@ PFTESTS=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27
 PFTESTS+=28 29 30 31 32 34 35 36 38 39 40 41 44 46 47 48 49 50
 PFTESTS+=52 53 54 55 56 57 60 61 65 66 67 68 69 70 71 72 73
 PFTESTS+=74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96
-PFTESTS+=97 98 99 100 101 102 103 104
+PFTESTS+=97 98 99 100 101 102 103 104 105 106 107 108 109 110 111
 PFFAIL=1 2 3 4 5 6 7 8 11 12 13 14 15 16 17 19 20 23 25 27
-PFFAIL+=30 37 38 39 40 41 42 43 47 48 49 50 51 52 53 54 55 56
+PFFAIL+=30 37 38 39 40 41 42 43 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62
 PFSIMPLE=1 2
 PFSETUP=1 4
 PFLOAD=1 2 3 4 5 7 8 9 10 11 12 13 14 15 16 17 18 19 20 23 24 25 26 27 28 29
diff --git a/regress/sbin/pfctl/pf105.in b/regress/sbin/pfctl/pf105.in
new file mode 100644
index 00000000000..15ba73d5a4f
--- /dev/null
+++ b/regress/sbin/pfctl/pf105.in
@@ -0,0 +1 @@
+queue rootq on lo1000000 flows 100
diff --git a/regress/sbin/pfctl/pf105.ok b/regress/sbin/pfctl/pf105.ok
new file mode 100644
index 00000000000..15ba73d5a4f
--- /dev/null
+++ b/regress/sbin/pfctl/pf105.ok
@@ -0,0 +1 @@
+queue rootq on lo1000000 flows 100
diff --git a/regress/sbin/pfctl/pf106.in b/regress/sbin/pfctl/pf106.in
new file mode 100644
index 00000000000..15a3dfd752b
--- /dev/null
+++ b/regress/sbin/pfctl/pf106.in
@@ -0,0 +1 @@
+queue rootq on lo1000000 flows 100 quantum 300
diff --git a/regress/sbin/pfctl/pf106.ok b/regress/sbin/pfctl/pf106.ok
new file mode 100644
index 00000000000..15a3dfd752b
--- /dev/null
+++ b/regress/sbin/pfctl/pf106.ok
@@ -0,0 +1 @@
+queue rootq on lo1000000 flows 100 quantum 300
diff --git a/regress/sbin/pfctl/pf107.in b/regress/sbin/pfctl/pf107.in
new file mode 100644
index 00000000000..a335c1408e9
--- /dev/null
+++ b/regress/sbin/pfctl/pf107.in
@@ -0,0 +1 @@
+queue rootq on lo1000000 flows 100 qlimit 1000
diff --git a/regress/sbin/pfctl/pf107.ok b/regress/sbin/pfctl/pf107.ok
new file mode 100644
index 00000000000..a335c1408e9
--- /dev/null
+++ b/regress/sbin/pfctl/pf107.ok
@@ -0,0 +1 @@
+queue rootq on lo1000000 flows 100 qlimit 1000
diff --git a/regress/sbin/pfctl/pf108.in b/regress/sbin/pfctl/pf108.in
new file mode 100644
index 00000000000..f1ad30a1764
--- /dev/null
+++ b/regress/sbin/pfctl/pf108.in
@@ -0,0 +1 @@
+queue rootq on lo1000000 flows 100 quantum 16384 qlimit 100
diff --git a/regress/sbin/pfctl/pf108.ok b/regress/sbin/pfctl/pf108.ok
new file mode 100644
index 00000000000..f1ad30a1764
--- /dev/null
+++ b/regress/sbin/pfctl/pf108.ok
@@ -0,0 +1 @@
+queue rootq on lo1000000 flows 100 quantum 16384 qlimit 100
diff --git a/regress/sbin/pfctl/pf109.in b/regress/sbin/pfctl/pf109.in
new file mode 100644
index 00000000000..177df732e7e
--- /dev/null
+++ b/regress/sbin/pfctl/pf109.in
@@ -0,0 +1,2 @@
+queue rootq on lo1000000 bandwidth 1M
+queue defq parent rootq flows 100 bandwidth 500K default
diff --git a/regress/sbin/pfctl/pf109.ok b/regress/sbin/pfctl/pf109.ok
new file mode 100644
index 00000000000..06ce18549d1
--- /dev/null
+++ b/regress/sbin/pfctl/pf109.ok
@@ -0,0 +1,2 @@
+queue rootq on lo1000000 bandwidth 1M
+queue defq parent rootq flows 100 bandwidth 1M default
diff --git a/regress/sbin/pfctl/pf110.in b/regress/sbin/pfctl/pf110.in
new file mode 100644
index 00000000000..177df732e7e
--- /dev/null
+++ b/regress/sbin/pfctl/pf110.in
@@ -0,0 +1,2 @@
+queue rootq on lo1000000 bandwidth 1M
+queue defq parent rootq flows 100 bandwidth 500K default
diff --git a/regress/sbin/pfctl/pf110.ok b/regress/sbin/pfctl/pf110.ok
new file mode 100644
index 00000000000..177df732e7e
--- /dev/null
+++ b/regress/sbin/pfctl/pf110.ok
@@ -0,0 +1,2 @@
+queue rootq on lo1000000 bandwidth 1M
+queue defq parent rootq flows 100 bandwidth 500K default
diff --git a/regress/sbin/pfctl/pf111.in b/regress/sbin/pfctl/pf111.in
new file mode 100644
index 00000000000..d42b0b9b069
--- /dev/null
+++ b/regress/sbin/pfctl/pf111.in
@@ -0,0 +1,3 @@
+queue rootq on lo1000000 bandwidth 1M
+queue defq parent rootq bandwidth 750K
+queue leafq parent defq flows 100 bandwidth 500K default
diff --git a/regress/sbin/pfctl/pf111.ok b/regress/sbin/pfctl/pf111.ok
new file mode 100644
index 00000000000..d42b0b9b069
--- /dev/null
+++ b/regress/sbin/pfctl/pf111.ok
@@ -0,0 +1,3 @@
+queue rootq on lo1000000 bandwidth 1M
+queue defq parent rootq bandwidth 750K
+queue leafq parent defq flows 100 bandwidth 500K default
diff --git a/regress/sbin/pfctl/pfail58.in b/regress/sbin/pfctl/pfail58.in
new file mode 100644
index 00000000000..bbc208d9415
--- /dev/null
+++ b/regress/sbin/pfctl/pfail58.in
@@ -0,0 +1,2 @@
+queue rootq on lo1000000 bandwidth 100M
+queue defq parent rootq bandwidth 50M
diff --git a/regress/sbin/pfctl/pfail58.ok b/regress/sbin/pfctl/pfail58.ok
new file mode 100644
index 00000000000..9bc36f9495b
--- /dev/null
+++ b/regress/sbin/pfctl/pfail58.ok
@@ -0,0 +1 @@
+pfctl: no default queue specified
diff --git a/regress/sbin/pfctl/pfail59.in b/regress/sbin/pfctl/pfail59.in
new file mode 100644
index 00000000000..07f301c3606
--- /dev/null
+++ b/regress/sbin/pfctl/pfail59.in
@@ -0,0 +1,2 @@
+queue rootq on lo1000000 bandwidth 1M
+queue defq parent rootq flows 100 default
diff --git a/regress/sbin/pfctl/pfail59.ok b/regress/sbin/pfctl/pfail59.ok
new file mode 100644
index 00000000000..f332cc38bec
--- /dev/null
+++ b/regress/sbin/pfctl/pfail59.ok
@@ -0,0 +1 @@
+pfctl: queue defq: no bandwidth was specified
diff --git a/regress/sbin/pfctl/pfail60.in b/regress/sbin/pfctl/pfail60.in
new file mode 100644
index 00000000000..975e1e2c64b
--- /dev/null
+++ b/regress/sbin/pfctl/pfail60.in
@@ -0,0 +1,2 @@
+queue rootq on lo1000000 bandwidth 1M flows 100
+queue defq parent rootq bandwidth 500K default
diff --git a/regress/sbin/pfctl/pfail60.ok b/regress/sbin/pfctl/pfail60.ok
new file mode 100644
index 00000000000..a1dfc3590b5
--- /dev/null
+++ b/regress/sbin/pfctl/pfail60.ok
@@ -0,0 +1 @@
+pfctl: flow queue rootq is not a leaf queue
diff --git a/regress/sbin/pfctl/pfail61.in b/regress/sbin/pfctl/pfail61.in
new file mode 100644
index 00000000000..0fe42d28cff
--- /dev/null
+++ b/regress/sbin/pfctl/pfail61.in
@@ -0,0 +1,2 @@
+queue rootq on lo1000000 bandwidth 1M flows 100 default
+queue defq parent rootq bandwidth 500K
diff --git a/regress/sbin/pfctl/pfail61.ok b/regress/sbin/pfctl/pfail61.ok
new file mode 100644
index 00000000000..e0de8c8e4ae
--- /dev/null
+++ b/regress/sbin/pfctl/pfail61.ok
@@ -0,0 +1 @@
+pfctl: default queue rootq is not a leaf queue
diff --git a/regress/sbin/pfctl/pfail62.in b/regress/sbin/pfctl/pfail62.in
new file mode 100644
index 00000000000..356aba58ccd
--- /dev/null
+++ b/regress/sbin/pfctl/pfail62.in
@@ -0,0 +1,2 @@
+queue rootq on lo1000000 bandwidth 1M
+queue defq parent rootq default
diff --git a/regress/sbin/pfctl/pfail62.ok b/regress/sbin/pfctl/pfail62.ok
new file mode 100644
index 00000000000..621e11c7fd5
--- /dev/null
+++ b/regress/sbin/pfctl/pfail62.ok
@@ -0,0 +1 @@
+stdin:2: no bandwidth or flow specification