tests/py: update test files syntax

The test files have been adapted to the syntax defined in the previous
commit "tests/py: modify supported test file syntax"

Signed-off-by: Pablo M. Bermudo Garay <pablombg@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/tests/py/any/ct.t b/tests/py/any/ct.t
index d40225251be396465c0d020b9f51f493b10f50bc..9434dc63e0e0582fb209db10fcce4cc786809c39 100644 (file)
--- a/tests/py/any/ct.t
+++ b/tests/py/any/ct.t
@@ -1,9 +1,9 @@
-*ip;test-ip4
-*ip6;test-ip6
-*inet;test-inet
-
 :output;type filter hook output priority 0
 
+*ip;test-ip4;output
+*ip6;test-ip6;output
+*inet;test-inet;output
+
 ct state new,established, related, untracked;ok;ct state established,related,new,untracked
 ct state != related;ok
 ct state {new,established, related, untracked};ok

diff --git a/tests/py/any/frag.t b/tests/py/any/frag.t
index d61a3d4f076a0c3bb06a198952f0e1f3da48c864..91386370326fc431077d2a190ec8229925d59110 100644 (file)
--- a/tests/py/any/frag.t
+++ b/tests/py/any/frag.t
@@ -1,10 +1,11 @@
-*ip;test-ip4
-*ip6;test-ip6
-*inet;test-inet
-*arp;test-arp
-*bridge;test-bridge
 :output;type filter hook output priority 0
 
+*ip;test-ip4;output
+*ip6;test-ip6;output
+*inet;test-inet;output
+*arp;test-arp;output
+*bridge;test-bridge;output
+
 frag nexthdr tcp;ok;frag nexthdr 6
 frag nexthdr != icmp;ok;frag nexthdr != 1
 frag nexthdr {esp, ah, comp, udp, udplite, tcp, dccp, sctp};ok;frag nexthdr { 51, 136, 132, 6, 108, 50, 17, 33}

diff --git a/tests/py/any/limit.t b/tests/py/any/limit.t
index 96ffe609b406ece12db14b24ee746ec780f8bc12..2dcab8156617d9a11cead77d7135c0d7e3a96108 100644 (file)
--- a/tests/py/any/limit.t
+++ b/tests/py/any/limit.t
@@ -1,10 +1,11 @@
-*ip;test-ip4
-*ip6;test-ip6
-*inet;test-inet
-*arp;test-arp
-*bridge;test-bridge
 :output;type filter hook output priority 0
 
+*ip;test-ip4;output
+*ip6;test-ip6;output
+*inet;test-inet;output
+*arp;test-arp;output
+*bridge;test-bridge;output
+
 limit rate 400/minute;ok
 limit rate 20/second;ok
 limit rate 400/hour;ok

diff --git a/tests/py/any/log.t b/tests/py/any/log.t
index 0eed5807bfd877bc2baf2ff7aeb6b2781149eb91..99a7f1f1ed31f84a50d625b59f5a11712ac99193 100644 (file)
--- a/tests/py/any/log.t
+++ b/tests/py/any/log.t
@@ -1,10 +1,11 @@
-*ip;test-ip4
-*ip6;test-ip6
-*inet;test-inet
-*arp;test-arp
-*bridge;test-bridge
 :output;type filter hook output priority 0
 
+*ip;test-ip4;output
+*ip6;test-ip6;output
+*inet;test-inet;output
+*arp;test-arp;output
+*bridge;test-bridge;output
+
 log;ok
 log level emerg;ok
 log level alert;ok

diff --git a/tests/py/any/meta.t b/tests/py/any/meta.t
index c03e7f4e47a91b6d69c2daae9509ac44e2ad86ff..245f0ece514252794801ecbbeeb8087bc5703592 100644 (file)
--- a/tests/py/any/meta.t
+++ b/tests/py/any/meta.t
@@ -1,11 +1,11 @@
-*ip;test-ip4
-*ip6;test-ip6
-*inet;test-inet
-*arp;test-arp
-*bridge;test-bridge
-
 :input;type filter hook input priority 0
 
+*ip;test-ip4;input
+*ip6;test-ip6;input
+*inet;test-inet;input
+*arp;test-arp;input
+*bridge;test-bridge;input
+
 meta length 1000;ok
 meta length 22;ok
 meta length != 233;ok

diff --git a/tests/py/any/queue.t b/tests/py/any/queue.t
index 600c1121bef3ef5709767f1bf2d860fa0cfdb48b..a1aefa19b55d5a561898770bb789b0fea3164db9 100644 (file)
--- a/tests/py/any/queue.t
+++ b/tests/py/any/queue.t
@@ -1,11 +1,11 @@
-*ip;test-ip4
-*ip6;test-ip6
-*inet;test-inet
-*arp;test-arp
-*bridge;test-bridge
-
 :output;type filter hook output priority 0
 
