tests: py: remove verdict from closing end interval

Kernel does not allow for NFT_SET_ELEM_INTERVAL_END flag and
NFTA_SET_ELEM_DATA. The closing end interval represents a mismatch,
therefore, no verdict can be applied. The existing payload files show
the drop verdict when this is unset (because NF_DROP=0).

This update is required to fix payload warnings in tests/py after
libnftnl's ("set: use NFTNL_SET_ELEM_VERDICT to print verdict").

Fixes: 6671d9d137f6 ("mnl: Set NFTNL_SET_DATA_TYPE before dumping set elements")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/tests/py/ip/ip.t.payload b/tests/py/ip/ip.t.payload
index 49d1a0fb03e874b48a7438fd53babfa9d7f6fff9..b9fcb5158e9d4b78583f5ff6b64392c4ac70bd9d 100644 (file)
--- a/tests/py/ip/ip.t.payload
+++ b/tests/py/ip/ip.t.payload
@@ -430,7 +430,7 @@ ip test-ip4 input
 # ip hdrlength vmap { 0-4 : drop, 5 : accept, 6 : continue } counter
 __map%d test-ip4 f size 4
 __map%d test-ip4 0
-       element 00000000  : drop 0 [end]        element 00000005  : accept 0 [end]      element 00000006  : continue 0 [end]    element 00000007  : drop 1 [end]
+       element 00000000  : drop 0 [end]        element 00000005  : accept 0 [end]      element 00000006  : continue 0 [end]    element 00000007  : 1 [end]
 ip test-ip4 input 
   [ payload load 1b @ network header + 0 => reg 1 ]
   [ bitwise reg 1 = ( reg 1 & 0x0000000f ) ^ 0x00000000 ]

diff --git a/tests/py/ip/ip.t.payload.bridge b/tests/py/ip/ip.t.payload.bridge
index dac8654395f4a5364cd9d96b26c376d026123740..c6f8d4e5575bb294db543f80f1c7bd5bb7242d97 100644 (file)
--- a/tests/py/ip/ip.t.payload.bridge
+++ b/tests/py/ip/ip.t.payload.bridge
@@ -566,7 +566,7 @@ bridge test-bridge input
 # ip hdrlength vmap { 0-4 : drop, 5 : accept, 6 : continue } counter
 __map%d test-bridge f size 4
 __map%d test-bridge 0
-       element 00000000  : drop 0 [end]        element 00000005  : accept 0 [end]      element 00000006  : continue 0 [end]    element 00000007  : drop 1 [end]
+       element 00000000  : drop 0 [end]        element 00000005  : accept 0 [end]      element 00000006  : continue 0 [end]    element 00000007  : 1 [end]
 bridge test-bridge input 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x00000008 ]

diff --git a/tests/py/ip/ip.t.payload.inet b/tests/py/ip/ip.t.payload.inet
index 64371650480f7850606d366bb8d4e0516860f4ab..e26d0dac47be2f25a5613f8a0ce415bebb410d8c 100644 (file)
--- a/tests/py/ip/ip.t.payload.inet
+++ b/tests/py/ip/ip.t.payload.inet
@@ -566,7 +566,7 @@ inet test-inet input
 # ip hdrlength vmap { 0-4 : drop, 5 : accept, 6 : continue } counter
 __map%d test-inet f size 4
 __map%d test-inet 0
-       element 00000000  : drop 0 [end]        element 00000005  : accept 0 [end]      element 00000006  : continue 0 [end]    element 00000007  : drop 1 [end]
+       element 00000000  : drop 0 [end]        element 00000005  : accept 0 [end]      element 00000006  : continue 0 [end]    element 00000007  : 1 [end]
 inet test-inet input 
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x00000002 ]

diff --git a/tests/py/ip/ip.t.payload.netdev b/tests/py/ip/ip.t.payload.netdev
index 65f8c96a9470cfe69b8dc6b7d1f5b136c542cc7d..de990f5bba12ba1971718679bd74fa5b58bd119f 100644 (file)
--- a/tests/py/ip/ip.t.payload.netdev
+++ b/tests/py/ip/ip.t.payload.netdev
@@ -465,7 +465,7 @@ netdev test-netdev ingress
 # ip hdrlength vmap { 0-4 : drop, 5 : accept, 6 : continue } counter
 __map%d test-netdev f size 4
 __map%d test-netdev 0
-       element 00000000  : drop 0 [end]        element 00000005  : accept 0 [end]      element 00000006  : continue 0 [end]    element 00000007  : drop 1 [end]
+       element 00000000  : drop 0 [end]        element 00000005  : accept 0 [end]      element 00000006  : continue 0 [end]    element 00000007  : 1 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x00000008 ]

diff --git a/tests/py/ip6/vmap.t.payload.inet b/tests/py/ip6/vmap.t.payload.inet
index 522564a310447fe3fd35b23e4c031aabf55aec6a..931cc6bd75a7728687b45141f43809452bff6f97 100644 (file)
--- a/tests/py/ip6/vmap.t.payload.inet
+++ b/tests/py/ip6/vmap.t.payload.inet
@@ -371,7 +371,7 @@ inet test-inet input
 # ip6 saddr vmap { ::/64 : accept}
 __map%d test-inet f
 __map%d test-inet 0
-       element 00000000 00000000 00000000 00000000  : accept 0 [end]   element 00000000 01000000 00000000 00000000  : drop 1 [end]
+       element 00000000 00000000 00000000 00000000  : accept 0 [end]   element 00000000 01000000 00000000 00000000  : 1 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]

diff --git a/tests/py/ip6/vmap.t.payload.ip6 b/tests/py/ip6/vmap.t.payload.ip6
index 3850a7c58fd13b9dc13eee81428f156e82339db9..6e077b27a5f098c8850aee7c0ac9a4e6cee1ecfd 100644 (file)
--- a/tests/py/ip6/vmap.t.payload.ip6
+++ b/tests/py/ip6/vmap.t.payload.ip6
@@ -297,7 +297,7 @@ ip6 test-ip6 input
 # ip6 saddr vmap { ::/64 : accept}
 __map%d test-ip6 f
 __map%d test-ip6 0
-       element 00000000 00000000 00000000 00000000  : accept 0 [end]   element 00000000 01000000 00000000 00000000  : drop 1 [end]
+       element 00000000 00000000 00000000 00000000  : accept 0 [end]   element 00000000 01000000 00000000 00000000  : 1 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
   [ lookup reg 1 set __map%d dreg 0 ]

diff --git a/tests/py/ip6/vmap.t.payload.netdev b/tests/py/ip6/vmap.t.payload.netdev
index d9cbad5877ae44524c54f3af2bda0cb86b507a9d..45f2c0b01e9c8e0200ac4047497fd95798eb8cb8 100644 (file)
--- a/tests/py/ip6/vmap.t.payload.netdev
+++ b/tests/py/ip6/vmap.t.payload.netdev
@@ -371,7 +371,7 @@ netdev test-netdev ingress
 # ip6 saddr vmap { ::/64 : accept}
 __map%d test-netdev f
 __map%d test-netdev 0
-       element 00000000 00000000 00000000 00000000  : accept 0 [end]   element 00000000 01000000 00000000 00000000  : drop 1 [end]
+       element 00000000 00000000 00000000 00000000  : accept 0 [end]   element 00000000 01000000 00000000 00000000  : 1 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]