diff options
author | Florian Westphal <fw@strlen.de> | 2021-04-02 12:54:53 +0200 |
---|---|---|
committer | Florian Westphal <fw@strlen.de> | 2021-04-03 13:55:53 +0200 |
commit | 751336b7bffea4065bcd9f895eef3159addaba3e (patch) | |
tree | 841cccb108c75c53427cd84fb30c8ce3da3d2116 /tests/py/any | |
parent | e9e4c3c9092fdb447f13573f176b1c337f8efc4f (diff) |
proto: replace vlan ether type with 8021q
Previous patches added "8021ad" mnemonic for IEEE 802.1AD frame type.
This adds the 8021q shorthand for the existing 'vlan' frame type.
nft will continue to recognize 'ether type vlan', but listing
will now print 8021q.
Adjust all test cases accordingly.
Suggested-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'tests/py/any')
-rw-r--r-- | tests/py/any/meta.t | 4 | ||||
-rw-r--r-- | tests/py/any/meta.t.json | 4 | ||||
-rw-r--r-- | tests/py/any/meta.t.json.output | 6 | ||||
-rw-r--r-- | tests/py/any/meta.t.payload | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/tests/py/any/meta.t b/tests/py/any/meta.t index 7b582505..0b894cce 100644 --- a/tests/py/any/meta.t +++ b/tests/py/any/meta.t @@ -20,8 +20,8 @@ meta length != { 33, 55, 67, 88};ok meta length { 33-55, 66-88};ok meta length != { 33-55, 66-88};ok -meta protocol { ip, arp, ip6, vlan };ok;meta protocol { ip6, ip, vlan, arp} -meta protocol != {ip, arp, ip6, vlan};ok +meta protocol { ip, arp, ip6, vlan };ok;meta protocol { ip6, ip, 8021q, arp} +meta protocol != {ip, arp, ip6, 8021q};ok meta protocol ip;ok meta protocol != ip;ok diff --git a/tests/py/any/meta.t.json b/tests/py/any/meta.t.json index 47dc0724..1a98843c 100644 --- a/tests/py/any/meta.t.json +++ b/tests/py/any/meta.t.json @@ -199,7 +199,7 @@ } ] -# meta protocol != {ip, arp, ip6, vlan} +# meta protocol != {ip, arp, ip6, 8021q} [ { "match": { @@ -212,7 +212,7 @@ "ip", "arp", "ip6", - "vlan" + "8021q" ] } } diff --git a/tests/py/any/meta.t.json.output b/tests/py/any/meta.t.json.output index 74b934b8..4e9e669f 100644 --- a/tests/py/any/meta.t.json.output +++ b/tests/py/any/meta.t.json.output @@ -10,7 +10,7 @@ "set": [ "ip", "arp", - "vlan", + "8021q", "ip6" ] } @@ -18,7 +18,7 @@ } ] -# meta protocol != {ip, arp, ip6, vlan} +# meta protocol != {ip, arp, ip6, 8021q} [ { "match": { @@ -30,7 +30,7 @@ "set": [ "ip", "arp", - "vlan", + "8021q", "ip6" ] } diff --git a/tests/py/any/meta.t.payload b/tests/py/any/meta.t.payload index 99aab29c..4e43905e 100644 --- a/tests/py/any/meta.t.payload +++ b/tests/py/any/meta.t.payload @@ -68,7 +68,7 @@ ip test-ip4 input [ meta load protocol => reg 1 ] [ lookup reg 1 set __set%d ] -# meta protocol != {ip, arp, ip6, vlan} +# meta protocol != {ip, arp, ip6, 8021q} __set%d test-ip4 3 __set%d test-ip4 0 element 00000008 : 0 [end] element 00000608 : 0 [end] element 0000dd86 : 0 [end] element 00000081 : 0 [end] |