summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2018-04-19 14:32:25 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2018-04-19 14:36:13 +0200
commit4787edad132c30ae0f6bb00135ae5d970b0ccb74 (patch)
tree7c2e262483080eda4f89e7f3b5dacef14621e0ed /tests
parent5a532726883a4ba37b8f5dd4616970b1fea730b1 (diff)
src: use ibrname and obrname
Legacy tool name is 'brctl' and so the 'br' prefix is already known. If we use ibrname and obrname it looks consistent with iifname and oifname. So let's this instead of ibridgename and obridgename since Florian likes this too. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'tests')
-rw-r--r--tests/py/bridge/meta.t4
-rw-r--r--tests/py/bridge/meta.t.payload4
-rw-r--r--tests/py/inet/meta.t4
-rw-r--r--tests/py/ip/meta.t4
4 files changed, 8 insertions, 8 deletions
diff --git a/tests/py/bridge/meta.t b/tests/py/bridge/meta.t
index ed373677..f8710b25 100644
--- a/tests/py/bridge/meta.t
+++ b/tests/py/bridge/meta.t
@@ -2,5 +2,5 @@
*bridge;test-bridge;input
-meta obridgename "br0";ok;meta obridgename "br0"
-meta ibridgename "br0";ok;meta ibridgename "br0"
+meta obrname "br0";ok;meta obrname "br0"
+meta ibrname "br0";ok;meta ibrname "br0"
diff --git a/tests/py/bridge/meta.t.payload b/tests/py/bridge/meta.t.payload
index 2728c0a5..0f0d1017 100644
--- a/tests/py/bridge/meta.t.payload
+++ b/tests/py/bridge/meta.t.payload
@@ -1,9 +1,9 @@
-# meta obridgename "br0"
+# meta obrname "br0"
bridge test-bridge input
[ meta load bri_oifname => reg 1 ]
[ cmp eq reg 1 0x00307262 0x00000000 0x00000000 0x00000000 ]
-# meta ibridgename "br0"
+# meta ibrname "br0"
bridge test-bridge input
[ meta load bri_iifname => reg 1 ]
[ cmp eq reg 1 0x00307262 0x00000000 0x00000000 0x00000000 ]
diff --git a/tests/py/inet/meta.t b/tests/py/inet/meta.t
index cfde9f32..644a96fd 100644
--- a/tests/py/inet/meta.t
+++ b/tests/py/inet/meta.t
@@ -14,5 +14,5 @@ meta nfproto ipv6 meta l4proto tcp;ok;meta nfproto ipv6 meta l4proto 6
meta nfproto ipv4 counter ip saddr 1.2.3.4;ok
meta secpath exists;ok
meta secpath missing;ok
-meta ibridgename "br0";fail
-meta obridgename "br0";fail
+meta ibrname "br0";fail
+meta obrname "br0";fail
diff --git a/tests/py/ip/meta.t b/tests/py/ip/meta.t
index c3afae79..4db88354 100644
--- a/tests/py/ip/meta.t
+++ b/tests/py/ip/meta.t
@@ -8,5 +8,5 @@ meta l4proto ipv6-icmp icmpv6 type nd-router-advert;ok;icmpv6 type nd-router-adv
meta l4proto 58 icmpv6 type nd-router-advert;ok;icmpv6 type nd-router-advert
icmpv6 type nd-router-advert;ok
-meta ibridgename "br0";fail
-meta obridgename "br0";fail
+meta ibrname "br0";fail
+meta obrname "br0";fail