From: henning <henning@openbsd.org>
Date: Sat, 12 Oct 2013 12:18:44 +0000 (+0000)
Subject: adopt existing altq regress to queueing changes; queuespecs for altq use
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=b5ab48ab38f6e82cf2d2ad83bfa5c236d47206c0;p=openbsd

adopt existing altq regress to queueing changes; queuespecs for altq use
"oldqueue" as keyword for the transition phase
---

diff --git a/regress/sbin/pfctl/pf33.in b/regress/sbin/pfctl/pf33.in
index 8b7d2a0496a..93edde6eca9 100644
--- a/regress/sbin/pfctl/pf33.in
+++ b/regress/sbin/pfctl/pf33.in
@@ -2,13 +2,13 @@ ext_if = "lo0"
 
 altq on $ext_if cbq bandwidth 10Mb tbrsize 1824 \
     queue { deflt, http, ssh, mail, rsets }
-queue	deflt bandwidth 10% priority 0 cbq(default ecn)
-queue	http bandwidth 1.5Mb priority 3 { http_vhosts, http_cust1 }
-queue	 http_vhosts bandwidth 40% cbq(borrow red)
-queue	 http_cust1 bandwidth 0.5Mb
-queue	mail bandwidth 10% priority 1
-queue	ssh bandwidth 200Kb priority 7 cbq(borrow)
-queue	rsets bandwidth 150000b priority 0 cbq(red)
+oldqueue	deflt bandwidth 10% priority 0 cbq(default ecn)
+oldqueue	http bandwidth 1.5Mb priority 3 { http_vhosts, http_cust1 }
+oldqueue	 http_vhosts bandwidth 40% cbq(borrow red)
+oldqueue	 http_cust1 bandwidth 0.5Mb
+oldqueue	mail bandwidth 10% priority 1
+oldqueue	ssh bandwidth 200Kb priority 7 cbq(borrow)
+oldqueue	rsets bandwidth 150000b priority 0 cbq(red)
 
 block return in on $ext_if inet all queue rsets
 pass in on $ext_if inet proto tcp from any to any port 80 keep state queue http
diff --git a/regress/sbin/pfctl/pf33.ok b/regress/sbin/pfctl/pf33.ok
index 151300b271d..c86846d3e43 100644
--- a/regress/sbin/pfctl/pf33.ok
+++ b/regress/sbin/pfctl/pf33.ok
@@ -1,12 +1,12 @@
 ext_if = "lo0"
 altq on lo0 cbq bandwidth 10Mb tbrsize 1824 queue { deflt http ssh mail rsets }
-queue deflt bandwidth 10% priority 0 cbq( red ecn default ) 
-queue http bandwidth 1.50Mb priority 3 { http_vhosts http_cust1 }
-queue http_vhosts bandwidth 40% cbq( red borrow ) 
-queue http_cust1 bandwidth 500Kb 
-queue mail bandwidth 10% 
-queue ssh bandwidth 200Kb priority 7 cbq( borrow ) 
-queue rsets bandwidth 150Kb priority 0 cbq( red ) 
+oldqueue deflt bandwidth 10% priority 0 cbq( red ecn default ) 
+oldqueue http bandwidth 1.50Mb priority 3 { http_vhosts http_cust1 }
+oldqueue http_vhosts bandwidth 40% cbq( red borrow ) 
+oldqueue http_cust1 bandwidth 500Kb 
+oldqueue mail bandwidth 10% 
+oldqueue ssh bandwidth 200Kb priority 7 cbq( borrow ) 
+oldqueue rsets bandwidth 150Kb priority 0 cbq( red ) 
 block return in on lo0 inet all set ( queue rsets )
 pass in on lo0 inet proto tcp from any to any port = 80 flags S/SA set ( queue http )
 pass out on lo0 inet proto tcp from any to any port = 22 flags S/SA set ( queue ssh )
diff --git a/regress/sbin/pfctl/pf35.in b/regress/sbin/pfctl/pf35.in
index de12cfcd2c7..5021d004496 100644
--- a/regress/sbin/pfctl/pf35.in
+++ b/regress/sbin/pfctl/pf35.in
@@ -10,14 +10,14 @@ employeehosts="10.0.1.0/24"
 altq on $intf cbq(ecn) bandwidth 10Mb qlimit 100 tbrsize 5000 \
 	queue { std, http, mail, ssh }
 
-queue	std bandwidth 10% qlimit 1 cbq(default)
-queue	http bandwidth 60% priority 2 cbq(borrow red) { employees, developers }
-queue	 developers bandwidth 60%
-queue	 employees bandwidth 40%
-queue	mail bandwidth 10% priority 0 cbq(borrow ecn)
-queue	ssh bandwidth 20% cbq(borrow) { ssh_interactive, ssh_bulk }
-queue	 ssh_interactive priority 7 bandwidth 30%
-queue	 ssh_bulk priority 0 qlimit 60 bandwidth 70%
+oldqueue	std bandwidth 10% qlimit 1 cbq(default)
+oldqueue	http bandwidth 60% priority 2 cbq(borrow red) { employees, developers }
+oldqueue	 developers bandwidth 60%
+oldqueue	 employees bandwidth 40%
+oldqueue	mail bandwidth 10% priority 0 cbq(borrow ecn)
+oldqueue	ssh bandwidth 20% cbq(borrow) { ssh_interactive, ssh_bulk }
+oldqueue	 ssh_interactive priority 7 bandwidth 30%
+oldqueue	 ssh_bulk priority 0 qlimit 60 bandwidth 70%
 
 block return out on $intf inet all queue std
 pass out on $intf inet proto tcp from $developerhosts to any port 80 keep state \
diff --git a/regress/sbin/pfctl/pf35.ok b/regress/sbin/pfctl/pf35.ok
index 38a84af5f65..3125754ccd3 100644
--- a/regress/sbin/pfctl/pf35.ok
+++ b/regress/sbin/pfctl/pf35.ok
@@ -2,14 +2,14 @@ intf = "lo0"
 developerhosts = "10.0.0.0/24"
 employeehosts = "10.0.1.0/24"
 altq on lo0 cbq( red ecn ) bandwidth 10Mb qlimit 100 tbrsize 5000 queue { std http mail ssh }
-queue std bandwidth 10% qlimit 1 cbq( default ) 
-queue http bandwidth 60% priority 2 cbq( red borrow ) { employees developers }
-queue developers bandwidth 60% 
-queue employees bandwidth 40% 
-queue mail bandwidth 10% priority 0 cbq( red ecn borrow ) 
-queue ssh bandwidth 20% cbq( borrow ) { ssh_interactive ssh_bulk }
-queue ssh_interactive bandwidth 30% priority 7 
-queue ssh_bulk bandwidth 70% priority 0 qlimit 60 
+oldqueue std bandwidth 10% qlimit 1 cbq( default ) 
+oldqueue http bandwidth 60% priority 2 cbq( red borrow ) { employees developers }
+oldqueue developers bandwidth 60% 
+oldqueue employees bandwidth 40% 
+oldqueue mail bandwidth 10% priority 0 cbq( red ecn borrow ) 
+oldqueue ssh bandwidth 20% cbq( borrow ) { ssh_interactive ssh_bulk }
+oldqueue ssh_interactive bandwidth 30% priority 7 
+oldqueue ssh_bulk bandwidth 70% priority 0 qlimit 60 
 block return out on lo0 inet all set ( queue std )
 pass out on lo0 inet proto tcp from 10.0.0.0/24 to any port = 80 flags S/SA set ( queue developers )
 pass out on lo0 inet proto tcp from 10.0.1.0/24 to any port = 80 flags S/SA set ( queue employees )
diff --git a/regress/sbin/pfctl/pf37.in b/regress/sbin/pfctl/pf37.in
index 9d65f3e3fb7..b7b482aa353 100644
--- a/regress/sbin/pfctl/pf37.in
+++ b/regress/sbin/pfctl/pf37.in
@@ -2,4 +2,4 @@
 #also tests multiple queues with the same name but on different interfaces
 
 altq on { lo0 lo1000000 } tbrsize 1824 cbq bandwidth 10Mb queue std
-queue	std cbq(default)
+oldqueue	std cbq(default)
diff --git a/regress/sbin/pfctl/pf37.ok b/regress/sbin/pfctl/pf37.ok
index 13e63197d2e..6a4f9bf3543 100644
--- a/regress/sbin/pfctl/pf37.ok
+++ b/regress/sbin/pfctl/pf37.ok
@@ -1,3 +1,3 @@
 altq on lo0 cbq bandwidth 10Mb tbrsize 1824 queue { std }
 altq on lo1000000 cbq bandwidth 10Mb tbrsize 1824 queue { std }