+*ip;test-ip4;output
+*ip6;test-ip6;output
+*inet;test-inet;output
+*arp;test-arp;output
+*bridge;test-bridge;output
+
 queue;ok;queue num 0
 queue num 2;ok
 queue num 2-3;ok

diff --git a/tests/py/arp/arp.t b/tests/py/arp/arp.t
index c4e07d573885ce3f5dd457ede6bfe2149488d9dc..06b0fe3dbfa965b57c078236a4655bf4e5f53d57 100644 (file)
--- a/tests/py/arp/arp.t
+++ b/tests/py/arp/arp.t
@@ -1,7 +1,8 @@
-*arp;test-arp
 # filter chains available are: input, output, forward
 :input;type filter hook input priority 0
 
+*arp;test-arp;input
+
 arp htype 1;ok
 arp htype != 1;ok
 arp htype 22;ok

diff --git a/tests/py/arp/chains.t b/tests/py/arp/chains.t
index cf08c1aff1d98c575375c5f68197aaef5c75486a..59647f7f6902fee1faac5a26df53fcbc040a7d1e 100644 (file)
--- a/tests/py/arp/chains.t
+++ b/tests/py/arp/chains.t
@@ -1,6 +1,6 @@
-*arp;test-arp
-
 # filter chains available are: input, output, forward
 :input;type filter hook input priority 0
 :forward;type filter hook forward priority 0
 :output;type filter hook output priority 0
+
+*arp;test-arp;input,forward,output

diff --git a/tests/py/bridge/chains.t b/tests/py/bridge/chains.t
index 8070de4fc5862d3da3a055b9a2698edcb33a2d8e..85dde73e8520873be19711d9608ef131929dda15 100644 (file)
--- a/tests/py/bridge/chains.t
+++ b/tests/py/bridge/chains.t
@@ -1,8 +1,8 @@
-*bridge;test-bridge
-
 # filter chains available are: prerouting, input, output, forward, postrouting
 :filter-pre;type filter hook input priority 0
 :filter-output;type filter hook output priority 0
 :filter-forward;type filter hook forward priority 0
 :filter-input;type filter hook input priority 0
 :filter-post;type filter hook input priority 0
+
+*bridge;test-bridge;filter-pre,filter-output,filter-forward,filter-input,filter-post

diff --git a/tests/py/bridge/ether.t b/tests/py/bridge/ether.t
index 6257dfcd9875775452588f472bfe10319d3cfb5d..5b39fe0bfb0d287b2a65dca50271c953ccf53d51 100644 (file)
--- a/tests/py/bridge/ether.t
+++ b/tests/py/bridge/ether.t
@@ -1,7 +1,7 @@
-*bridge;test-bridge
-
 :input;type filter hook input priority 0
 
+*bridge;test-bridge;input
+
 tcp dport 22 iiftype ether ip daddr 1.2.3.4 ether saddr 00:0f:54:0c:11:4 accept;ok;tcp dport 22 ether saddr 00:0f:54:0c:11:04 ip daddr 1.2.3.4 accept
 tcp dport 22 ip daddr 1.2.3.4 ether saddr 00:0f:54:0c:11:04;ok;tcp dport 22 ether saddr 00:0f:54:0c:11:04 ip daddr 1.2.3.4
 tcp dport 22 ether saddr 00:0f:54:0c:11:04 ip daddr 1.2.3.4;ok

diff --git a/tests/py/bridge/reject.t b/tests/py/bridge/reject.t
index 43e54611fcfcbd93bf9fac01bdb1c8e71f23ccda..4fa6ac0b3278471a160e1485998d7cf90a250e7f 100644 (file)
--- a/tests/py/bridge/reject.t
+++ b/tests/py/bridge/reject.t
@@ -1,6 +1,7 @@
-*bridge;test-bridge
 :input;type filter hook input priority 0
 
+*bridge;test-bridge;input
+
 # The output is specific for bridge family
 reject with icmp type host-unreachable;ok;ether type ip reject with icmp type host-unreachable
 reject with icmp type net-unreachable;ok;ether type ip reject with icmp type net-unreachable

diff --git a/tests/py/bridge/vlan.t b/tests/py/bridge/vlan.t
index f86561a2a7d1fe55529ce5dc26ac3351b5bccd09..e7c75bbaa2b85112c60d9e20f3b0796dc360cd59 100644 (file)
--- a/tests/py/bridge/vlan.t
+++ b/tests/py/bridge/vlan.t
@@ -1,6 +1,7 @@
-*bridge;test-bridge
 :input;type filter hook input priority 0
 
+*bridge;test-bridge;input
+
 vlan id 4094;ok
 vlan id 0;ok
 # bad vlan id

diff --git a/tests/py/inet/ah.t b/tests/py/inet/ah.t
index 666659d3021dc36a12c2eb6bb1046a161a29f0c7..f3848b7f1494b7b9e8e73608c6595f4ec2d63cf0 100644 (file)
--- a/tests/py/inet/ah.t
+++ b/tests/py/inet/ah.t
@@ -1,8 +1,9 @@
-*ip;test-ip4
-*ip6;test-ip6
-*inet;test-inet
 :input;type filter hook input priority 0
 
