summaryrefslogtreecommitdiffstats
path: root/tests/py
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2018-03-16 17:09:12 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2018-03-16 17:09:38 +0100
commitca7253263a0158cafd609d924809232b562131b2 (patch)
tree1b04e2b6b6086183ac3c5993d18c2c14d1d5cf62 /tests/py
parente7395266640aed088e312ca1da3c147b64059988 (diff)
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>
Diffstat (limited to 'tests/py')
-rw-r--r--tests/py/ip/sets.t2
-rw-r--r--tests/py/ip/sets.t.payload.inet2
-rw-r--r--tests/py/ip/sets.t.payload.ip2
-rw-r--r--tests/py/ip/sets.t.payload.netdev2
-rw-r--r--tests/py/ip6/sets.t2
-rw-r--r--tests/py/ip6/sets.t.payload.inet2
-rw-r--r--tests/py/ip6/sets.t.payload.ip62
-rw-r--r--tests/py/ip6/sets.t.payload.netdev2
8 files changed, 8 insertions, 8 deletions
diff --git a/tests/py/ip/sets.t b/tests/py/ip/sets.t
index b159ad8d..658579aa 100644
--- 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 136db564..fa956c0c 100644
--- 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 a7831745..ca3b5ade 100644
--- 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 16893007..9772d756 100644
--- 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 54aa1e4b..d5bcf74d 100644
--- 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 cc6f9ef7..3886db67 100644
--- 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 f55da6ec..0b318f8d 100644
--- 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 16b850c8..0dfabb77 100644
--- 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 ]