From 14b68bb14eb7360219e65120e41b0ee496b6b3da Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Fri, 13 May 2016 19:13:12 +0200 Subject: 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 --- tests/py/arp/arp.t.payload | 42 +++++++++++++++++++-------------------- tests/py/arp/arp.t.payload.netdev | 42 +++++++++++++++++++-------------------- 2 files changed, 42 insertions(+), 42 deletions(-) (limited to 'tests/py/arp') diff --git a/tests/py/arp/arp.t.payload b/tests/py/arp/arp.t.payload index bfa37cdd..31c3024a 100644 --- a/tests/py/arp/arp.t.payload +++ b/tests/py/arp/arp.t.payload @@ -31,20 +31,20 @@ arp test-arp input [ cmp gt reg 1 0x00002d00 ] # arp htype { 33, 55, 67, 88} -set%d test-arp 3 -set%d test-arp 0 +__set%d test-arp 3 +__set%d test-arp 0 element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end] arp test-arp input [ payload load 2b @ network header + 0 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # arp htype { 33-55} -set%d test-arp 7 -set%d test-arp 0 +__set%d test-arp 7 +__set%d test-arp 0 element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end] arp test-arp input [ payload load 2b @ network header + 0 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # arp ptype 0x0800 arp test-arp input @@ -74,20 +74,20 @@ arp test-arp input [ cmp gt reg 1 0x0000002d ] # arp hlen { 33, 55, 67, 88} -set%d test-arp 3 -set%d test-arp 0 +__set%d test-arp 3 +__set%d test-arp 0 element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] arp test-arp input [ payload load 1b @ network header + 4 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # arp hlen { 33-55} -set%d test-arp 7 -set%d test-arp 0 +__set%d test-arp 7 +__set%d test-arp 0 element 00000000 : 1 [end] element 00000021 : 0 [end] element 00000038 : 1 [end] arp test-arp input [ payload load 1b @ network header + 4 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # arp plen 22 arp test-arp input @@ -112,28 +112,28 @@ arp test-arp input [ cmp gt reg 1 0x0000002d ] # arp plen { 33, 55, 67, 88} -set%d test-arp 3 -set%d test-arp 0 +__set%d test-arp 3 +__set%d test-arp 0 element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] arp test-arp input [ payload load 1b @ network header + 5 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # arp plen { 33-55} -set%d test-arp 7 -set%d test-arp 0 +__set%d test-arp 7 +__set%d test-arp 0 element 00000000 : 1 [end] element 00000021 : 0 [end] element 00000038 : 1 [end] arp test-arp input [ payload load 1b @ network header + 5 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # arp operation {nak, inreply, inrequest, rreply, rrequest, reply, request} -set%d test-arp 3 -set%d test-arp 0 +__set%d test-arp 3 +__set%d test-arp 0 element 00000a00 : 0 [end] element 00000900 : 0 [end] element 00000800 : 0 [end] element 00000400 : 0 [end] element 00000300 : 0 [end] element 00000200 : 0 [end] element 00000100 : 0 [end] arp test-arp input [ payload load 2b @ network header + 6 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # arp operation request arp test-arp input diff --git a/tests/py/arp/arp.t.payload.netdev b/tests/py/arp/arp.t.payload.netdev index 2085dde7..a64ebea1 100644 --- a/tests/py/arp/arp.t.payload.netdev +++ b/tests/py/arp/arp.t.payload.netdev @@ -43,24 +43,24 @@ netdev test-netdev ingress [ cmp gt reg 1 0x00002d00 ] # arp htype { 33, 55, 67, 88} -set%d test-netdev 3 -set%d test-netdev 0 +__set%d test-netdev 3 +__set%d test-netdev 0 element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end] netdev test-netdev ingress [ meta load protocol => reg 1 ] [ cmp eq reg 1 0x00000608 ] [ payload load 2b @ network header + 0 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # arp htype { 33-55} -set%d test-netdev 7 -set%d test-netdev 0 +__set%d test-netdev 7 +__set%d test-netdev 0 element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end] netdev test-netdev ingress [ meta load protocol => reg 1 ] [ cmp eq reg 1 0x00000608 ] [ payload load 2b @ network header + 0 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # arp ptype 0x0800 netdev test-netdev ingress @@ -100,24 +100,24 @@ netdev test-netdev ingress [ cmp gt reg 1 0x0000002d ] # arp hlen { 33, 55, 67, 88} -set%d test-netdev 3 -set%d test-netdev 0 +__set%d test-netdev 3 +__set%d test-netdev 0 element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] netdev test-netdev ingress [ meta load protocol => reg 1 ] [ cmp eq reg 1 0x00000608 ] [ payload load 1b @ network header + 4 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # arp hlen { 33-55} -set%d test-netdev 7 -set%d test-netdev 0 +__set%d test-netdev 7 +__set%d test-netdev 0 element 00000000 : 1 [end] element 00000021 : 0 [end] element 00000038 : 1 [end] netdev test-netdev ingress [ meta load protocol => reg 1 ] [ cmp eq reg 1 0x00000608 ] [ payload load 1b @ network header + 4 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # arp plen 22 netdev test-netdev ingress @@ -150,34 +150,34 @@ netdev test-netdev ingress [ cmp gt reg 1 0x0000002d ] # arp plen { 33, 55, 67, 88} -set%d test-netdev 3 -set%d test-netdev 0 +__set%d test-netdev 3 +__set%d test-netdev 0 element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] netdev test-netdev ingress [ meta load protocol => reg 1 ] [ cmp eq reg 1 0x00000608 ] [ payload load 1b @ network header + 5 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # arp plen { 33-55} -set%d test-netdev 7 -set%d test-netdev 0 +__set%d test-netdev 7 +__set%d test-netdev 0 element 00000000 : 1 [end] element 00000021 : 0 [end] element 00000038 : 1 [end] netdev test-netdev ingress [ meta load protocol => reg 1 ] [ cmp eq reg 1 0x00000608 ] [ payload load 1b @ network header + 5 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # arp operation {nak, inreply, inrequest, rreply, rrequest, reply, request} -set%d test-netdev 3 -set%d test-netdev 0 +__set%d test-netdev 3 +__set%d test-netdev 0 element 00000a00 : 0 [end] element 00000900 : 0 [end] element 00000800 : 0 [end] element 00000400 : 0 [end] element 00000300 : 0 [end] element 00000200 : 0 [end] element 00000100 : 0 [end] netdev test-netdev ingress [ meta load protocol => reg 1 ] [ cmp eq reg 1 0x00000608 ] [ payload load 2b @ network header + 6 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # arp operation request netdev test-netdev ingress -- cgit v1.2.3