+*ip;test-ip4;input
+*ip6;test-ip6;input
+*inet;test-inet;input
+
 # nexthdr Bug to list table.
 
 - ah nexthdr esp;ok

diff --git a/tests/py/inet/comp.t b/tests/py/inet/comp.t
index f4753bbc4253a16856b1af03830a3e63c15df37a..6396ff36438d3e17570b3a309ff90be2356c66fb 100644 (file)
--- a/tests/py/inet/comp.t
+++ b/tests/py/inet/comp.t
@@ -1,9 +1,9 @@
-*ip;test-ip4
-*ip6;test-ip6
-*inet;test-inet
-
 :input;type filter hook input priority 0
 
+*ip;test-ip4;input
+*ip6;test-ip6;input
+*inet;test-inet;input
+
 # BUG: nft: payload.c:88: payload_expr_pctx_update: Assertion `left->payload.base + 1 <= (__PROTO_BASE_MAX - 1)' failed.
 - comp nexthdr esp;ok;comp nexthdr 50
 comp nexthdr != esp;ok;comp nexthdr != 50

diff --git a/tests/py/inet/dccp.t b/tests/py/inet/dccp.t
index e323992e223de06c8f1a3c1024ebbc6a67b9cff7..63de1c8bd122ba24c1a898248aab4fc3ed5cbef5 100644 (file)
--- a/tests/py/inet/dccp.t
+++ b/tests/py/inet/dccp.t
@@ -1,8 +1,9 @@
-*ip;test-ip4
-*ip6;test-ip6
-*inet;test-inet
 :input;type filter hook input priority 0
 
+*ip;test-ip4;input
+*ip6;test-ip6;input
+*inet;test-inet;input
+
 dccp sport 21-35;ok
 dccp sport != 21-35;ok
 dccp sport {23, 24, 25};ok

diff --git a/tests/py/inet/esp.t b/tests/py/inet/esp.t
index 3a8502d980d2f5a1a499d48f66cbf9b7d4f590e7..105acb257afd379898084f7cc3fdb44d9ee2fbaa 100644 (file)
--- a/tests/py/inet/esp.t
+++ b/tests/py/inet/esp.t
@@ -1,8 +1,9 @@
-*ip;test-ip4
-*ip6;test-ip6
-*inet;test-inet
 :input;type filter hook input priority 0
 
+*ip;test-ip4;input
+*ip6;test-ip6;input
+*inet;test-inet;input
+
 esp spi 100;ok
 esp spi != 100;ok
 esp spi 111-222;ok

diff --git a/tests/py/inet/ether-ip.t b/tests/py/inet/ether-ip.t
index 3726db45b409cbc8659d2e68eabb9eec13910e41..a451588b0c65725b94f553857f1de5ebfc1ae837 100644 (file)
--- a/tests/py/inet/ether-ip.t
+++ b/tests/py/inet/ether-ip.t
@@ -1,5 +1,6 @@
-*inet;test-inet
 :input;type filter hook input priority 0
 
+*inet;test-inet;input
+
 tcp dport 22 iiftype ether ip daddr 1.2.3.4 ether saddr 00:0f:54:0c:11:4 accept;ok;tcp dport 22 ether saddr 00:0f:54:0c:11:04 ip daddr 1.2.3.4 accept
 tcp dport 22 ip daddr 1.2.3.4 ether saddr 00:0f:54:0c:11:04;ok

diff --git a/tests/py/inet/ether.t b/tests/py/inet/ether.t
index 9d0f9729b779705bd3e3790fdef6eb09b412bd88..1659a30b35d3d3d1799e3857e4ecd0d969069666 100644 (file)
--- a/tests/py/inet/ether.t
+++ b/tests/py/inet/ether.t
@@ -1,10 +1,10 @@
-*ip;test-ip4
-*ip6;test-ip6
-*inet;test-inet
-*bridge;test-bridge
-
 :input;type filter hook input priority 0
 
+*ip;test-ip4;input
+*ip6;test-ip6;input
+*inet;test-inet;input
+*bridge;test-bridge;input
+
 tcp dport 22 iiftype ether ether saddr 00:0f:54:0c:11:4 meta nfproto ipv4 accept;ok;tcp dport 22 ether saddr 00:0f:54:0c:11:04 meta nfproto ipv4 accept
 tcp dport 22 iiftype ether ether saddr 00:0f:54:0c:11:4 accept;ok;tcp dport 22 ether saddr 00:0f:54:0c:11:04 accept
 tcp dport 22 ether saddr 00:0f:54:0c:11:04 accept;ok

