summaryrefslogtreecommitdiffstats
path: root/tests/py/any/ct.t
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2018-07-03 16:16:51 +0200
committerFlorian Westphal <fw@strlen.de>2018-07-21 11:30:56 +0200
commit6dd848339444fecf95122579c1a1fe944a819b6d (patch)
tree3e26cbf7eeb3e5023fb0f95f0721680df6aa772f /tests/py/any/ct.t
parent0b97683b33be6f703fa93222d0b35a6abad0b514 (diff)
src: meta: always prefix 'meta' for almost all tokens
got following bug report: nft add ... ct mark set mark and 0x10 ... always sets 0. What reporter meant to write instead was 'ct mark', not 'mark'. We can't just remove support for 'mark' and force 'meta mark', but we can start to discourage it by printing meta prefix too. Later on, we could start to print deprecation warning if needed. Followup patch can also change "iifname" etc. to "meta iifname". Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'tests/py/any/ct.t')
-rw-r--r--tests/py/any/ct.t6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/py/any/ct.t b/tests/py/any/ct.t
index 5ed3b4a0..b5c13524 100644
--- a/tests/py/any/ct.t
+++ b/tests/py/any/ct.t
@@ -55,8 +55,8 @@ ct mark set 0x11 xor 0x1331;ok;ct mark set 0x00001320
ct mark set 0x11333 and 0x11;ok;ct mark set 0x00000011
ct mark set 0x12 or 0x11;ok;ct mark set 0x00000013
ct mark set 0x11;ok;ct mark set 0x00000011
-ct mark set mark;ok;ct mark set mark
-ct mark set mark map { 1 : 10, 2 : 20, 3 : 30 };ok;ct mark set mark map { 0x00000003 : 0x0000001e, 0x00000002 : 0x00000014, 0x00000001 : 0x0000000a}
+ct mark set mark;ok;ct mark set meta mark
+ct mark set mark map { 1 : 10, 2 : 20, 3 : 30 };ok;ct mark set meta mark map { 0x00000003 : 0x0000001e, 0x00000002 : 0x00000014, 0x00000001 : 0x0000000a}
ct mark set {0x11333, 0x11};fail
ct zone set {123, 127};fail
@@ -130,7 +130,7 @@ ct reply zone 1;ok
ct zone set 1;ok
ct original zone set 1;ok
ct reply zone set 1;ok
-ct zone set mark map { 1 : 1, 2 : 2 };ok;ct zone set mark map { 0x00000001 : 1, 0x00000002 : 2}
+ct zone set mark map { 1 : 1, 2 : 2 };ok;ct zone set meta mark map { 0x00000001 : 1, 0x00000002 : 2}
ct both zone set 1;fail
ct invalid;fail