diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-05-13 19:13:12 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-05-13 19:19:51 +0200 |
commit | 14b68bb14eb7360219e65120e41b0ee496b6b3da (patch) | |
tree | d9b3cc4d3478c2f7bb66b8cb0974ec9ad852bdc9 /tests/py/bridge | |
parent | 01a5eaee44355cff75f4b320b995b40588b3eede (diff) |
tests/py: update for changed set name in payload
Original patch posted in the mailing list from Patrick, I have refreshed
this so it applies on top of current HEAD.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'tests/py/bridge')
-rw-r--r-- | tests/py/bridge/vlan.t.payload | 6 | ||||
-rw-r--r-- | tests/py/bridge/vlan.t.payload.netdev | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/py/bridge/vlan.t.payload b/tests/py/bridge/vlan.t.payload index 78ee7ef7..5fce9c16 100644 --- a/tests/py/bridge/vlan.t.payload +++ b/tests/py/bridge/vlan.t.payload @@ -185,15 +185,15 @@ bridge test-bridge input [ cmp eq reg 1 0x00000060 ] # vlan id { 1, 2, 4, 100, 4095 } vlan pcp 1-3 -set%d test-bridge 3 -set%d test-bridge 0 +__set%d test-bridge 3 +__set%d test-bridge 0 element 00000100 : 0 [end] element 00000200 : 0 [end] element 00000400 : 0 [end] element 00006400 : 0 [end] element 0000ff0f : 0 [end] bridge test-bridge input [ payload load 2b @ link header + 12 => reg 1 ] [ cmp eq reg 1 0x00000081 ] [ payload load 2b @ link header + 14 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x0000ff0f ) ^ 0x00000000 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] [ payload load 1b @ link header + 14 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x000000e0 ) ^ 0x00000000 ] [ cmp gte reg 1 0x00000020 ] diff --git a/tests/py/bridge/vlan.t.payload.netdev b/tests/py/bridge/vlan.t.payload.netdev index f60587fc..45ea2251 100644 --- a/tests/py/bridge/vlan.t.payload.netdev +++ b/tests/py/bridge/vlan.t.payload.netdev @@ -217,8 +217,8 @@ netdev test-netdev ingress [ cmp eq reg 1 0x00000060 ] # vlan id { 1, 2, 4, 100, 4095 } vlan pcp 1-3 -set%d test-netdev 3 -set%d test-netdev 0 +__set%d test-netdev 3 +__set%d test-netdev 0 element 00000100 : 0 [end] element 00000200 : 0 [end] element 00000400 : 0 [end] element 00006400 : 0 [end] element 0000ff0f : 0 [end] netdev test-netdev ingress [ meta load iiftype => reg 1 ] @@ -227,7 +227,7 @@ netdev test-netdev ingress [ cmp eq reg 1 0x00000081 ] [ payload load 2b @ link header + 14 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x0000ff0f ) ^ 0x00000000 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] [ payload load 1b @ link header + 14 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x000000e0 ) ^ 0x00000000 ] [ cmp gte reg 1 0x00000020 ] |