From 5fb625af9e89db915451992d8920b4fa353a1185 Mon Sep 17 00:00:00 2001
From: "Pablo M. Bermudo Garay" <pablombg@gmail.com>
Date: Tue, 12 Jan 2016 01:26:57 +0100
Subject: 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>
---
 tests/py/any/ct.t         |  8 ++++----
 tests/py/any/frag.t       | 11 ++++++-----
 tests/py/any/limit.t      | 11 ++++++-----
 tests/py/any/log.t        | 11 ++++++-----
 tests/py/any/meta.t       | 12 ++++++------
 tests/py/any/queue.t      | 12 ++++++------
 tests/py/arp/arp.t        |  3 ++-
 tests/py/arp/chains.t     |  4 ++--
 tests/py/bridge/chains.t  |  4 ++--
 tests/py/bridge/ether.t   |  4 ++--
 tests/py/bridge/reject.t  |  3 ++-
 tests/py/bridge/vlan.t    |  3 ++-
 tests/py/inet/ah.t        |  7 ++++---
 tests/py/inet/comp.t      |  8 ++++----
 tests/py/inet/dccp.t      |  7 ++++---
 tests/py/inet/esp.t       |  7 ++++---
 tests/py/inet/ether-ip.t  |  3 ++-
 tests/py/inet/ether.t     | 10 +++++-----
 tests/py/inet/ip.t        |  8 ++++----
 tests/py/inet/reject.t    |  3 ++-
 tests/py/inet/sctp.t      |  7 ++++---
 tests/py/inet/tcp.t       |  7 ++++---
 tests/py/inet/udp.t       |  7 ++++---
 tests/py/inet/udplite.t   |  7 ++++---
 tests/py/ip/chains.t      |  4 ++--
 tests/py/ip/ct.t          |  4 ++--
 tests/py/ip/dnat.t        |  3 ++-
 tests/py/ip/dup.t         |  3 ++-
 tests/py/ip/ether.t       |  4 ++--
 tests/py/ip/icmp.t        |  3 ++-
 tests/py/ip/ip.t          |  5 +++--
 tests/py/ip/masquerade.t  |  3 ++-
 tests/py/ip/redirect.t    |  3 ++-
 tests/py/ip/reject.t      |  3 ++-
 tests/py/ip/sets.t        |  5 +++--
 tests/py/ip/snat.t        |  3 ++-
 tests/py/ip6/chains.t     |  4 ++--
 tests/py/ip6/dnat.t       |  3 ++-
 tests/py/ip6/dst.t        |  5 +++--
 tests/py/ip6/dup.t        |  3 ++-
 tests/py/ip6/ether.t      |  4 ++--
 tests/py/ip6/hbh.t        |  5 +++--
 tests/py/ip6/icmpv6.t     |  7 ++++---
 tests/py/ip6/ip6.t        |  5 +++--
 tests/py/ip6/masquerade.t |  3 ++-
 tests/py/ip6/mh.t         |  5 +++--
 tests/py/ip6/redirect.t   |  3 ++-
 tests/py/ip6/reject.t     |  3 ++-
 tests/py/ip6/rt.t         |  5 +++--
 tests/py/ip6/sets.t       |  5 +++--
 tests/py/ip6/snat.t       |  3 ++-
 tests/py/ip6/vmap.t       |  5 +++--
 52 files changed, 158 insertions(+), 120 deletions(-)

diff --git a/tests/py/any/ct.t b/tests/py/any/ct.t
index d4022525..9434dc63 100644
--- 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 d61a3d4f..91386370 100644
--- 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 96ffe609..2dcab815 100644
--- 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 0eed5807..99a7f1f1 100644
--- 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 c03e7f4e..245f0ece 100644
--- 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 600c1121..a1aefa19 100644
--- 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 c4e07d57..06b0fe3d 100644
--- 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 cf08c1af..59647f7f 100644
--- 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 8070de4f..85dde73e 100644
--- 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 6257dfcd..5b39fe0b 100644
--- 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 43e54611..4fa6ac0b 100644
--- 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 f86561a2..e7c75bba 100644
--- 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 666659d3..f3848b7f 100644
--- 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 f4753bbc..6396ff36 100644
--- 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 e323992e..63de1c8b 100644
--- 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 3a8502d9..105acb25 100644
--- 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 3726db45..a451588b 100644
--- 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 9d0f9729..1659a30b 100644
--- 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 a56c5c97..ffcb47e7 100644
--- 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 52e7b28b..638f329c 100644
--- 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 537a9b17..75c58b8d 100644
--- 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 53a16898..cc19ed4c 100644
--- 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 58f4002d..30c06e4e 100644
--- 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 9420ab45..ba01f671 100644
--- 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 8edf62b5..fc3745e5 100644
--- 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 28ad7660..8ec340d3 100644
--- 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 cdb78116..28e658d3 100644
--- 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 9320d546..ac4e83a2 100644
--- 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 4d30f51c..e1d302c7 100644
--- 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 bd00f5ca..02027b0a 100644
--- 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 0339c2ac..152323b9 100644
--- 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 35001f37..0bb49a68 100644
--- 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 b7eecb74..8161ae6d 100644
--- 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 70a63a0b..6006f054 100644
--- 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 c199dbd2..d4a72ade 100644
--- 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 1caf7c76..a8469a35 100644
--- 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 c1e41e47..e78f9e08 100644
--- 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 83412258..b061f2f6 100644
--- 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 3207af76..f7b0979d 100644
--- 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 34f302f2..e6bb78b8 100644
--- 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 98be273f..d94a0d21 100644
--- 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 4e67c42a..235cce44 100644
--- 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 fca903f6..af40bf71 100644
--- 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 d4c5c7e3..ceb2a823 100644
--- 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 4e6c086c..8040280e 100644
--- 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 cd652b39..099a6ebc 100644
--- 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 31ffe8c9..d5a0a3b2 100644
--- 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 60dec90e..29799565 100644
--- 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 eca47ca8..7e700a5f 100644
--- 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 4938929c..e0daa3ab 100644
--- 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 37bf1a1d..dec8dffa 100644
--- 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 301a28ae..6a3a004e 100644
--- 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
 
-- 
cgit v1.2.3