diff --git a/tests/py/inet/ip.t b/tests/py/inet/ip.t
index a56c5c974b87618bb9ca3abc2ec0fc2505a6004d..ffcb47e7f8cb746df232ede57f434cd6c89dd61c 100644 (file)
--- a/tests/py/inet/ip.t
+++ b/tests/py/inet/ip.t
@@ -1,7 +1,7 @@
-*ip;test-ip4
-*inet;test-inet
-*bridge;test-bridge
-
 :input;type filter hook input priority 0
 
+*ip;test-ip4;input
+*inet;test-inet;input
+*bridge;test-bridge;input
+
 ip saddr . ip daddr . ether saddr { 1.1.1.1 . 2.2.2.2 . ca:fe:ca:fe:ca:fe };ok

diff --git a/tests/py/inet/reject.t b/tests/py/inet/reject.t
index 52e7b28b53779e2d736b2abe175d0260d23038b7..638f329cf4d5aefd86d587715e35f0c15a2bec0f 100644 (file)
--- a/tests/py/inet/reject.t
+++ b/tests/py/inet/reject.t
@@ -1,6 +1,7 @@
-*inet;test-inet
 :input;type filter hook input priority 0
 
+*inet;test-inet;input
+
 # The output is specific for inet family
 reject with icmp type host-unreachable;ok;meta nfproto ipv4 reject with icmp type host-unreachable
 reject with icmp type net-unreachable;ok;meta nfproto ipv4 reject with icmp type net-unreachable

diff --git a/tests/py/inet/sctp.t b/tests/py/inet/sctp.t
index 537a9b172e1f67cbcdf6c779b7b9c3cfc6f5e266..75c58b8d9e8d26775d34f56c9902a4541fcddbab 100644 (file)
--- a/tests/py/inet/sctp.t
+++ b/tests/py/inet/sctp.t
@@ -1,8 +1,9 @@
-*ip;test-ip4
-*ip6;test-ip6
-*inet;test-inet
 :input;type filter hook input priority 0
 
+*ip;test-ip4;input
+*ip6;test-ip6;input
+*inet;test-inet;input
+
 sctp sport 23;ok
 sctp sport != 23;ok
 sctp sport 23-44;ok

diff --git a/tests/py/inet/tcp.t b/tests/py/inet/tcp.t
index 53a16898aa5d171f2d4c4613f157af0b26b5ce48..cc19ed4c1c105b297a39418417421abb78907592 100644 (file)
--- a/tests/py/inet/tcp.t
+++ b/tests/py/inet/tcp.t
@@ -1,8 +1,9 @@
-*ip;test-ip4
-*ip6;test-ip6
-*inet;test-inet
 :input;type filter hook input priority 0
 
+*ip;test-ip4;input
+*ip6;test-ip6;input
+*inet;test-inet;input
+
 tcp dport 22;ok
 tcp dport != 233;ok
 tcp dport 33-45;ok

diff --git a/tests/py/inet/udp.t b/tests/py/inet/udp.t
index 58f4002daf3d69cafd1a4e91e30e1992912cbc29..30c06e4e5c8c32e1cc8d79aa118f357ca37d2191 100644 (file)
--- a/tests/py/inet/udp.t
+++ b/tests/py/inet/udp.t
@@ -1,8 +1,9 @@
-*ip;test-ip4
-*ip;test-ip6
-*ip;test-inet
 :input;type filter hook input priority 0
 
+*ip;test-ip4;input
+*ip;test-ip6;input
+*ip;test-inet;input
+
 udp sport 80 accept;ok
 udp sport != 60 accept;ok
 udp sport 50-70 accept;ok

diff --git a/tests/py/inet/udplite.t b/tests/py/inet/udplite.t
index 9420ab45ea2420d6da15b145f7192eb174eb9ba9..ba01f67102383cddb6db8f1e28f077f515611032 100644 (file)
--- a/tests/py/inet/udplite.t
+++ b/tests/py/inet/udplite.t
@@ -1,8 +1,9 @@
-*ip;test-ip4
-*ip6;test-ip6
-*inet;test-inet
 :input;type filter hook input priority 0
 
+*ip;test-ip4;input
+*ip6;test-ip6;input
+*inet;test-inet;input
+
 udplite sport 80 accept;ok
 udplite sport != 60 accept;ok
 udplite sport 50-70 accept;ok

diff --git a/tests/py/ip/chains.t b/tests/py/ip/chains.t
index 8edf62b5fe10c91ac95e98228d8872dfa4f37df7..fc3745e588b26894d2d71561dec0770c1b6ab6ea 100644 (file)
--- a/tests/py/ip/chains.t
+++ b/tests/py/ip/chains.t
@@ -1,5 +1,3 @@
-*ip;test-ip4
-
 # filter chains available are: input, output, forward, prerouting, postrouting
 :filter-input;type filter hook input priority 0
 :filter-pre;type filter hook prerouting priority 0
@@ -13,3 +11,5 @@
 :nat-post-t;type nat hook postrouting priority 0
 # route chain available are: output
 :route-out-t;type route hook output priority 0