-queue std cbq( default ) 
+oldqueue std cbq( default ) 
diff --git a/regress/sbin/pfctl/pf42.in b/regress/sbin/pfctl/pf42.in
index 9270158efe4..199e92d62d4 100644
--- a/regress/sbin/pfctl/pf42.in
+++ b/regress/sbin/pfctl/pf42.in
@@ -4,6 +4,6 @@ ext_if = "lo0"
 
 altq on $ext_if bandwidth 10Mb tbrsize 1824 cbq \
     queue { deflt, http, ssh, mail, rsets }
-queue	deflt cbq(default ecn) bandwidth 10% priority 0 
-queue	http priority 3 bandwidth 1.5Mb { http_vhosts, http_cust1 }
-queue	 http_vhosts cbq(borrow red) bandwidth 40% 
+oldqueue	deflt cbq(default ecn) bandwidth 10% priority 0 
+oldqueue	http priority 3 bandwidth 1.5Mb { http_vhosts, http_cust1 }
+oldqueue	 http_vhosts cbq(borrow red) bandwidth 40% 
diff --git a/regress/sbin/pfctl/pf42.ok b/regress/sbin/pfctl/pf42.ok
index bdd1add878c..192260a5ae2 100644
--- a/regress/sbin/pfctl/pf42.ok
+++ b/regress/sbin/pfctl/pf42.ok
@@ -1,5 +1,5 @@
 ext_if = "lo0"
 altq on lo0 cbq bandwidth 10Mb tbrsize 1824 queue { deflt http ssh mail rsets }
-queue deflt bandwidth 10% priority 0 cbq( red ecn default ) 
-queue http bandwidth 1.50Mb priority 3 { http_vhosts http_cust1 }
-queue http_vhosts bandwidth 40% cbq( red borrow ) 
+oldqueue deflt bandwidth 10% priority 0 cbq( red ecn default ) 
+oldqueue http bandwidth 1.50Mb priority 3 { http_vhosts http_cust1 }
+oldqueue http_vhosts bandwidth 40% cbq( red borrow ) 
diff --git a/regress/sbin/pfctl/pf43.in b/regress/sbin/pfctl/pf43.in
index 4e2a732050b..5ecb487a6ae 100644
--- a/regress/sbin/pfctl/pf43.in
+++ b/regress/sbin/pfctl/pf43.in
@@ -1,8 +1,8 @@
 #test various forms of queue assignment
 
 altq on lo0 tbrsize 3648 bandwidth 100Mb cbq queue { bulk, urgent }
-queue bulk priority 1 cbq(default) bandwidth 70%
-queue urgent priority 7 bandwidth 30%
+oldqueue bulk priority 1 cbq(default) bandwidth 70%
+oldqueue urgent priority 7 bandwidth 30%
 pass in on lo0 inet proto tcp from any to lo0 port 22 queue (bulk urgent)
 pass in on lo0 inet proto tcp from any to lo0 port 22 queue bulk
 pass in on lo0 inet proto tcp from any to lo0 port 22 queue (bulk, urgent)
diff --git a/regress/sbin/pfctl/pf43.ok b/regress/sbin/pfctl/pf43.ok
index 14154bac72d..ac3d78c21d4 100644
--- a/regress/sbin/pfctl/pf43.ok
+++ b/regress/sbin/pfctl/pf43.ok
@@ -1,6 +1,6 @@
 altq on lo0 cbq bandwidth 100Mb tbrsize 3648 queue { bulk urgent }
-queue bulk bandwidth 70% cbq( default ) 
-queue urgent bandwidth 30% priority 7 
+oldqueue bulk bandwidth 70% cbq( default ) 
+oldqueue urgent bandwidth 30% priority 7 
 pass in on lo0 inet proto tcp from any to 127.0.0.1 port = 22 flags S/SA set ( queue(bulk, urgent) )
 pass in on lo0 inet proto tcp from any to 127.0.0.1 port = 22 flags S/SA set ( queue bulk )
 pass in on lo0 inet proto tcp from any to 127.0.0.1 port = 22 flags S/SA set ( queue(bulk, urgent) )
diff --git a/regress/sbin/pfctl/pf45.in b/regress/sbin/pfctl/pf45.in
index 139f54be1fd..45c91ac0965 100644
--- a/regress/sbin/pfctl/pf45.in
+++ b/regress/sbin/pfctl/pf45.in
@@ -1,4 +1,4 @@
 altq on lo0 priq bandwidth 10Mb tbrsize 1824 queue { pri-low pri-med pri-high }
-queue pri-low priority 0
-queue pri-med priority 1 priq(default)
-queue pri-high priority 2
+oldqueue pri-low priority 0
+oldqueue pri-med priority 1 priq(default)
+oldqueue pri-high priority 2
diff --git a/regress/sbin/pfctl/pf45.ok b/regress/sbin/pfctl/pf45.ok
index 6f5b89564c1..978e241ade9 100644
--- a/regress/sbin/pfctl/pf45.ok
+++ b/regress/sbin/pfctl/pf45.ok
@@ -1,4 +1,4 @@
 altq on lo0 priq bandwidth 10Mb tbrsize 1824 queue { pri-low pri-med pri-high }
-queue pri-low priority 0 
-queue pri-med priq( default ) 
-queue pri-high priority 2 
+oldqueue pri-low priority 0 
+oldqueue pri-med priq( default ) 
+oldqueue pri-high priority 2 
diff --git a/regress/sbin/pfctl/pf58.in b/regress/sbin/pfctl/pf58.in
index 502c205cabe..374663ce60b 100644
--- a/regress/sbin/pfctl/pf58.in
+++ b/regress/sbin/pfctl/pf58.in
@@ -2,7 +2,7 @@
 
 altq on tun1000000 bandwidth 100Kb cbq queue { std ssh }
 altq on tun1000001 bandwidth 10Mb cbq queue { blah ssh }
-queue std bandwidth 20% cbq(borrow, default)
-queue ssh bandwidth 30% cbq(borrow) { ssh2 }
-queue ssh2 bandwidth 80%
-queue blah bandwidth 60% cbq(default)
+oldqueue std bandwidth 20% cbq(borrow, default)
+oldqueue ssh bandwidth 30% cbq(borrow) { ssh2 }
+oldqueue ssh2 bandwidth 80%
+oldqueue blah bandwidth 60% cbq(default)
diff --git a/regress/sbin/pfctl/pf58.ok b/regress/sbin/pfctl/pf58.ok
index 43f25f3deee..4c09fff2bb0 100644
--- a/regress/sbin/pfctl/pf58.ok
+++ b/regress/sbin/pfctl/pf58.ok
@@ -1,6 +1,6 @@
 altq on tun1000000 cbq bandwidth 100Kb tbrsize 1500 queue { std ssh }
 altq on tun1000001 cbq bandwidth 10Mb tbrsize 6000 queue { blah ssh }
-queue std bandwidth 20% cbq( borrow default ) 
-queue ssh bandwidth 30% cbq( borrow ) { ssh2 }
-queue ssh2 bandwidth 80% 
-queue blah bandwidth 60% cbq( default ) 
+oldqueue std bandwidth 20% cbq( borrow default ) 
+oldqueue ssh bandwidth 30% cbq( borrow ) { ssh2 }
+oldqueue ssh2 bandwidth 80% 
+oldqueue blah bandwidth 60% cbq( default ) 
diff --git a/regress/sbin/pfctl/pf59.in b/regress/sbin/pfctl/pf59.in
index e6d16317fe8..f6e4eb5dc28 100644
--- a/regress/sbin/pfctl/pf59.in
+++ b/regress/sbin/pfctl/pf59.in
@@ -1,4 +1,4 @@
 #tests an edge case in LOOP_THROUGH behaviour, the one loop despite the 
 #list is empty
 altq on { lo0 tun1000000 } priq bandwidth 10Mb tbrsize 1824 queue q_def
-queue q_def priq(default)
+oldqueue q_def priq(default)
diff --git a/regress/sbin/pfctl/pf59.ok b/regress/sbin/pfctl/pf59.ok
index c7d9cd8300a..03168d6c0dd 100644
--- a/regress/sbin/pfctl/pf59.ok
+++ b/regress/sbin/pfctl/pf59.ok
@@ -1,3 +1,3 @@
 altq on lo0 priq bandwidth 10Mb tbrsize 1824 queue { q_def }
 altq on tun1000000 priq bandwidth 10Mb tbrsize 1824 queue { q_def }
-queue q_def priq( default ) 
+oldqueue q_def priq( default ) 
diff --git a/regress/sbin/pfctl/pf62.in b/regress/sbin/pfctl/pf62.in
index 64447b37552..24016ffe877 100644
--- a/regress/sbin/pfctl/pf62.in
+++ b/regress/sbin/pfctl/pf62.in
@@ -3,10 +3,10 @@
 # -two differently named queues must not share a qid, even on different ifs
 
 altq on lo0 tbrsize 1824 bandwidth 10Mb hfsc queue { eins zwei drei }
