summaryrefslogtreecommitdiffstats
path: root/tests/py/bridge
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/bridge
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/bridge')
-rw-r--r--tests/py/bridge/meta.t4
-rw-r--r--tests/py/bridge/reject.t2
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/py/bridge/meta.t b/tests/py/bridge/meta.t
index f8710b25..88e819f7 100644
--- a/tests/py/bridge/meta.t
+++ b/tests/py/bridge/meta.t
@@ -2,5 +2,5 @@
*bridge;test-bridge;input
-meta obrname "br0";ok;meta obrname "br0"
-meta ibrname "br0";ok;meta ibrname "br0"
+meta obrname "br0";ok
+meta ibrname "br0";ok
diff --git a/tests/py/bridge/reject.t b/tests/py/bridge/reject.t
index 67deac8d..d1c2ecab 100644
--- a/tests/py/bridge/reject.t
+++ b/tests/py/bridge/reject.t
@@ -16,7 +16,7 @@ reject with icmpv6 type admin-prohibited;ok;ether type ip6 reject with icmpv6 ty
reject with icmpv6 type addr-unreachable;ok;ether type ip6 reject with icmpv6 type addr-unreachable
reject with icmpv6 type port-unreachable;ok;ether type ip6 reject
-mark 12345 ip protocol tcp reject with tcp reset;ok;mark 0x00003039 ip protocol 6 reject with tcp reset
+mark 12345 ip protocol tcp reject with tcp reset;ok;meta mark 0x00003039 ip protocol 6 reject with tcp reset
reject;ok
ether type ip reject;ok