+
+*ip;test-ip4;filter-input,filter-pre,filter-forw,filter-out,filter-post,nat-input-t,nat-pre-t,nat-out-t,nat-post-t,route-out-t

diff --git a/tests/py/ip/ct.t b/tests/py/ip/ct.t
index 28ad76603ac61933453b9bf75764b954d8a4be60..8ec340d39cbbb77483668b6e57912fdfbd945f08 100644 (file)
--- a/tests/py/ip/ct.t
+++ b/tests/py/ip/ct.t
@@ -1,7 +1,7 @@
-*ip;test-ip4
-
 :output;type filter hook output priority 0
 
+*ip;test-ip4;output
+
 ct saddr original 192.168.0.1;ok
 ct saddr reply 192.168.0.1;ok
 ct daddr original 192.168.0.1;ok

diff --git a/tests/py/ip/dnat.t b/tests/py/ip/dnat.t
index cdb7811699167956f96f95c0d899961034d111cb..28e658d3ee2eb528f1aa0164e390daa5416cc8d5 100644 (file)
--- a/tests/py/ip/dnat.t
+++ b/tests/py/ip/dnat.t
@@ -1,6 +1,7 @@
-*ip;test-ip4
 :prerouting;type nat hook prerouting priority 0
 
+*ip;test-ip4;prerouting
+
 iifname "eth0" tcp dport 80-90 dnat 192.168.3.2;ok
 iifname "eth0" tcp dport != 80-90 dnat 192.168.3.2;ok
 iifname "eth0" tcp dport {80, 90, 23} dnat 192.168.3.2;ok

diff --git a/tests/py/ip/dup.t b/tests/py/ip/dup.t
index 9320d546e7d95464df215e8e934b6d40e2fd09f8..ac4e83a2cd2179df9afe7d786c5013d8e838af13 100644 (file)
--- a/tests/py/ip/dup.t
+++ b/tests/py/ip/dup.t
@@ -1,6 +1,7 @@
-*ip;test-ip4
 :input;type filter hook input priority 0
 
+*ip;test-ip4;input
+
 dup to 192.168.2.1;ok
 dup to 192.168.2.1 device eth0;ok
 dup to ip saddr map { 192.168.2.120 : 192.168.2.1 } device eth0;ok

diff --git a/tests/py/ip/ether.t b/tests/py/ip/ether.t
index 4d30f51c1bcdac771f15dc26758e15dc93becdce..e1d302c77b6849514a57b35fe2caf390846366ba 100644 (file)
--- a/tests/py/ip/ether.t
+++ b/tests/py/ip/ether.t
@@ -1,7 +1,7 @@
-*ip;test-ip
-
 :input;type filter hook input priority 0
 
+*ip;test-ip;input
+
 tcp dport 22 iiftype ether ip daddr 1.2.3.4 ether saddr 00:0f:54:0c:11:4 accept;ok;tcp dport 22 ip daddr 1.2.3.4 ether saddr 00:0f:54:0c:11:04 accept
 tcp dport 22 ip daddr 1.2.3.4 ether saddr 00:0f:54:0c:11:04;ok
 tcp dport 22 ether saddr 00:0f:54:0c:11:04 ip daddr 1.2.3.4;ok

diff --git a/tests/py/ip/icmp.t b/tests/py/ip/icmp.t
index bd00f5caea00629dd3a0ea43df00458e70b376fe..02027b0a52869d4d544e35765468ee8ec0c93802 100644 (file)
--- a/tests/py/ip/icmp.t
+++ b/tests/py/ip/icmp.t
@@ -1,8 +1,9 @@
-*ip;test-ip4
 # BUG: There is a bug with icmp protocol and inet family.
 # *inet;test-inet
 :input;type filter hook input priority 0
 
+*ip;test-ip4;input
+
 icmp type echo-reply accept;ok
 icmp type destination-unreachable accept;ok
 icmp type source-quench accept;ok

diff --git a/tests/py/ip/ip.t b/tests/py/ip/ip.t
index 0339c2ac6ea907e49bc87e9658c1302d7af06c12..152323b9ca13f161dec6769b2bb033558f5f8ee1 100644 (file)
--- a/tests/py/ip/ip.t
+++ b/tests/py/ip/ip.t
@@ -1,7 +1,8 @@
-*ip;test-ip4
-*inet;test-inet
 :input;type filter hook input priority 0
 
+*ip;test-ip4;input
+*inet;test-inet;input
+
 - ip version 2;ok
 
 # bug ip hdrlength

diff --git a/tests/py/ip/masquerade.t b/tests/py/ip/masquerade.t
index 35001f37aa5f177e044a19e3745f3db0548de315..0bb49a689b5620a2bb0002e0d5e5d10a24b78cf7 100644 (file)
--- a/tests/py/ip/masquerade.t
+++ b/tests/py/ip/masquerade.t
@@ -1,6 +1,7 @@
-*ip;test-ip4
 :postrouting;type nat hook postrouting priority 0
 
