From 1fddd03cf36122e5ff669e5083ed7af6408cacec Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Wed, 14 Dec 2016 00:26:16 +0100 Subject: tests: py: update quota and payload Include new consumed field for quota, and check for csum_flags in payload. Signed-off-by: Pablo Neira Ayuso --- tests/py/ip/ip.t.payload | 14 +++++++------- tests/py/ip/ip.t.payload.inet | 14 +++++++------- tests/py/ip/ip.t.payload.netdev | 14 +++++++------- 3 files changed, 21 insertions(+), 21 deletions(-) (limited to 'tests/py/ip') diff --git a/tests/py/ip/ip.t.payload b/tests/py/ip/ip.t.payload index 50386284..cd54ae0f 100644 --- a/tests/py/ip/ip.t.payload +++ b/tests/py/ip/ip.t.payload @@ -528,21 +528,21 @@ ip test-ip4 input [ meta load iif => reg 1 ] [ cmp eq reg 1 0x00000001 ] [ immediate reg 1 0x0100007f ] - [ payload write reg 1 => 4b @ network header + 16 csum_type 1 csum_off 10 ] + [ payload write reg 1 => 4b @ network header + 16 csum_type 1 csum_off 10 csum_flags 0x1 ] # iif "lo" ip checksum set 0 ip test-ip4 input [ meta load iif => reg 1 ] [ cmp eq reg 1 0x00000001 ] [ immediate reg 1 0x00000000 ] - [ payload write reg 1 => 2b @ network header + 10 csum_type 1 csum_off 10 ] + [ payload write reg 1 => 2b @ network header + 10 csum_type 1 csum_off 10 csum_flags 0x0 ] # iif "lo" ip id set 0 ip test-ip4 input [ meta load iif => reg 1 ] [ cmp eq reg 1 0x00000001 ] [ immediate reg 1 0x00000000 ] - [ payload write reg 1 => 2b @ network header + 4 csum_type 1 csum_off 10 ] + [ payload write reg 1 => 2b @ network header + 4 csum_type 1 csum_off 10 csum_flags 0x0 ] # iif "lo" ip ecn set 1 ip test-ip4 input @@ -550,7 +550,7 @@ ip test-ip4 input [ cmp eq reg 1 0x00000001 ] [ payload load 2b @ network header + 0 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x0000fcff ) ^ 0x00000100 ] - [ payload write reg 1 => 2b @ network header + 0 csum_type 1 csum_off 10 ] + [ payload write reg 1 => 2b @ network header + 0 csum_type 1 csum_off 10 csum_flags 0x0 ] # iif "lo" ip ecn set ce ip test-ip4 input @@ -558,7 +558,7 @@ ip test-ip4 input [ cmp eq reg 1 0x00000001 ] [ payload load 2b @ network header + 0 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x0000fcff ) ^ 0x00000300 ] - [ payload write reg 1 => 2b @ network header + 0 csum_type 1 csum_off 10 ] + [ payload write reg 1 => 2b @ network header + 0 csum_type 1 csum_off 10 csum_flags 0x0 ] # iif "lo" ip dscp set af23 ip test-ip4 input @@ -566,7 +566,7 @@ ip test-ip4 input [ cmp eq reg 1 0x00000001 ] [ payload load 2b @ network header + 0 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x000003ff ) ^ 0x00005800 ] - [ payload write reg 1 => 2b @ network header + 0 csum_type 1 csum_off 10 ] + [ payload write reg 1 => 2b @ network header + 0 csum_type 1 csum_off 10 csum_flags 0x0 ] # iif "lo" ip dscp set cs0 ip test-ip4 input @@ -574,5 +574,5 @@ ip test-ip4 input [ cmp eq reg 1 0x00000001 ] [ payload load 2b @ network header + 0 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x000003ff ) ^ 0x00000000 ] - [ payload write reg 1 => 2b @ network header + 0 csum_type 1 csum_off 10 ] + [ payload write reg 1 => 2b @ network header + 0 csum_type 1 csum_off 10 csum_flags 0x0 ] diff --git a/tests/py/ip/ip.t.payload.inet b/tests/py/ip/ip.t.payload.inet index e658a0ff..64606d95 100644 --- a/tests/py/ip/ip.t.payload.inet +++ b/tests/py/ip/ip.t.payload.inet @@ -690,7 +690,7 @@ inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x00000002 ] [ immediate reg 1 0x0100007f ] - [ payload write reg 1 => 4b @ network header + 16 csum_type 1 csum_off 10 ] + [ payload write reg 1 => 4b @ network header + 16 csum_type 1 csum_off 10 csum_flags 0x1 ] # iif "lo" ip checksum set 0 inet test-inet input @@ -699,7 +699,7 @@ inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x00000002 ] [ immediate reg 1 0x00000000 ] - [ payload write reg 1 => 2b @ network header + 10 csum_type 1 csum_off 10 ] + [ payload write reg 1 => 2b @ network header + 10 csum_type 1 csum_off 10 csum_flags 0x0 ] # iif "lo" ip id set 0 inet test-inet input @@ -708,7 +708,7 @@ inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x00000002 ] [ immediate reg 1 0x00000000 ] - [ payload write reg 1 => 2b @ network header + 4 csum_type 1 csum_off 10 ] + [ payload write reg 1 => 2b @ network header + 4 csum_type 1 csum_off 10 csum_flags 0x0 ] # iif "lo" ip ecn set 1 inet test-inet input @@ -718,7 +718,7 @@ inet test-inet input [ cmp eq reg 1 0x00000002 ] [ payload load 2b @ network header + 0 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x0000fcff ) ^ 0x00000100 ] - [ payload write reg 1 => 2b @ network header + 0 csum_type 1 csum_off 10 ] + [ payload write reg 1 => 2b @ network header + 0 csum_type 1 csum_off 10 csum_flags 0x0 ] # iif "lo" ip ecn set ce inet test-netdev ingress @@ -728,7 +728,7 @@ inet test-netdev ingress [ cmp eq reg 1 0x00000002 ] [ payload load 2b @ network header + 0 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x0000fcff ) ^ 0x00000300 ] - [ payload write reg 1 => 2b @ network header + 0 csum_type 1 csum_off 10 ] + [ payload write reg 1 => 2b @ network header + 0 csum_type 1 csum_off 10 csum_flags 0x0 ] # iif "lo" ip dscp set af23 inet test-inet input @@ -738,7 +738,7 @@ inet test-inet input [ cmp eq reg 1 0x00000002 ] [ payload load 2b @ network header + 0 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x000003ff ) ^ 0x00005800 ] - [ payload write reg 1 => 2b @ network header + 0 csum_type 1 csum_off 10 ] + [ payload write reg 1 => 2b @ network header + 0 csum_type 1 csum_off 10 csum_flags 0x0 ] # iif "lo" ip dscp set cs0 inet test-inet input @@ -748,5 +748,5 @@ inet test-inet input [ cmp eq reg 1 0x00000002 ] [ payload load 2b @ network header + 0 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x000003ff ) ^ 0x00000000 ] - [ payload write reg 1 => 2b @ network header + 0 csum_type 1 csum_off 10 ] + [ payload write reg 1 => 2b @ network header + 0 csum_type 1 csum_off 10 csum_flags 0x0 ] diff --git a/tests/py/ip/ip.t.payload.netdev b/tests/py/ip/ip.t.payload.netdev index 6df41cb7..acfa1eab 100644 --- a/tests/py/ip/ip.t.payload.netdev +++ b/tests/py/ip/ip.t.payload.netdev @@ -790,7 +790,7 @@ netdev test-netdev ingress [ meta load protocol => reg 1 ] [ cmp eq reg 1 0x00000008 ] [ immediate reg 1 0x0100007f ] - [ payload write reg 1 => 4b @ network header + 16 csum_type 1 csum_off 10 ] + [ payload write reg 1 => 4b @ network header + 16 csum_type 1 csum_off 10 csum_flags 0x1 ] # iif "lo" ip checksum set 0 netdev test-netdev ingress @@ -799,7 +799,7 @@ netdev test-netdev ingress [ meta load protocol => reg 1 ] [ cmp eq reg 1 0x00000008 ] [ immediate reg 1 0x00000000 ] - [ payload write reg 1 => 2b @ network header + 10 csum_type 1 csum_off 10 ] + [ payload write reg 1 => 2b @ network header + 10 csum_type 1 csum_off 10 csum_flags 0x0 ] # iif "lo" ip id set 0 netdev test-netdev ingress @@ -808,7 +808,7 @@ netdev test-netdev ingress [ meta load protocol => reg 1 ] [ cmp eq reg 1 0x00000008 ] [ immediate reg 1 0x00000000 ] - [ payload write reg 1 => 2b @ network header + 4 csum_type 1 csum_off 10 ] + [ payload write reg 1 => 2b @ network header + 4 csum_type 1 csum_off 10 csum_flags 0x0 ] # iif "lo" ip ecn set 1 netdev test-netdev ingress @@ -818,7 +818,7 @@ netdev test-netdev ingress [ cmp eq reg 1 0x00000008 ] [ payload load 2b @ network header + 0 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x0000fcff ) ^ 0x00000100 ] - [ payload write reg 1 => 2b @ network header + 0 csum_type 1 csum_off 10 ] + [ payload write reg 1 => 2b @ network header + 0 csum_type 1 csum_off 10 csum_flags 0x0 ] # iif "lo" ip ecn set ce netdev test-netdev ingress @@ -828,7 +828,7 @@ netdev test-netdev ingress [ cmp eq reg 1 0x00000008 ] [ payload load 2b @ network header + 0 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x0000fcff ) ^ 0x00000300 ] - [ payload write reg 1 => 2b @ network header + 0 csum_type 1 csum_off 10 ] + [ payload write reg 1 => 2b @ network header + 0 csum_type 1 csum_off 10 csum_flags 0x0 ] # iif "lo" ip dscp set af23 netdev test-netdev ingress @@ -838,7 +838,7 @@ netdev test-netdev ingress [ cmp eq reg 1 0x00000008 ] [ payload load 2b @ network header + 0 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x000003ff ) ^ 0x00005800 ] - [ payload write reg 1 => 2b @ network header + 0 csum_type 1 csum_off 10 ] + [ payload write reg 1 => 2b @ network header + 0 csum_type 1 csum_off 10 csum_flags 0x0 ] # iif "lo" ip dscp set cs0 netdev test-netdev ingress @@ -848,5 +848,5 @@ netdev test-netdev ingress [ cmp eq reg 1 0x00000008 ] [ payload load 2b @ network header + 0 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x000003ff ) ^ 0x00000000 ] - [ payload write reg 1 => 2b @ network header + 0 csum_type 1 csum_off 10 ] + [ payload write reg 1 => 2b @ network header + 0 csum_type 1 csum_off 10 csum_flags 0x0 ] -- cgit v1.2.3