diff options
| author | Florian Westphal <fw@strlen.de> | 2017-05-07 04:04:03 +0200 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2017-05-19 09:41:22 +0200 |
| commit | 5f46b18745d18c486e959c93da649c18c8b10fe0 (patch) | |
| tree | 1d56b003ba39a44ef0acca8f777389b7eccad394 /tests/py/bridge | |
| parent | 0825c57d571bb7121e7048e198b9b023f7e7f358 (diff) | |
tests: fix up meta l4proto change for ip family
We can delete some of the payload files now as ip/ip6/inet produce
same implicit meta l4proto dep.
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'tests/py/bridge')
| -rw-r--r-- | tests/py/bridge/icmpX.t | 2 | ||||
| -rw-r--r-- | tests/py/bridge/icmpX.t.payload | 2 | ||||
| -rw-r--r-- | tests/py/bridge/vlan.t.payload | 4 | ||||
| -rw-r--r-- | tests/py/bridge/vlan.t.payload.netdev | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/tests/py/bridge/icmpX.t b/tests/py/bridge/icmpX.t index 5c76c0f7..0a1019c3 100644 --- a/tests/py/bridge/icmpX.t +++ b/tests/py/bridge/icmpX.t @@ -3,6 +3,6 @@ *bridge;test-bridge;input ip protocol icmp icmp type echo-request;ok;icmp type echo-request -icmp type echo-request;ok +icmp type echo-request;ok;ether type ip meta l4proto 1 icmp type echo-request ip6 nexthdr icmpv6 icmpv6 type echo-request;ok;icmpv6 type echo-request icmpv6 type echo-request;ok;ether type ip6 meta l4proto 58 icmpv6 type echo-request diff --git a/tests/py/bridge/icmpX.t.payload b/tests/py/bridge/icmpX.t.payload index 548cdaa5..0fab1abf 100644 --- a/tests/py/bridge/icmpX.t.payload +++ b/tests/py/bridge/icmpX.t.payload @@ -11,7 +11,7 @@ bridge test-bridge input bridge test-bridge input [ payload load 2b @ link header + 12 => reg 1 ] [ cmp eq reg 1 0x00000008 ] - [ payload load 1b @ network header + 9 => reg 1 ] + [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000001 ] [ payload load 1b @ transport header + 0 => reg 1 ] [ cmp eq reg 1 0x00000008 ] diff --git a/tests/py/bridge/vlan.t.payload b/tests/py/bridge/vlan.t.payload index 5fce9c16..cb0e812f 100644 --- a/tests/py/bridge/vlan.t.payload +++ b/tests/py/bridge/vlan.t.payload @@ -134,7 +134,7 @@ bridge test-bridge input [ payload load 4b @ network header + 12 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x00feffff ) ^ 0x00000000 ] [ cmp eq reg 1 0x0000000a ] - [ payload load 1b @ network header + 9 => reg 1 ] + [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000011 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ cmp eq reg 1 0x00003500 ] @@ -151,7 +151,7 @@ bridge test-bridge input [ payload load 4b @ network header + 12 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x00feffff ) ^ 0x00000000 ] [ cmp eq reg 1 0x0000000a ] - [ payload load 1b @ network header + 9 => reg 1 ] + [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000011 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ cmp eq reg 1 0x00003500 ] diff --git a/tests/py/bridge/vlan.t.payload.netdev b/tests/py/bridge/vlan.t.payload.netdev index 45ea2251..c57955ec 100644 --- a/tests/py/bridge/vlan.t.payload.netdev +++ b/tests/py/bridge/vlan.t.payload.netdev @@ -160,7 +160,7 @@ netdev test-netdev ingress [ payload load 4b @ network header + 12 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x00feffff ) ^ 0x00000000 ] [ cmp eq reg 1 0x0000000a ] - [ payload load 1b @ network header + 9 => reg 1 ] + [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000011 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ cmp eq reg 1 0x00003500 ] @@ -179,7 +179,7 @@ netdev test-netdev ingress [ payload load 4b @ network header + 12 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x00feffff ) ^ 0x00000000 ] [ cmp eq reg 1 0x0000000a ] - [ payload load 1b @ network header + 9 => reg 1 ] + [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000011 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ cmp eq reg 1 0x00003500 ] |