tests: update to new syntax to add/update set from packet path

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

diff --git a/tests/py/ip/sets.t b/tests/py/ip/sets.t
index b159ad8d98ccda6255ecadfd7c8d010dc8fdfe92..658579aa499b17bf0e0afdb97991f7777e3a3875 100644 (file)
--- a/tests/py/ip/sets.t
+++ b/tests/py/ip/sets.t
@@ -49,7 +49,7 @@ ip saddr != @set33 drop;fail
 
 !set5 type ipv4_addr . ipv4_addr;ok
 ip saddr . ip daddr @set5 drop;ok
-set add ip saddr . ip daddr @set5;ok
+add @set5 { ip saddr . ip daddr };ok
 
 # test nested anonymous sets
 ip saddr { { 1.1.1.0, 3.3.3.0 }, 2.2.2.0 };ok;ip saddr { 1.1.1.0, 2.2.2.0, 3.3.3.0 }

diff --git a/tests/py/ip/sets.t.payload.inet b/tests/py/ip/sets.t.payload.inet
index 136db564a186bb55f3ce1dc26080a36a94bd90a0..fa956c0cdd448a6a276e4a8b412fb0533e50277b 100644 (file)
--- a/tests/py/ip/sets.t.payload.inet
+++ b/tests/py/ip/sets.t.payload.inet
@@ -39,7 +39,7 @@ inet test-inet input
   [ lookup reg 1 set set5 ]
   [ immediate reg 0 drop ]
 
-# set add ip saddr . ip daddr @set5
+# add @set5 { ip saddr . ip daddr }
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x00000002 ]

diff --git a/tests/py/ip/sets.t.payload.ip b/tests/py/ip/sets.t.payload.ip
index a78317455bec726baf830b9e4039c667203086e2..ca3b5adea3ab7cadf46f13d2d289340768e1e1be 100644 (file)
--- a/tests/py/ip/sets.t.payload.ip
+++ b/tests/py/ip/sets.t.payload.ip
@@ -29,7 +29,7 @@ ip test-ip4 input
   [ lookup reg 1 set set5 ]
   [ immediate reg 0 drop ]
 
-# set add ip saddr . ip daddr @set5
+# add @set5 { ip saddr . ip daddr }
 ip test-ip4 input
   [ payload load 4b @ network header + 12 => reg 1 ]
   [ payload load 4b @ network header + 16 => reg 9 ]

diff --git a/tests/py/ip/sets.t.payload.netdev b/tests/py/ip/sets.t.payload.netdev
index 16893007ec85e1718217a305c784c25bd9762ec2..9772d756747d97d330fd05ed40ebbdf5796274c9 100644 (file)
--- a/tests/py/ip/sets.t.payload.netdev
+++ b/tests/py/ip/sets.t.payload.netdev
@@ -39,7 +39,7 @@ netdev test-netdev ingress
   [ lookup reg 1 set set5 ]
   [ immediate reg 0 drop ]
 
-# set add ip saddr . ip daddr @set5
+# add @set5 { ip saddr . ip daddr }
 netdev test-netdev ingress
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x00000008 ]

diff --git a/tests/py/ip6/sets.t b/tests/py/ip6/sets.t
index 54aa1e4b80bb6169fff816fc9ebdfce75a9c14b0..d5bcf74d38c1bf3592dd7bdf4ba59387a75b329e 100644 (file)
--- a/tests/py/ip6/sets.t
+++ b/tests/py/ip6/sets.t
@@ -39,4 +39,4 @@ ip6 saddr != @set33 drop;fail
 
 !set5 type ipv6_addr . ipv6_addr;ok
 ip6 saddr . ip6 daddr @set5 drop;ok
-set add ip6 saddr . ip6 daddr @set5;ok
+add @set5 { ip6 saddr . ip6 daddr };ok

diff --git a/tests/py/ip6/sets.t.payload.inet b/tests/py/ip6/sets.t.payload.inet
index cc6f9ef7fa95a9ec25ef567c25dcde4161cd228b..3886db67526c754f238531704863b3ec4a731fce 100644 (file)
--- a/tests/py/ip6/sets.t.payload.inet
+++ b/tests/py/ip6/sets.t.payload.inet
@@ -23,7 +23,7 @@ inet test-inet input
   [ lookup reg 1 set set5 ]
   [ immediate reg 0 drop ]
 
-# set add ip6 saddr . ip6 daddr @set5
+# add @set5 { ip6 saddr . ip6 daddr }
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]

diff --git a/tests/py/ip6/sets.t.payload.ip6 b/tests/py/ip6/sets.t.payload.ip6
index f55da6ec28d7097e95270d7eefbc489a388d25a7..0b318f8de97f9cb686158b84594108af97caaf1e 100644 (file)
--- a/tests/py/ip6/sets.t.payload.ip6
+++ b/tests/py/ip6/sets.t.payload.ip6
@@ -17,7 +17,7 @@ ip6 test-ip6 input
   [ lookup reg 1 set set5 ]
   [ immediate reg 0 drop ]
 
-# set add ip6 saddr . ip6 daddr @set5
+# add @set5 { ip6 saddr . ip6 daddr }
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
   [ payload load 16b @ network header + 24 => reg 2 ]

diff --git a/tests/py/ip6/sets.t.payload.netdev b/tests/py/ip6/sets.t.payload.netdev
index 16b850c835ff896ac1d8f4ef1e8250ffed797a8d..0dfabb778a0c922953392d0a3d1749fff5e4886d 100644 (file)
--- a/tests/py/ip6/sets.t.payload.netdev
+++ b/tests/py/ip6/sets.t.payload.netdev
@@ -23,7 +23,7 @@ netdev test-netdev ingress
   [ lookup reg 1 set set5 ]
   [ immediate reg 0 drop ]
 
-# set add ip6 saddr . ip6 daddr @set5
+# add @set5 { ip6 saddr . ip6 daddr }
 netdev test-netdev ingress
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]

diff --git a/tests/shell/testcases/sets/0028autoselect_0 b/tests/shell/testcases/sets/0028autoselect_0
index fdda832be3850205264d5eb473c6fbf09acfe866..711743378e85877130e12f10d8441ca31503379d 100755 (executable)
--- a/tests/shell/testcases/sets/0028autoselect_0
+++ b/tests/shell/testcases/sets/0028autoselect_0
@@ -12,6 +12,6 @@ $NFT add set t s2 { type ipv4_addr \; }
 $NFT add set t s3 { type ipv4_addr \; size 1024\; }
 $NFT add chain t c {type filter hook input priority 0 \; }
 
-$NFT add rule t c meta iifname foobar set add ip protocol @s1
-$NFT add rule t c meta iifname foobar set add ip daddr @s2
-$NFT add rule t c meta iifname foobar set add ip daddr @s3
+$NFT add rule t c meta iifname foobar add @s1 { ip protocol }
+$NFT add rule t c meta iifname foobar add @s2 { ip daddr }
+$NFT add rule t c meta iifname foobar add @s3 { ip daddr }