-queue eins bandwidth 10% hfsc(default)
-queue zwei bandwidth 60% { sub2 sub3 }
-queue  sub2 bandwidth 20%
-queue  sub3 bandwidth 20%
-queue drei bandwidth 10%
+oldqueue eins bandwidth 10% hfsc(default)
+oldqueue zwei bandwidth 60% { sub2 sub3 }
+oldqueue  sub2 bandwidth 20%
+oldqueue  sub3 bandwidth 20%
+oldqueue drei bandwidth 10%
 
 
diff --git a/regress/sbin/pfctl/pf62.ok b/regress/sbin/pfctl/pf62.ok
index c9c675eaab0..369bd7538f2 100644
--- a/regress/sbin/pfctl/pf62.ok
+++ b/regress/sbin/pfctl/pf62.ok
@@ -1,6 +1,6 @@
 altq on lo0 hfsc bandwidth 10Mb tbrsize 1824 queue { eins zwei drei }
-queue eins bandwidth 10% hfsc( default ) 
-queue zwei bandwidth 60% { sub2 sub3 }
-queue sub2 bandwidth 20% 
-queue sub3 bandwidth 20% 
-queue drei bandwidth 10% 
+oldqueue eins bandwidth 10% hfsc( default ) 
+oldqueue zwei bandwidth 60% { sub2 sub3 }
+oldqueue sub2 bandwidth 20% 
+oldqueue sub3 bandwidth 20% 
+oldqueue drei bandwidth 10% 
diff --git a/regress/sbin/pfctl/pf63.in b/regress/sbin/pfctl/pf63.in
index e1aa57da696..68076e7d889 100644
--- a/regress/sbin/pfctl/pf63.in
+++ b/regress/sbin/pfctl/pf63.in
@@ -1,9 +1,9 @@
 # service curve parse/print functions feedback test
 
 altq on lo0 tbrsize 1824 bandwidth 10Mb hfsc queue { eins zwei drei }