+*ip;test-ip4;postrouting
+
 # nf_nat flags combination
 udp dport 53 masquerade;ok
 udp dport 53 masquerade random;ok

diff --git a/tests/py/ip/redirect.t b/tests/py/ip/redirect.t
index b7eecb74073261898297c521b285b6fd11747a22..8161ae6d73ddc649e887ae602afe7570598ac74b 100644 (file)
--- a/tests/py/ip/redirect.t
+++ b/tests/py/ip/redirect.t
@@ -1,6 +1,7 @@
-*ip;test-ip4
 :output;type nat hook output priority 0
 
+*ip;test-ip4;output
+
 # without arguments
 udp dport 53 redirect;ok
 

diff --git a/tests/py/ip/reject.t b/tests/py/ip/reject.t
index 70a63a0b4d7c486f39d1fa429ab76e90d889a79f..6006f0541cb87483354163cc1bfb24bcaadf0340 100644 (file)
--- a/tests/py/ip/reject.t
+++ b/tests/py/ip/reject.t
@@ -1,6 +1,7 @@
-*ip;test-ip4
 :output;type filter hook output priority 0
 
+*ip;test-ip4;output
+
 reject;ok
 reject with icmp type host-unreachable;ok
 reject with icmp type net-unreachable;ok

diff --git a/tests/py/ip/sets.t b/tests/py/ip/sets.t
index c199dbd2e97ddc5ef89858ebcdce888656326412..d4a72ade86d1f973506adea7df5e81790a72896e 100644 (file)
--- a/tests/py/ip/sets.t
+++ b/tests/py/ip/sets.t
@@ -1,7 +1,8 @@
-*ip;test-ip4
-*inet;test-inet
 :input;type filter hook input priority 0
 
+*ip;test-ip4;input
+*inet;test-inet;input
+
 !set_ipv4_add ipv4_addr;ok
 !set_inet inet_proto;ok
 !set_inet_serv inet_service;ok

diff --git a/tests/py/ip/snat.t b/tests/py/ip/snat.t
index 1caf7c76bee441f92b7f4b18d42d0f11207a886f..a8469a3535ead0f67ef1729c4eba2532104151a6 100644 (file)
--- a/tests/py/ip/snat.t
+++ b/tests/py/ip/snat.t
@@ -1,6 +1,7 @@
-*ip;test-ip4
 :postrouting;type nat hook postrouting priority 0
 
+*ip;test-ip4;postrouting
+
 iifname "eth0" tcp dport 80-90 snat 192.168.3.2;ok
 iifname "eth0" tcp dport != 80-90 snat 192.168.3.2;ok
 iifname "eth0" tcp dport {80, 90, 23} snat 192.168.3.2;ok

diff --git a/tests/py/ip6/chains.t b/tests/py/ip6/chains.t
index c1e41e47123fa3cc65209049868595d8a975496c..e78f9e087be77ecf5649a63c646b75ff2699f92f 100644 (file)
--- a/tests/py/ip6/chains.t
+++ b/tests/py/ip6/chains.t
@@ -1,5 +1,3 @@
-*ip6;test-ip6
-
 # filter chains available are: input, output, forward, forward, prerouting and postrouting.
 :filter-input;type filter hook input priority 0
 :filter-prer;type filter hook prerouting priority 0
@@ -15,3 +13,5 @@
 
 # route chain available is output.
 :route-out;type route hook output priority 0
+
+*ip6;test-ip6;filter-input,filter-prer,filter-forw-t,filter-out-t,filter-post-t,nat-input,nat-prerouting,nat-output,nat-postrou,route-out

diff --git a/tests/py/ip6/dnat.t b/tests/py/ip6/dnat.t
index 8341225853236b42fcad1cb07f8f08d24616eeaf..b061f2f6e9218dcfab566e48b9bdc60c2ca699b8 100644 (file)
--- a/tests/py/ip6/dnat.t
+++ b/tests/py/ip6/dnat.t
@@ -1,5 +1,6 @@
-*ip6;test-ip6
 :prerouting;type nat hook prerouting priority 0
 
+*ip6;test-ip6;prerouting
+
 tcp dport 80-90 dnat 2001:838:35f:1::-2001:838:35f:2:::80-100;ok
 tcp dport 80-90 dnat 2001:838:35f:1::-2001:838:35f:2:: :100;ok;tcp dport 80-90 dnat 2001:838:35f:1::-2001:838:35f:2:::100

diff --git a/tests/py/ip6/dst.t b/tests/py/ip6/dst.t
index 3207af7687e5c93a5ebecf73b0d7e3ead848f462..f7b0979db2956849f83f6ab544ed669879e5fb98 100644 (file)
--- a/tests/py/ip6/dst.t
+++ b/tests/py/ip6/dst.t
@@ -1,7 +1,8 @@
-*ip6;test-ip6
-*inet;test-inet
 :input;type filter hook input priority 0
 
