tests: shell: add device to sets/0075tunnel_0 to support older kernels

Older kernels do not support netdev basechain without device, add it so
this works.

Alternative is to skip it by adding:

 # NFT_TEST_REQUIRES(NFT_TEST_HAVE_netdev_chain_without_device)

but it seems easier to support it.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Florian Westphal <fw@strlen.de>

diff --git a/tests/shell/testcases/sets/0075tunnel_0 b/tests/shell/testcases/sets/0075tunnel_0
index f8a8cf00530a79d2e5f3bbe55855f8abb24df27a..127a4ae91829ba1240f10c7ae3cfc84dbb5b6771 100755 (executable)
--- a/tests/shell/testcases/sets/0075tunnel_0
+++ b/tests/shell/testcases/sets/0075tunnel_0
@@ -65,7 +65,7 @@ table netdev x {
        }
 
        chain x {
-               type filter hook ingress priority 0; policy accept;
+               type filter hook ingress device lo priority 0; policy accept;
                tunnel name ip saddr map { 10.141.10.123 : "geneve-t", 10.141.10.124 : "vxlan-t", 10.141.10.125 : "erspan-tv1", 10.141.10.126 : "erspan-tv2" } counter
        }
 }

diff --git a/tests/shell/testcases/sets/dumps/0075tunnel_0.json-nft b/tests/shell/testcases/sets/dumps/0075tunnel_0.json-nft
index 7cd582683955c6d18dd1b9bdaeb23bc7d87a0418..9c3e9ca0a3312e69372b20fbb4a8df3d4a64c7eb 100644 (file)
--- a/tests/shell/testcases/sets/dumps/0075tunnel_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0075tunnel_0.json-nft
@@ -20,6 +20,7 @@
         "table": "x",
         "name": "x",
         "handle": 0,
+        "dev": "lo",
         "type": "filter",
         "hook": "ingress",
         "prio": 0,

diff --git a/tests/shell/testcases/sets/dumps/0075tunnel_0.nft b/tests/shell/testcases/sets/dumps/0075tunnel_0.nft
index 9969124d1a5834c8df8c641d36fd006fb9693926..d167323f41c777e9757fc123ca5e089fa0455605 100644 (file)
--- a/tests/shell/testcases/sets/dumps/0075tunnel_0.nft
+++ b/tests/shell/testcases/sets/dumps/0075tunnel_0.nft
@@ -57,7 +57,7 @@ table netdev x {
        }
 
        chain x {
-               type filter hook ingress priority filter; policy accept;
+               type filter hook ingress device "lo" priority filter; policy accept;
                tunnel name ip saddr map { 10.141.10.123 : "geneve-t", 10.141.10.124 : "vxlan-t", 10.141.10.125 : "erspan-tv1", 10.141.10.126 : "erspan-tv2" } counter packets 0 bytes 0
        }
 }