-queue eins bandwidth 10% hfsc(default linkshare(20% 20 5%) realtime 500Kb)
-queue zwei bandwidth 40% hfsc(linkshare(35% 10 25%) upperlimit 5Mb)
-queue drei bandwidth 50% hfsc(linkshare(45% 20 4Mb) \
+oldqueue eins bandwidth 10% hfsc(default linkshare(20% 20 5%) realtime 500Kb)
+oldqueue zwei bandwidth 40% hfsc(linkshare(35% 10 25%) upperlimit 5Mb)
+oldqueue drei bandwidth 50% hfsc(linkshare(45% 20 4Mb) \
 	upperlimit(65% 10 45%))
 
 
diff --git a/regress/sbin/pfctl/pf63.ok b/regress/sbin/pfctl/pf63.ok
index 44b4d93fadf..df8bf3ffb6f 100644
--- a/regress/sbin/pfctl/pf63.ok
+++ b/regress/sbin/pfctl/pf63.ok
@@ -1,4 +1,4 @@
 altq on lo0 hfsc bandwidth 10Mb tbrsize 1824 queue { eins zwei drei }
-queue eins bandwidth 10% hfsc( default realtime 500Kb linkshare(20% 20 5%) ) 
-queue zwei bandwidth 40% hfsc( linkshare(35% 10 25%) upperlimit 5Mb ) 
-queue drei bandwidth 50% hfsc( linkshare(45% 20 4Mb) upperlimit(65% 10 45%) ) 
+oldqueue eins bandwidth 10% hfsc( default realtime 500Kb linkshare(20% 20 5%) ) 
+oldqueue zwei bandwidth 40% hfsc( linkshare(35% 10 25%) upperlimit 5Mb ) 
+oldqueue drei bandwidth 50% hfsc( linkshare(45% 20 4Mb) upperlimit(65% 10 45%) ) 
diff --git a/regress/sbin/pfctl/pf64.in b/regress/sbin/pfctl/pf64.in
index 35e709be88c..082ea12c46d 100644
--- a/regress/sbin/pfctl/pf64.in
+++ b/regress/sbin/pfctl/pf64.in
@@ -3,9 +3,9 @@
 
 altq on lo0 tbrsize 1824 bandwidth 10Mb hfsc queue { eins zwei drei }
 altq on tun1000000 tbrsize 1824 bandwidth 100Mb hfsc queue { eins zwei drei }
-queue eins bandwidth 10% hfsc(default linkshare(20% 20 5%) realtime 500Kb)
-queue zwei bandwidth 40% hfsc(linkshare(35% 10 25%) upperlimit 5Mb)
-queue drei bandwidth 50% hfsc(linkshare(45% 20 4Mb) \
+oldqueue eins bandwidth 10% hfsc(default linkshare(20% 20 5%) realtime 500Kb)
+oldqueue zwei bandwidth 40% hfsc(linkshare(35% 10 25%) upperlimit 5Mb)
+oldqueue drei bandwidth 50% hfsc(linkshare(45% 20 4Mb) \
 	upperlimit(65% 10 45%))
 
 
diff --git a/regress/sbin/pfctl/pf64.ok b/regress/sbin/pfctl/pf64.ok
index 4e0005fd3a6..87933e03bbf 100644
--- a/regress/sbin/pfctl/pf64.ok
+++ b/regress/sbin/pfctl/pf64.ok
@@ -1,5 +1,5 @@
 altq on lo0 hfsc bandwidth 10Mb tbrsize 1824 queue { eins zwei drei }
 altq on tun1000000 hfsc bandwidth 100Mb tbrsize 1824 queue { eins zwei drei }
-queue eins bandwidth 10% hfsc( default realtime 500Kb linkshare(20% 20 5%) ) 
-queue zwei bandwidth 40% hfsc( linkshare(35% 10 25%) upperlimit 5Mb ) 
-queue drei bandwidth 50% hfsc( linkshare(45% 20 4Mb) upperlimit(65% 10 45%) ) 
+oldqueue eins bandwidth 10% hfsc( default realtime 500Kb linkshare(20% 20 5%) ) 
+oldqueue zwei bandwidth 40% hfsc( linkshare(35% 10 25%) upperlimit 5Mb ) 
+oldqueue drei bandwidth 50% hfsc( linkshare(45% 20 4Mb) upperlimit(65% 10 45%) ) 
diff --git a/regress/sbin/pfctl/pfail18.in b/regress/sbin/pfctl/pfail18.in
index e48a7c4dfb5..de8056d1d13 100644
--- a/regress/sbin/pfctl/pfail18.in
+++ b/regress/sbin/pfctl/pfail18.in
@@ -1,6 +1,6 @@
 # queue without parent
 
 altq on lo0 cbq tbrsize 1824 bandwidth 10Mb queue { frenchs eat frogs }
-queue frenchs bandwidth 30% cbq(default)
-queue eat bandwidth 30%
-queue toads bandwidth 30%
+oldqueue frenchs bandwidth 30% cbq(default)
+oldqueue eat bandwidth 30%
+oldqueue toads bandwidth 30%
diff --git a/regress/sbin/pfctl/pfail18.ok b/regress/sbin/pfctl/pfail18.ok
index 4428abffb3e..f2ab47d6360 100644
--- a/regress/sbin/pfctl/pfail18.ok
+++ b/regress/sbin/pfctl/pfail18.ok
@@ -1,5 +1,5 @@
 stdin:6: queue toads has no parent
 stdin:6: errors in queue definition
 altq on lo0 cbq bandwidth 10Mb tbrsize 1824 queue { frenchs eat frogs }
-queue frenchs bandwidth 30% cbq( default ) 
-queue eat bandwidth 30% 
+oldqueue frenchs bandwidth 30% cbq( default ) 
+oldqueue eat bandwidth 30% 
diff --git a/regress/sbin/pfctl/pfail31.in b/regress/sbin/pfctl/pfail31.in
index 2919134c7a1..568fc4a42c2 100644
--- a/regress/sbin/pfctl/pfail31.in
+++ b/regress/sbin/pfctl/pfail31.in
@@ -4,9 +4,9 @@ lan_if = lo0
 ext_if = nothere0
 
 altq on $ext_if bandwidth 512Kb tbrsize 33224 cbq queue { q_ext_std }
-queue q_ext_std bandwidth 100% cbq(default) { q_ext_p2p }
-queue   q_ext_p2p bandwidth 25% cbq(red ecn)
+oldqueue q_ext_std bandwidth 100% cbq(default) { q_ext_p2p }
+oldqueue   q_ext_p2p bandwidth 25% cbq(red ecn)
 
 altq on $lan_if bandwidth 512Kb tbrsize 33224 cbq queue { q_lan_std }
-queue q_lan_std bandwidth 100% cbq(default) { q_lan_p2p }
-queue   q_lan_p2p bandwidth 25% cbq(red ecn)
+oldqueue q_lan_std bandwidth 100% cbq(default) { q_lan_p2p }
+oldqueue   q_lan_p2p bandwidth 25% cbq(red ecn)
diff --git a/regress/sbin/pfctl/pfail31.ok b/regress/sbin/pfctl/pfail31.ok
index a5736fdf187..1c59461c769 100644
--- a/regress/sbin/pfctl/pfail31.ok
+++ b/regress/sbin/pfctl/pfail31.ok
@@ -6,5 +6,5 @@ stdin:8: errors in queue definition
 lan_if = "lo0"
 ext_if = "nothere0"
 altq on lo0 cbq bandwidth 512Kb tbrsize 33224 queue { q_lan_std }
-queue q_lan_std cbq( default ) { q_lan_p2p }
-queue q_lan_p2p bandwidth 25% cbq( red ecn ) 
+oldqueue q_lan_std cbq( default ) { q_lan_p2p }
+oldqueue q_lan_p2p bandwidth 25% cbq( red ecn ) 
diff --git a/regress/sbin/pfctl/pfail32.in b/regress/sbin/pfctl/pfail32.in
index bed86c57149..d1c4a7cace8 100644
--- a/regress/sbin/pfctl/pfail32.in
+++ b/regress/sbin/pfctl/pfail32.in
@@ -1,4 +1,4 @@
 # queue doubly defined on one interface
 altq on gif3 cbq bandwidth 100Kb queue { eins, zwei }
-queue eins cbq (default) { zwei }
-queue zwei
+oldqueue eins cbq (default) { zwei }
+oldqueue zwei
diff --git a/regress/sbin/pfctl/pfail32.ok b/regress/sbin/pfctl/pfail32.ok
index 643d8073bbc..e59a1ebfc34 100644
--- a/regress/sbin/pfctl/pfail32.ok
+++ b/regress/sbin/pfctl/pfail32.ok
@@ -2,5 +2,5 @@ pfctl: the sum of the child bandwidth higher than parent "root_gif3"
 queue zwei already exists on interface gif3
 stdin:4: errors in queue definition
 altq on gif3 cbq bandwidth 100Kb tbrsize 1500 queue { eins zwei }
-queue eins cbq( default ) { zwei }
-queue zwei 
+oldqueue eins cbq( default ) { zwei }
+oldqueue zwei 
diff --git a/regress/sbin/pfctl/pfail35.in b/regress/sbin/pfctl/pfail35.in
index ec89dfe0b33..04a75c75d4f 100644
--- a/regress/sbin/pfctl/pfail35.in
+++ b/regress/sbin/pfctl/pfail35.in
@@ -1,6 +1,6 @@
 # double linkshare spec
 
 altq on lo0 tbrsize 1824 bandwidth 10Mb hfsc queue { eins }
-queue eins bandwidth 10% hfsc(default linkshare(20% 20 5%) linkshare 1Mb)
+oldqueue eins bandwidth 10% hfsc(default linkshare(20% 20 5%) linkshare 1Mb)
 
 
diff --git a/regress/sbin/pfctl/pfail36.in b/regress/sbin/pfctl/pfail36.in
index 8d9fe4a2530..af378f9e67c 100644
--- a/regress/sbin/pfctl/pfail36.in
+++ b/regress/sbin/pfctl/pfail36.in
@@ -1,6 +1,6 @@
 # double upperlimit
 
 altq on lo0 tbrsize 1824 bandwidth 10Mb hfsc queue { eins }
-queue eins bandwidth 10% hfsc(default upperlimit(20% 20 5%) upperlimit 1Mb)
+oldqueue eins bandwidth 10% hfsc(default upperlimit(20% 20 5%) upperlimit 1Mb)
 
 
diff --git a/regress/sbin/pfctl/pfail44.in b/regress/sbin/pfctl/pfail44.in
index 5a31098e0d9..b79927c17e7 100644
--- a/regress/sbin/pfctl/pfail44.in
+++ b/regress/sbin/pfctl/pfail44.in
@@ -3,6 +3,6 @@
 ext_if = lo0
 
 altq on $ext_if bandwidth 512Kb tbrsize 33224 cbq queue { q_ext_std }
-queue q_ext_std priority 9 cbq(default)
+oldqueue q_ext_std priority 9 cbq(default)
 
 pass in all
diff --git a/regress/sbin/pfctl/pfail44.ok b/regress/sbin/pfctl/pfail44.ok
index 895152de3c0..880e9c304ce 100644
--- a/regress/sbin/pfctl/pfail44.ok
+++ b/regress/sbin/pfctl/pfail44.ok
@@ -2,4 +2,4 @@ pfctl: priority out of range: max 7
 stdin:6: errors in queue definition
 ext_if = "lo0"
 altq on lo0 cbq bandwidth 512Kb tbrsize 33224 queue { q_ext_std }
-queue root_lo0 priority 0 cbq( wrr root ) 
+oldqueue root_lo0 priority 0 cbq( wrr root ) 
diff --git a/regress/sbin/pfctl/pfail45.in b/regress/sbin/pfctl/pfail45.in
index 54857dc9436..d29c7495f35 100644
--- a/regress/sbin/pfctl/pfail45.in
+++ b/regress/sbin/pfctl/pfail45.in
@@ -3,4 +3,4 @@
 ext_if = lo0
 
 altq on $ext_if bandwidth 512Kb tbrsize 33224 priq queue { q_ext_std }
-queue q_ext_std priority 16 priq(default)
+oldqueue q_ext_std priority 16 priq(default)
diff --git a/regress/sbin/pfctl/pfail45.ok b/regress/sbin/pfctl/pfail45.ok
index fadee8fde76..0de2f85818d 100644
--- a/regress/sbin/pfctl/pfail45.ok
+++ b/regress/sbin/pfctl/pfail45.ok
@@ -2,4 +2,4 @@ pfctl: priority out of range: max 15
 stdin:6: errors in queue definition
 ext_if = "lo0"
 altq on lo0 priq bandwidth 512Kb tbrsize 33224 queue { q_ext_std }
-queue  priority 0 
+oldqueue  priority 0 
diff --git a/regress/sbin/pfctl/pfail46.in b/regress/sbin/pfctl/pfail46.in
index 13e31f6a1bb..16103acacbd 100644
--- a/regress/sbin/pfctl/pfail46.in
+++ b/regress/sbin/pfctl/pfail46.in
@@ -2,4 +2,4 @@
 # how one can be stupid enough to specify this in the first place is beyond me
 
 altq on lo0 bandwidth 512Kb tbrsize 33224 cbq queue { i_am_braindead }
-queue i_am_braindead cbq(default) { i_am_braindead }
+oldqueue i_am_braindead cbq(default) { i_am_braindead }
diff --git a/regress/sbin/pfctl/pfail46.ok b/regress/sbin/pfctl/pfail46.ok
index 38f406910bd..a8887f43331 100644
--- a/regress/sbin/pfctl/pfail46.ok
+++ b/regress/sbin/pfctl/pfail46.ok
@@ -1,4 +1,4 @@
 stdin:5: queue cannot have itself as child
 stdin:5: errors in queue definition
 altq on lo0 cbq bandwidth 512Kb tbrsize 33224 queue { i_am_braindead }
-queue i_am_braindead cbq( default ) { i_am_braindead }
+oldqueue i_am_braindead cbq( default ) { i_am_braindead }
diff --git a/regress/sbin/pfctl/pfail53.in b/regress/sbin/pfctl/pfail53.in
index 8ce29a2e9cd..965f1b1b73c 100644
--- a/regress/sbin/pfctl/pfail53.in
+++ b/regress/sbin/pfctl/pfail53.in
@@ -1,6 +1,6 @@
 # queuenames cannot be numbers
 altq on lo0 tbrsize 1824 bandwidth 10Mb priq queue 80
-queue 80 priority 2 priq(default)
+oldqueue 80 priority 2 priq(default)
 
 # tablenames cannot be numbers
 table <444> { 1.2.3.4 }
diff --git a/regress/sbin/pfctl/pfaltq1.in b/regress/sbin/pfctl/pfaltq1.in
index 80af37e316a..34e900acc78 100644
--- a/regress/sbin/pfctl/pfaltq1.in
+++ b/regress/sbin/pfctl/pfaltq1.in
@@ -1,5 +1,5 @@
 #queue id assignment with priq
 
 altq on { lo0 tun1000000 } tbrsize 1824 priq bandwidth 10Mb queue { one two }
-queue one priority 1 priq(default)
-queue two priority 15
+oldqueue one priority 1 priq(default)
+oldqueue two priority 15
diff --git a/regress/sbin/pfctl/pfaltq1.ok b/regress/sbin/pfctl/pfaltq1.ok
index 97d187b96c1..13e494023d7 100644
--- a/regress/sbin/pfctl/pfaltq1.ok
+++ b/regress/sbin/pfctl/pfaltq1.ok
@@ -1,8 +1,8 @@
-queue one on lo0 priq( default ) 
+oldqueue one on lo0 priq( default ) 
   [ qid=1 ifname=lo0 ifbandwidth=10Mb ]
-queue one on tun1000000 priq( default ) 
+oldqueue one on tun1000000 priq( default ) 
   [ qid=1 ifname=tun1000000 ifbandwidth=10Mb ]
-queue two on lo0 priority 15 
+oldqueue two on lo0 priority 15 
   [ qid=2 ifname=lo0 ifbandwidth=10Mb ]
-queue two on tun1000000 priority 15 
+oldqueue two on tun1000000 priority 15 
   [ qid=2 ifname=tun1000000 ifbandwidth=10Mb ]
diff --git a/regress/sbin/pfctl/pfaltq10.in b/regress/sbin/pfctl/pfaltq10.in
index a5e432b2977..3128230e0e6 100644
--- a/regress/sbin/pfctl/pfaltq10.in
+++ b/regress/sbin/pfctl/pfaltq10.in
@@ -2,8 +2,8 @@
 #must have the same qid
 
 altq on { lo0 tun1000000 } tbrsize 1824 hfsc bandwidth 10Mb queue { one two }
-queue one bandwidth 10% hfsc(default)
-queue two bandwidth 90% { three four}
-queue  three bandwidth 50%
-queue  four bandwidth 40%
+oldqueue one bandwidth 10% hfsc(default)
+oldqueue two bandwidth 90% { three four}
+oldqueue  three bandwidth 50%
+oldqueue  four bandwidth 40%
 
diff --git a/regress/sbin/pfctl/pfaltq10.ok b/regress/sbin/pfctl/pfaltq10.ok
index 06281e0cba4..f407c18e93d 100644
--- a/regress/sbin/pfctl/pfaltq10.ok
+++ b/regress/sbin/pfctl/pfaltq10.ok
@@ -1,20 +1,20 @@
-queue root_lo0 on lo0 bandwidth 10Mb priority 0 {one, two}
+oldqueue root_lo0 on lo0 bandwidth 10Mb priority 0 {one, two}
   [ qid=1 ifname=lo0 ifbandwidth=10Mb ]
-queue  one on lo0 bandwidth 1Mb hfsc( default ) 
+oldqueue  one on lo0 bandwidth 1Mb hfsc( default ) 
   [ qid=3 ifname=lo0 ifbandwidth=10Mb ]
-queue  two on lo0 bandwidth 9Mb {three, four}
+oldqueue  two on lo0 bandwidth 9Mb {three, four}
   [ qid=4 ifname=lo0 ifbandwidth=10Mb ]
-queue   three on lo0 bandwidth 4.50Mb 
+oldqueue   three on lo0 bandwidth 4.50Mb 
   [ qid=5 ifname=lo0 ifbandwidth=10Mb ]
-queue   four on lo0 bandwidth 3.60Mb 
+oldqueue   four on lo0 bandwidth 3.60Mb 
   [ qid=6 ifname=lo0 ifbandwidth=10Mb ]
-queue root_tun1000000 on tun1000000 bandwidth 10Mb priority 0 {one, two}
+oldqueue root_tun1000000 on tun1000000 bandwidth 10Mb priority 0 {one, two}
   [ qid=2 ifname=tun1000000 ifbandwidth=10Mb ]
-queue  one on tun1000000 bandwidth 1Mb hfsc( default ) 
+oldqueue  one on tun1000000 bandwidth 1Mb hfsc( default ) 
   [ qid=3 ifname=tun1000000 ifbandwidth=10Mb ]
-queue  two on tun1000000 bandwidth 9Mb {three, four}
+oldqueue  two on tun1000000 bandwidth 9Mb {three, four}
   [ qid=4 ifname=tun1000000 ifbandwidth=10Mb ]
-queue   three on tun1000000 bandwidth 4.50Mb 
+oldqueue   three on tun1000000 bandwidth 4.50Mb 
   [ qid=5 ifname=tun1000000 ifbandwidth=10Mb ]
-queue   four on tun1000000 bandwidth 3.60Mb 
+oldqueue   four on tun1000000 bandwidth 3.60Mb 
   [ qid=6 ifname=tun1000000 ifbandwidth=10Mb ]
diff --git a/regress/sbin/pfctl/pfaltq11.in b/regress/sbin/pfctl/pfaltq11.in
index 0e1551921e0..1d33d756439 100644
--- a/regress/sbin/pfctl/pfaltq11.in
+++ b/regress/sbin/pfctl/pfaltq11.in
@@ -4,12 +4,12 @@
 
 altq on lo0 tbrsize 1824 bandwidth 10Mb hfsc queue { eins zwei drei }
 altq on tun1000000 tbrsize 1824 bandwidth 33600b hfsc queue { vier zwei fuenf }
-queue eins bandwidth 10% hfsc(default)
-queue zwei bandwidth 80% { sub2 sub3 }
-queue  sub2 bandwidth 50%
-queue  sub3 bandwidth 50%
-queue drei bandwidth 10% subseven
-queue vier bandwidth 10% hfsc(default)
-queue fuenf bandwidth 5% subseven
-queue  subseven bandwidth 90%
+oldqueue eins bandwidth 10% hfsc(default)
+oldqueue zwei bandwidth 80% { sub2 sub3 }
+oldqueue  sub2 bandwidth 50%
+oldqueue  sub3 bandwidth 50%
+oldqueue drei bandwidth 10% subseven
+oldqueue vier bandwidth 10% hfsc(default)
+oldqueue fuenf bandwidth 5% subseven
+oldqueue  subseven bandwidth 90%
 
diff --git a/regress/sbin/pfctl/pfaltq11.ok b/regress/sbin/pfctl/pfaltq11.ok
index a133ca7e624..ae7e26621e4 100644
--- a/regress/sbin/pfctl/pfaltq11.ok
+++ b/regress/sbin/pfctl/pfaltq11.ok
@@ -1,28 +1,28 @@
-queue root_lo0 on lo0 bandwidth 10Mb priority 0 {eins, zwei, drei}
+oldqueue root_lo0 on lo0 bandwidth 10Mb priority 0 {eins, zwei, drei}
   [ qid=1 ifname=lo0 ifbandwidth=10Mb ]
-queue  eins on lo0 bandwidth 1Mb hfsc( default ) 
+oldqueue  eins on lo0 bandwidth 1Mb hfsc( default ) 
   [ qid=3 ifname=lo0 ifbandwidth=10Mb ]
-queue  zwei on lo0 bandwidth 8Mb {sub2, sub3}
+oldqueue  zwei on lo0 bandwidth 8Mb {sub2, sub3}
   [ qid=4 ifname=lo0 ifbandwidth=10Mb ]
-queue   sub2 on lo0 bandwidth 4Mb 
+oldqueue   sub2 on lo0 bandwidth 4Mb 
   [ qid=5 ifname=lo0 ifbandwidth=10Mb ]
-queue   sub3 on lo0 bandwidth 4Mb 
+oldqueue   sub3 on lo0 bandwidth 4Mb 
   [ qid=6 ifname=lo0 ifbandwidth=10Mb ]
-queue  drei on lo0 bandwidth 1Mb {subseven}
+oldqueue  drei on lo0 bandwidth 1Mb {subseven}
   [ qid=7 ifname=lo0 ifbandwidth=10Mb ]
-queue   subseven on lo0 bandwidth 900Kb 
+oldqueue   subseven on lo0 bandwidth 900Kb 
   [ qid=10 ifname=lo0 ifbandwidth=10Mb ]
-queue root_tun1000000 on tun1000000 bandwidth 33.60Kb priority 0 {zwei, vier, fuenf}
+oldqueue root_tun1000000 on tun1000000 bandwidth 33.60Kb priority 0 {zwei, vier, fuenf}
   [ qid=2 ifname=tun1000000 ifbandwidth=33.60Kb ]
-queue  zwei on tun1000000 bandwidth 26.88Kb {sub2, sub3}
+oldqueue  zwei on tun1000000 bandwidth 26.88Kb {sub2, sub3}
   [ qid=4 ifname=tun1000000 ifbandwidth=33.60Kb ]
-queue   sub2 on tun1000000 bandwidth 13.40Kb 
+oldqueue   sub2 on tun1000000 bandwidth 13.40Kb 
   [ qid=5 ifname=tun1000000 ifbandwidth=33.60Kb ]
-queue   sub3 on tun1000000 bandwidth 13.40Kb 
+oldqueue   sub3 on tun1000000 bandwidth 13.40Kb 
   [ qid=6 ifname=tun1000000 ifbandwidth=33.60Kb ]
-queue  vier on tun1000000 bandwidth 3.36Kb hfsc( default ) 
+oldqueue  vier on tun1000000 bandwidth 3.36Kb hfsc( default ) 
   [ qid=8 ifname=tun1000000 ifbandwidth=33.60Kb ]
-queue  fuenf on tun1000000 bandwidth 1.68Kb {subseven}
+oldqueue  fuenf on tun1000000 bandwidth 1.68Kb {subseven}
   [ qid=9 ifname=tun1000000 ifbandwidth=33.60Kb ]
-queue   subseven on tun1000000 bandwidth 1.44Kb 
+oldqueue   subseven on tun1000000 bandwidth 1.44Kb 
   [ qid=10 ifname=tun1000000 ifbandwidth=33.60Kb ]
diff --git a/regress/sbin/pfctl/pfaltq2.in b/regress/sbin/pfctl/pfaltq2.in
index 7fa512eaac5..43f4ade8509 100644
--- a/regress/sbin/pfctl/pfaltq2.in
+++ b/regress/sbin/pfctl/pfaltq2.in
@@ -2,8 +2,8 @@
 #must have the same qid
 
 altq on { lo0 tun1000000 } tbrsize 1824 cbq bandwidth 10Mb queue { one two }
-queue one bandwidth 10% cbq(default)
-queue two bandwidth 90% { three four}
-queue  three bandwidth 50%
-queue  four bandwidth 40%
+oldqueue one bandwidth 10% cbq(default)
+oldqueue two bandwidth 90% { three four}
+oldqueue  three bandwidth 50%
+oldqueue  four bandwidth 40%
 
diff --git a/regress/sbin/pfctl/pfaltq2.ok b/regress/sbin/pfctl/pfaltq2.ok
index bd34077347d..976f9a77d1f 100644
--- a/regress/sbin/pfctl/pfaltq2.ok
+++ b/regress/sbin/pfctl/pfaltq2.ok
@@ -1,20 +1,20 @@
-queue root_lo0 on lo0 bandwidth 10Mb priority 0 cbq( wrr root ) {one, two}
+oldqueue root_lo0 on lo0 bandwidth 10Mb priority 0 cbq( wrr root ) {one, two}
   [ qid=1 ifname=lo0 ifbandwidth=10Mb ]
-queue  one on lo0 bandwidth 1Mb cbq( default ) 
+oldqueue  one on lo0 bandwidth 1Mb cbq( default ) 
   [ qid=3 ifname=lo0 ifbandwidth=10Mb ]
-queue  two on lo0 bandwidth 9Mb {three, four}
+oldqueue  two on lo0 bandwidth 9Mb {three, four}
   [ qid=4 ifname=lo0 ifbandwidth=10Mb ]
-queue   three on lo0 bandwidth 4.50Mb 
+oldqueue   three on lo0 bandwidth 4.50Mb 
   [ qid=5 ifname=lo0 ifbandwidth=10Mb ]
-queue   four on lo0 bandwidth 3.60Mb 
+oldqueue   four on lo0 bandwidth 3.60Mb 
   [ qid=6 ifname=lo0 ifbandwidth=10Mb ]
-queue root_tun1000000 on tun1000000 bandwidth 10Mb priority 0 cbq( wrr root ) {one, two}
+oldqueue root_tun1000000 on tun1000000 bandwidth 10Mb priority 0 cbq( wrr root ) {one, two}
   [ qid=2 ifname=tun1000000 ifbandwidth=10Mb ]
-queue  one on tun1000000 bandwidth 1Mb cbq( default ) 
+oldqueue  one on tun1000000 bandwidth 1Mb cbq( default ) 
   [ qid=3 ifname=tun1000000 ifbandwidth=10Mb ]
-queue  two on tun1000000 bandwidth 9Mb {three, four}
+oldqueue  two on tun1000000 bandwidth 9Mb {three, four}
   [ qid=4 ifname=tun1000000 ifbandwidth=10Mb ]
-queue   three on tun1000000 bandwidth 4.50Mb 
+oldqueue   three on tun1000000 bandwidth 4.50Mb 
   [ qid=5 ifname=tun1000000 ifbandwidth=10Mb ]
-queue   four on tun1000000 bandwidth 3.60Mb 
+oldqueue   four on tun1000000 bandwidth 3.60Mb 
   [ qid=6 ifname=tun1000000 ifbandwidth=10Mb ]
diff --git a/regress/sbin/pfctl/pfaltq3.in b/regress/sbin/pfctl/pfaltq3.in
index 8558bdf888b..d4e930b9473 100644
--- a/regress/sbin/pfctl/pfaltq3.in
+++ b/regress/sbin/pfctl/pfaltq3.in
@@ -4,12 +4,12 @@
 
 altq on lo0 tbrsize 1824 bandwidth 10Mb cbq queue { eins zwei drei }
 altq on tun1000000 tbrsize 1824 bandwidth 128000b cbq queue { vier zwei fuenf }
-queue eins bandwidth 10% cbq(default)
-queue zwei bandwidth 60% { sub2 sub3 }
-queue  sub2 bandwidth 50%
-queue  sub3 bandwidth 50%
-queue drei bandwidth 30% subseven
-queue vier bandwidth 25% cbq(default)
-queue fuenf bandwidth 15% subseven
-queue  subseven bandwidth 90%
+oldqueue eins bandwidth 10% cbq(default)
+oldqueue zwei bandwidth 60% { sub2 sub3 }
+oldqueue  sub2 bandwidth 50%
+oldqueue  sub3 bandwidth 50%
+oldqueue drei bandwidth 30% subseven
+oldqueue vier bandwidth 25% cbq(default)
+oldqueue fuenf bandwidth 15% subseven
+oldqueue  subseven bandwidth 90%
 
diff --git a/regress/sbin/pfctl/pfaltq3.ok b/regress/sbin/pfctl/pfaltq3.ok
index 5733c0e7dff..6a7105c0e2b 100644
--- a/regress/sbin/pfctl/pfaltq3.ok
+++ b/regress/sbin/pfctl/pfaltq3.ok
@@ -1,28 +1,28 @@
-queue root_lo0 on lo0 bandwidth 10Mb priority 0 cbq( wrr root ) {eins, zwei, drei}
+oldqueue root_lo0 on lo0 bandwidth 10Mb priority 0 cbq( wrr root ) {eins, zwei, drei}
   [ qid=1 ifname=lo0 ifbandwidth=10Mb ]
-queue  eins on lo0 bandwidth 1Mb cbq( default ) 
+oldqueue  eins on lo0 bandwidth 1Mb cbq( default ) 
   [ qid=3 ifname=lo0 ifbandwidth=10Mb ]
-queue  zwei on lo0 bandwidth 6Mb {sub2, sub3}
+oldqueue  zwei on lo0 bandwidth 6Mb {sub2, sub3}
   [ qid=4 ifname=lo0 ifbandwidth=10Mb ]
-queue   sub2 on lo0 bandwidth 3Mb 
+oldqueue   sub2 on lo0 bandwidth 3Mb 
   [ qid=5 ifname=lo0 ifbandwidth=10Mb ]
-queue   sub3 on lo0 bandwidth 3Mb 
+oldqueue   sub3 on lo0 bandwidth 3Mb 
   [ qid=6 ifname=lo0 ifbandwidth=10Mb ]
-queue  drei on lo0 bandwidth 3Mb {subseven}
+oldqueue  drei on lo0 bandwidth 3Mb {subseven}
   [ qid=7 ifname=lo0 ifbandwidth=10Mb ]
-queue   subseven on lo0 bandwidth 2.70Mb 
+oldqueue   subseven on lo0 bandwidth 2.70Mb 
   [ qid=10 ifname=lo0 ifbandwidth=10Mb ]
-queue root_tun1000000 on tun1000000 bandwidth 128Kb priority 0 cbq( wrr root ) {zwei, vier, fuenf}
+oldqueue root_tun1000000 on tun1000000 bandwidth 128Kb priority 0 cbq( wrr root ) {zwei, vier, fuenf}
   [ qid=2 ifname=tun1000000 ifbandwidth=128Kb ]
-queue  zwei on tun1000000 bandwidth 76.80Kb {sub2, sub3}
+oldqueue  zwei on tun1000000 bandwidth 76.80Kb {sub2, sub3}
   [ qid=4 ifname=tun1000000 ifbandwidth=128Kb ]
-queue   sub2 on tun1000000 bandwidth 38.40Kb 
+oldqueue   sub2 on tun1000000 bandwidth 38.40Kb 
   [ qid=5 ifname=tun1000000 ifbandwidth=128Kb ]
-queue   sub3 on tun1000000 bandwidth 38.40Kb 
+oldqueue   sub3 on tun1000000 bandwidth 38.40Kb 
   [ qid=6 ifname=tun1000000 ifbandwidth=128Kb ]
-queue  vier on tun1000000 bandwidth 32Kb cbq( default ) 
+oldqueue  vier on tun1000000 bandwidth 32Kb cbq( default ) 
   [ qid=8 ifname=tun1000000 ifbandwidth=128Kb ]
-queue  fuenf on tun1000000 bandwidth 19.20Kb {subseven}
+oldqueue  fuenf on tun1000000 bandwidth 19.20Kb {subseven}
   [ qid=9 ifname=tun1000000 ifbandwidth=128Kb ]
-queue   subseven on tun1000000 bandwidth 17.28Kb 
+oldqueue   subseven on tun1000000 bandwidth 17.28Kb 
   [ qid=10 ifname=tun1000000 ifbandwidth=128Kb ]
diff --git a/regress/sbin/pfctl/pfaltq4.in b/regress/sbin/pfctl/pfaltq4.in
index b9d3c47d411..bb532a595a0 100644
--- a/regress/sbin/pfctl/pfaltq4.in
+++ b/regress/sbin/pfctl/pfaltq4.in
@@ -2,6 +2,6 @@
 
 altq on lo0 tbrsize 1824 bandwidth 10Mb cbq queue { bloody germans }
 altq on tun1000000 tbrsize 1824 bandwidth 10Mb cbq queue { bloody toads }
-queue bloody cbq(default) bandwidth 50%
-queue germans bandwidth 50%
-queue toads bandwidth 50%
+oldqueue bloody cbq(default) bandwidth 50%
+oldqueue germans bandwidth 50%
+oldqueue toads bandwidth 50%
diff --git a/regress/sbin/pfctl/pfaltq4.ok b/regress/sbin/pfctl/pfaltq4.ok
index 99ea8142c7d..e0ce871aac7 100644
--- a/regress/sbin/pfctl/pfaltq4.ok
+++ b/regress/sbin/pfctl/pfaltq4.ok
@@ -1,12 +1,12 @@
-queue root_lo0 on lo0 bandwidth 10Mb priority 0 cbq( wrr root ) {bloody, germans}
+oldqueue root_lo0 on lo0 bandwidth 10Mb priority 0 cbq( wrr root ) {bloody, germans}
   [ qid=1 ifname=lo0 ifbandwidth=10Mb ]
-queue  bloody on lo0 bandwidth 5Mb cbq( default ) 
+oldqueue  bloody on lo0 bandwidth 5Mb cbq( default ) 
   [ qid=3 ifname=lo0 ifbandwidth=10Mb ]
-queue  germans on lo0 bandwidth 5Mb 
+oldqueue  germans on lo0 bandwidth 5Mb 
   [ qid=4 ifname=lo0 ifbandwidth=10Mb ]
-queue root_tun1000000 on tun1000000 bandwidth 10Mb priority 0 cbq( wrr root ) {bloody, toads}
+oldqueue root_tun1000000 on tun1000000 bandwidth 10Mb priority 0 cbq( wrr root ) {bloody, toads}
   [ qid=2 ifname=tun1000000 ifbandwidth=10Mb ]
-queue  bloody on tun1000000 bandwidth 5Mb cbq( default ) 
+oldqueue  bloody on tun1000000 bandwidth 5Mb cbq( default ) 
   [ qid=3 ifname=tun1000000 ifbandwidth=10Mb ]
-queue  toads on tun1000000 bandwidth 5Mb 
+oldqueue  toads on tun1000000 bandwidth 5Mb 
   [ qid=5 ifname=tun1000000 ifbandwidth=10Mb ]
diff --git a/regress/sbin/pfctl/pfaltq5.in b/regress/sbin/pfctl/pfaltq5.in
index 553d5aef41f..c90438ac0b2 100644
--- a/regress/sbin/pfctl/pfaltq5.in
+++ b/regress/sbin/pfctl/pfaltq5.in
@@ -1,9 +1,9 @@
 # verify the queue IDs on the rules are set correctly
 
 altq on lo0 tbrsize 1824 priq bandwidth 10Mb queue { praise wim hi }
-queue praise priq(default)
-queue wim priority 15
-queue hi priority 7
+oldqueue praise priq(default)
+oldqueue wim priority 15
+oldqueue hi priority 7
 pass in on lo0 proto tcp to port 22 keep state queue(hi wim)
 pass in proto tcp to port 22 keep state queue(hi wim)
 pass in proto tcp to port 22 keep state queue wim
diff --git a/regress/sbin/pfctl/pfaltq5.ok b/regress/sbin/pfctl/pfaltq5.ok
index 4d8218188f1..00f68943047 100644
--- a/regress/sbin/pfctl/pfaltq5.ok
+++ b/regress/sbin/pfctl/pfaltq5.ok
@@ -1,8 +1,8 @@
-queue praise on lo0 priq( default ) 
+oldqueue praise on lo0 priq( default ) 
   [ qid=1 ifname=lo0 ifbandwidth=10Mb ]
-queue wim on lo0 priority 15 
+oldqueue wim on lo0 priority 15 
   [ qid=2 ifname=lo0 ifbandwidth=10Mb ]
-queue hi on lo0 priority 7 
+oldqueue hi on lo0 priority 7 
   [ qid=3 ifname=lo0 ifbandwidth=10Mb ]
 @0 pass in on lo0 proto tcp from any to any port = 22 flags S/SA keep state queue(hi, wim)
   [ Skip steps: d=end f=end p=end sa=end sp=end da=end dp=3 ]
diff --git a/regress/sbin/pfctl/pfaltq6.in b/regress/sbin/pfctl/pfaltq6.in
index db9b5c1690b..8f94965650b 100644
--- a/regress/sbin/pfctl/pfaltq6.in
+++ b/regress/sbin/pfctl/pfaltq6.in
@@ -1,11 +1,11 @@
 # verify the queue IDs on the rules are set correctly
 
 altq on lo0 tbrsize 1824 cbq bandwidth 10Mb queue { wim, the minibar is empty }
-queue wim bandwidth 10% cbq(default)
-queue the bandwidth 10%
-queue minibar bandwidth 30% priority 7
-queue  is bandwidth 10%
-queue  empty bandwidth 40%
+oldqueue wim bandwidth 10% cbq(default)
+oldqueue the bandwidth 10%
+oldqueue minibar bandwidth 30% priority 7
+oldqueue  is bandwidth 10%
+oldqueue  empty bandwidth 40%
 pass in on lo0 proto tcp to port 22 keep state queue(the minibar)
 pass in proto tcp to port 22 keep state queue(is empty)
 pass in proto tcp to port 22 keep state queue the
diff --git a/regress/sbin/pfctl/pfaltq6.ok b/regress/sbin/pfctl/pfaltq6.ok
index 64578fb8a7f..b657129c459 100644
--- a/regress/sbin/pfctl/pfaltq6.ok
+++ b/regress/sbin/pfctl/pfaltq6.ok
@@ -1,14 +1,14 @@
-queue root_lo0 on lo0 bandwidth 10Mb priority 0 cbq( wrr root ) {wim, the, minibar, is, empty}
+oldqueue root_lo0 on lo0 bandwidth 10Mb priority 0 cbq( wrr root ) {wim, the, minibar, is, empty}
   [ qid=1 ifname=lo0 ifbandwidth=10Mb ]
-queue  wim on lo0 bandwidth 1Mb cbq( default ) 
+oldqueue  wim on lo0 bandwidth 1Mb cbq( default ) 
   [ qid=2 ifname=lo0 ifbandwidth=10Mb ]
-queue  the on lo0 bandwidth 1Mb 
+oldqueue  the on lo0 bandwidth 1Mb 
   [ qid=3 ifname=lo0 ifbandwidth=10Mb ]
-queue  minibar on lo0 bandwidth 3Mb priority 7 
+oldqueue  minibar on lo0 bandwidth 3Mb priority 7 
   [ qid=4 ifname=lo0 ifbandwidth=10Mb ]
-queue  is on lo0 bandwidth 1Mb 
+oldqueue  is on lo0 bandwidth 1Mb 
   [ qid=5 ifname=lo0 ifbandwidth=10Mb ]
-queue  empty on lo0 bandwidth 4Mb 
+oldqueue  empty on lo0 bandwidth 4Mb 
   [ qid=6 ifname=lo0 ifbandwidth=10Mb ]
 @0 pass in on lo0 proto tcp from any to any port = 22 flags S/SA keep state queue(the, minibar)
   [ Skip steps: d=end f=end p=end sa=end sp=end da=end dp=3 ]
diff --git a/regress/sbin/pfctl/pfaltq7.in b/regress/sbin/pfctl/pfaltq7.in
index 4cc69ac0356..41a02a85bec 100644
--- a/regress/sbin/pfctl/pfaltq7.in
+++ b/regress/sbin/pfctl/pfaltq7.in
@@ -4,9 +4,9 @@
 # was: qid = priority + 1
 
 altq on lo0 tbrsize 1824 bandwidth 10Mb priq queue eins
-queue eins priority 2 priq(default)
+oldqueue eins priority 2 priq(default)
 
 altq on tun1000000 tbrsize 1824 bandwidth 33600b priq queue zwei
-queue zwei priority 2 priq(default)
+oldqueue zwei priority 2 priq(default)
 
 
diff --git a/regress/sbin/pfctl/pfaltq7.ok b/regress/sbin/pfctl/pfaltq7.ok
index 7bf2c741f71..f0523f02da7 100644
--- a/regress/sbin/pfctl/pfaltq7.ok
+++ b/regress/sbin/pfctl/pfaltq7.ok
@@ -1,4 +1,4 @@
-queue eins on lo0 priority 2 priq( default ) 
+oldqueue eins on lo0 priority 2 priq( default ) 
   [ qid=1 ifname=lo0 ifbandwidth=10Mb ]
-queue zwei on tun1000000 priority 2 priq( default ) 
+oldqueue zwei on tun1000000 priority 2 priq( default ) 
   [ qid=2 ifname=tun1000000 ifbandwidth=33.60Kb ]
diff --git a/regress/sbin/pfctl/pfaltq8.in b/regress/sbin/pfctl/pfaltq8.in
index 93e707e8959..3bb1cf63974 100644
--- a/regress/sbin/pfctl/pfaltq8.in
+++ b/regress/sbin/pfctl/pfaltq8.in
@@ -1,7 +1,7 @@
 # queuespec limited to interface(s)
 
 altq on { tun1000000 tun1000001 } priq bandwidth 10Mb queue { one two }
-queue one priority 1 priq(default)
-queue two on tun1000000 priority 15
-queue two on tun1000001 priority 0
+oldqueue one priority 1 priq(default)
+oldqueue two on tun1000000 priority 15
+oldqueue two on tun1000001 priority 0
 
diff --git a/regress/sbin/pfctl/pfaltq8.ok b/regress/sbin/pfctl/pfaltq8.ok
index 808bfb317b5..88497244eab 100644
--- a/regress/sbin/pfctl/pfaltq8.ok
+++ b/regress/sbin/pfctl/pfaltq8.ok
@@ -1,8 +1,8 @@
-queue one on tun1000000 priq( default ) 
+oldqueue one on tun1000000 priq( default ) 
   [ qid=1 ifname=tun1000000 ifbandwidth=10Mb ]
-queue one on tun1000001 priq( default ) 
+oldqueue one on tun1000001 priq( default ) 
   [ qid=1 ifname=tun1000001 ifbandwidth=10Mb ]
-queue two on tun1000000 priority 15 
+oldqueue two on tun1000000 priority 15 
   [ qid=2 ifname=tun1000000 ifbandwidth=10Mb ]
-queue two on tun1000001 priority 0 
+oldqueue two on tun1000001 priority 0 
   [ qid=2 ifname=tun1000001 ifbandwidth=10Mb ]
diff --git a/regress/sbin/pfctl/pfaltq9.in b/regress/sbin/pfctl/pfaltq9.in
index f9d15482cf4..dc522c9ede6 100644
--- a/regress/sbin/pfctl/pfaltq9.in
+++ b/regress/sbin/pfctl/pfaltq9.in
@@ -1,8 +1,8 @@
 # queuespec limited to interface(s): negation
 
 altq on { tun1000000 tun1000001 } priq bandwidth 10Mb queue { one two }
-queue one priority 1 priq(default)
-queue two on tun1000000 priority 15
-queue two on ! tun1000000 priority 0
+oldqueue one priority 1 priq(default)
+oldqueue two on tun1000000 priority 15
+oldqueue two on ! tun1000000 priority 0
 
 
diff --git a/regress/sbin/pfctl/pfaltq9.ok b/regress/sbin/pfctl/pfaltq9.ok
index 808bfb317b5..88497244eab 100644
--- a/regress/sbin/pfctl/pfaltq9.ok
+++ b/regress/sbin/pfctl/pfaltq9.ok
@@ -1,8 +1,8 @@
-queue one on tun1000000 priq( default ) 
+oldqueue one on tun1000000 priq( default ) 
   [ qid=1 ifname=tun1000000 ifbandwidth=10Mb ]
-queue one on tun1000001 priq( default ) 
+oldqueue one on tun1000001 priq( default ) 
   [ qid=1 ifname=tun1000001 ifbandwidth=10Mb ]
-queue two on tun1000000 priority 15 
+oldqueue two on tun1000000 priority 15 
   [ qid=2 ifname=tun1000000 ifbandwidth=10Mb ]
-queue two on tun1000001 priority 0 
+oldqueue two on tun1000001 priority 0 
   [ qid=2 ifname=tun1000001 ifbandwidth=10Mb ]
diff --git a/regress/sbin/pfctl/pfopt3.in b/regress/sbin/pfctl/pfopt3.in
index b9552e40134..7091372b8e6 100644
--- a/regress/sbin/pfctl/pfopt3.in
+++ b/regress/sbin/pfctl/pfopt3.in
@@ -2,6 +2,6 @@ ext_if="lo0"
 
 altq on $ext_if priq bandwidth 10Mb tbrsize 1824 \
     queue { pri-low pri-med pri-high }
-queue pri-low priority 0
-queue pri-med priority 1 priq(default)
-queue pri-high priority 2
+oldqueue pri-low priority 0
+oldqueue pri-med priority 1 priq(default)
+oldqueue pri-high priority 2
diff --git a/regress/sbin/pfctl/pfopt3.ok b/regress/sbin/pfctl/pfopt3.ok
index 6485717dcee..b9b9c3cd2cd 100644
--- a/regress/sbin/pfctl/pfopt3.ok
+++ b/regress/sbin/pfctl/pfopt3.ok
@@ -1,5 +1,5 @@
 ext_if = "lo0"
 altq on lo0 priq bandwidth 10Mb tbrsize 1824 queue { pri-low pri-med pri-high }
-queue pri-low priority 0 
-queue pri-med priq( default ) 
-queue pri-high priority 2 
+oldqueue pri-low priority 0 
+oldqueue pri-med priq( default ) 
+oldqueue pri-high priority 2 
diff --git a/regress/sbin/pfctl/pfsetup2.in b/regress/sbin/pfctl/pfsetup2.in
index c5da6b8f7bf..300b01b98c4 100644
--- a/regress/sbin/pfctl/pfsetup2.in
+++ b/regress/sbin/pfctl/pfsetup2.in
@@ -1,4 +1,4 @@
 #test tbrsize calculation
 
 altq on lo1000010 bandwidth 10Mb cbq queue { openbsd rocks }
-queue openbsd cbq(default)
+oldqueue openbsd cbq(default)
diff --git a/regress/sbin/pfctl/pfsetup2.ok b/regress/sbin/pfctl/pfsetup2.ok
index 8884febb40d..0a9408bb2af 100644
--- a/regress/sbin/pfctl/pfsetup2.ok
+++ b/regress/sbin/pfctl/pfsetup2.ok
@@ -1,2 +1,2 @@
 altq on lo1000010 cbq bandwidth 10Mb tbrsize 6000 queue { openbsd rocks }
-queue openbsd cbq( default ) 
+oldqueue openbsd cbq( default ) 
diff --git a/regress/sbin/pfctl/pfsetup3.in b/regress/sbin/pfctl/pfsetup3.in
index c5da6b8f7bf..300b01b98c4 100644
--- a/regress/sbin/pfctl/pfsetup3.in
+++ b/regress/sbin/pfctl/pfsetup3.in
@@ -1,4 +1,4 @@
 #test tbrsize calculation
 
 altq on lo1000010 bandwidth 10Mb cbq queue { openbsd rocks }
-queue openbsd cbq(default)
+oldqueue openbsd cbq(default)
diff --git a/regress/sbin/pfctl/pfsetup3.ok b/regress/sbin/pfctl/pfsetup3.ok
index 984ba0d8f6f..62e82e032f2 100644
--- a/regress/sbin/pfctl/pfsetup3.ok
+++ b/regress/sbin/pfctl/pfsetup3.ok
@@ -1,2 +1,2 @@
 altq on lo1000010 cbq bandwidth 10Mb tbrsize 32000 queue { openbsd rocks }
-queue openbsd cbq( default ) 
+oldqueue openbsd cbq( default )