+*ip6;test-ip6;input
+*inet;test-inet;input
+
 dst nexthdr 22;ok
 dst nexthdr != 233;ok
 dst nexthdr 33-45;ok

diff --git a/tests/py/ip6/dup.t b/tests/py/ip6/dup.t
index 34f302f2a510edebaf1491689e0f40faabc23601..e6bb78b8140d7b37caa51d64dbf3be5d6e3e40b9 100644 (file)
--- a/tests/py/ip6/dup.t
+++ b/tests/py/ip6/dup.t
@@ -1,6 +1,7 @@
-*ip6;test-ip6
 :input;type filter hook input priority 0
 
+*ip6;test-ip6;input
+
 dup to abcd::1;ok
 dup to abcd::1 device eth0;ok
 dup to ip6 saddr map { abcd::1 : cafe::cafe } device eth0;ok

diff --git a/tests/py/ip6/ether.t b/tests/py/ip6/ether.t
index 98be273f6ff04e68da2b201187733c9b501382b7..d94a0d2110c93a5a99b118988d0a3b0a6531af51 100644 (file)
--- a/tests/py/ip6/ether.t
+++ b/tests/py/ip6/ether.t
@@ -1,7 +1,7 @@
-*ip6;test-ip6
-
 :input;type filter hook input priority 0
 
+*ip6;test-ip6;input
+
 tcp dport 22 iiftype ether ip6 daddr 1::2 ether saddr 00:0f:54:0c:11:4 accept;ok;tcp dport 22 ip6 daddr 1::2 ether saddr 00:0f:54:0c:11:04 accept
 tcp dport 22 ip6 daddr 1::2 ether saddr 00:0f:54:0c:11:04;ok;tcp dport 22 ip6 daddr 1::2 ether saddr 00:0f:54:0c:11:04
 tcp dport 22 ether saddr 00:0f:54:0c:11:04 ip6 daddr 1::2;ok

diff --git a/tests/py/ip6/hbh.t b/tests/py/ip6/hbh.t
index 4e67c42aa953136705f2a3c89d22caa541f97ebb..235cce44a54cfb29c72ea755f656f212c42940aa 100644 (file)
--- a/tests/py/ip6/hbh.t
+++ b/tests/py/ip6/hbh.t
@@ -1,7 +1,8 @@
-*ip6;test-ip6
-*inet;test-inet
 :filter-input;type filter hook input priority 0
 
+*ip6;test-ip6;filter-input
+*inet;test-inet;filter-input
+
 hbh hdrlength 22;ok
 hbh hdrlength != 233;ok
 hbh hdrlength 33-45;ok

diff --git a/tests/py/ip6/icmpv6.t b/tests/py/ip6/icmpv6.t
index fca903f6db22e3972df1aad35decdbbb14f77274..af40bf71a739c9d03686399c3f726f71abeb8f1a 100644 (file)
--- a/tests/py/ip6/icmpv6.t
+++ b/tests/py/ip6/icmpv6.t
@@ -1,8 +1,9 @@
-*ip6;test-ip6
-# BUG: There is a bug with icmpv6 and inet tables
-# *inet;test-inet
 :input;type filter hook input priority 0
 
+*ip6;test-ip6;input
+# BUG: There is a bug with icmpv6 and inet tables
+# *inet;test-inet;input
+
 icmpv6 type destination-unreachable accept;ok
 icmpv6 type packet-too-big accept;ok
 icmpv6 type time-exceeded accept;ok

diff --git a/tests/py/ip6/ip6.t b/tests/py/ip6/ip6.t
index d4c5c7e36e03cf39c0e36574c262336c5c524021..ceb2a8235c32adfd75050434d82468a22229fab2 100644 (file)
--- a/tests/py/ip6/ip6.t
+++ b/tests/py/ip6/ip6.t
@@ -1,7 +1,8 @@
-*ip6;test-ip6
-*inet;test-inet
 :input;type filter hook input priority 0
 
+*ip6;test-ip6;input
+*inet;test-inet;input
+
 # BUG: Problem with version, priority
 # <cmdline>:1:1-38: Error: Could not process rule: Invalid argument
 # add rule ip6 test6 input ip6 version 1

diff --git a/tests/py/ip6/masquerade.t b/tests/py/ip6/masquerade.t
index 4e6c086cd55fb96cfd31acfd4a11770f9cb14ad8..8040280ebc259a4b2f8e8953be7df64594fa7da2 100644 (file)
--- a/tests/py/ip6/masquerade.t
+++ b/tests/py/ip6/masquerade.t
@@ -1,6 +1,7 @@
-*ip6;test-ip6
 :postrouting;type nat hook postrouting priority 0
 
+*ip6;test-ip6;postrouting
+
 # nf_nat flags combination
 udp dport 53 masquerade;ok
 udp dport 53 masquerade random;ok

diff --git a/tests/py/ip6/mh.t b/tests/py/ip6/mh.t
index cd652b39a3d3bc12b8a00dd337808b08ae0f7bac..099a6ebca5167fbfbf5c311dfd907b1dad1ff743 100644 (file)
--- a/tests/py/ip6/mh.t
+++ b/tests/py/ip6/mh.t
@@ -1,7 +1,8 @@
-*ip6;test-ip6
-*inet;test-inet
 :input;type filter hook input priority 0
 
+*ip6;test-ip6;input
+*inet;test-inet;input
+
 mh nexthdr 1;ok
 mh nexthdr != 1;ok
 mh nexthdr { udplite, ipcomp, udp, ah, sctp, esp, dccp, tcp, ipv6-icmp };ok;mh nexthdr { 58, 17, 108, 6, 51, 136, 50, 132, 33}

diff --git a/tests/py/ip6/redirect.t b/tests/py/ip6/redirect.t
index 31ffe8c93633f798d2ac109ebea4f83f66369e30..d5a0a3b23ee426e31d45c54c214fcbd391fe3914 100644 (file)
--- a/tests/py/ip6/redirect.t
+++ b/tests/py/ip6/redirect.t
@@ -1,6 +1,7 @@
-*ip6;test-ip6
 :output;type nat hook output priority 0
 
+*ip6;test-ip6;output
+
 # with no arguments
 redirect;ok
 udp dport 954 redirect;ok

diff --git a/tests/py/ip6/reject.t b/tests/py/ip6/reject.t
index 60dec90ebf51140baf86df02b047189a4b9e3f9b..2979956598ac89cc7989a1f575016d55151d43ef 100644 (file)
--- a/tests/py/ip6/reject.t
+++ b/tests/py/ip6/reject.t
@@ -1,6 +1,7 @@
-*ip6;test-ip6
 :output;type filter hook output priority 0
 
+*ip6;test-ip6;output
+
 reject;ok
 reject with icmpv6 type no-route;ok
 reject with icmpv6 type admin-prohibited;ok

diff --git a/tests/py/ip6/rt.t b/tests/py/ip6/rt.t
index eca47ca8917b7cba93992c59550ab8874608e565..7e700a5f9d6d63609eaa22f5ea43b3a7883a02d7 100644 (file)
--- a/tests/py/ip6/rt.t
+++ b/tests/py/ip6/rt.t
@@ -1,7 +1,8 @@
-*ip6;test-ip6
-*inet;test-inet
 :input;type filter hook input priority 0
 
+*ip6;test-ip6;input
+*inet;test-inet;input
+
 rt nexthdr 1;ok
 rt nexthdr != 1;ok
 rt nexthdr {udplite, ipcomp, udp, ah, sctp, esp, dccp, tcp, ipv6-icmp};ok;rt nexthdr { 33, 136, 50, 132, 51, 17, 108, 6, 58}

diff --git a/tests/py/ip6/sets.t b/tests/py/ip6/sets.t
index 4938929c9fa83fc87342b48012471a315a7d7b13..e0daa3ab2f9854362aa0e984f63a6c65d5903b8b 100644 (file)
--- a/tests/py/ip6/sets.t
+++ b/tests/py/ip6/sets.t
@@ -1,7 +1,8 @@
-*ip6;test-ip6
-*inet;test-inet
 :input;type filter hook input priority 0
 
+*ip6;test-ip6;input
+*inet;test-inet;input
+
 !set_ipv6_add1 ipv6_addr;ok
 !set_inet1 inet_proto;ok
 !set_inet inet_service;ok

diff --git a/tests/py/ip6/snat.t b/tests/py/ip6/snat.t
index 37bf1a1df0216ef067b35e44f3899c00ddbbe438..dec8dffa81e4e5b9613a5f360de155462e756ac1 100644 (file)
--- a/tests/py/ip6/snat.t
+++ b/tests/py/ip6/snat.t
@@ -1,5 +1,6 @@
-*ip6;test-ip6
 :postrouting;type nat hook postrouting priority 0
 
+*ip6;test-ip6;postrouting
+
 tcp dport 80-90 snat 2001:838:35f:1::-2001:838:35f:2:: :80-100;ok;tcp dport 80-90 snat 2001:838:35f:1::-2001:838:35f:2:::80-100
 tcp dport 80-90 snat 2001:838:35f:1::-2001:838:35f:2:::100;ok

diff --git a/tests/py/ip6/vmap.t b/tests/py/ip6/vmap.t
index 301a28aedbcf1ed0e62ec2b97121fff93bb9baf4..6a3a004eb1c5f5e4af49ebee2b315cf59e7ab688 100644 (file)
--- a/tests/py/ip6/vmap.t
+++ b/tests/py/ip6/vmap.t
@@ -1,7 +1,8 @@
-*ip6;test-ip6
-*inet;test-inet
 :input;type filter hook input priority 0
 
+*ip6;test-ip6;input
+*inet;test-inet;input
+
 ip6 saddr vmap { abcd::3 : accept };ok
 ip6 saddr 1234:1234:1234:1234:1234:1234:1234:1234:1234;fail