From 54aa3de7b49a20a65e0fa0a36204bd387d4f40c9 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Fri, 24 May 2019 20:54:37 +0200 Subject: Revert "tests: py: remove single-value-anon-set test cases" This reverts commit d03bcb669c0c645190df9bd166f53380bcac7862. --- tests/py/arp/arp.t | 6 +++ tests/py/arp/arp.t.json | 120 +++++++++++++++++++++++++++++++++++++++++++++ tests/py/arp/arp.t.payload | 48 ++++++++++++++++++ 3 files changed, 174 insertions(+) (limited to 'tests/py/arp') diff --git a/tests/py/arp/arp.t b/tests/py/arp/arp.t index 12afacf1..d62cc546 100644 --- a/tests/py/arp/arp.t +++ b/tests/py/arp/arp.t @@ -13,6 +13,8 @@ arp htype 33-45;ok arp htype != 33-45;ok arp htype { 33, 55, 67, 88};ok arp htype != { 33, 55, 67, 88};ok +arp htype { 33-55};ok +arp htype != { 33-55};ok arp ptype 0x0800;ok;arp ptype ip @@ -22,6 +24,8 @@ arp hlen 33-45;ok arp hlen != 33-45;ok arp hlen { 33, 55, 67, 88};ok arp hlen != { 33, 55, 67, 88};ok +arp hlen { 33-55};ok +arp hlen != { 33-55};ok arp plen 22;ok arp plen != 233;ok @@ -29,6 +33,8 @@ arp plen 33-45;ok arp plen != 33-45;ok arp plen { 33, 55, 67, 88};ok arp plen != { 33, 55, 67, 88};ok +arp plen { 33-55};ok +arp plen != {33-55};ok arp operation {nak, inreply, inrequest, rreply, rrequest, reply, request};ok arp operation != {nak, inreply, inrequest, rreply, rrequest, reply, request};ok diff --git a/tests/py/arp/arp.t.json b/tests/py/arp/arp.t.json index b1ff4cd5..4b0439e6 100644 --- a/tests/py/arp/arp.t.json +++ b/tests/py/arp/arp.t.json @@ -144,6 +144,46 @@ } ] +# arp htype { 33-55} +[ + { + "match": { + "left": { + "payload": { + "field": "htype", + "protocol": "arp" + } + }, + "op": "==", + "right": { + "set": [ + { "range": [ 33, 55 ] } + ] + } + } + } +] + +# arp htype != { 33-55} +[ + { + "match": { + "left": { + "payload": { + "field": "htype", + "protocol": "arp" + } + }, + "op": "!=", + "right": { + "set": [ + { "range": [ 33, 55 ] } + ] + } + } + } +] + # arp ptype 0x0800 [ { @@ -274,6 +314,46 @@ } ] +# arp hlen { 33-55} +[ + { + "match": { + "left": { + "payload": { + "field": "hlen", + "protocol": "arp" + } + }, + "op": "==", + "right": { + "set": [ + { "range": [ 33, 55 ] } + ] + } + } + } +] + +# arp hlen != { 33-55} +[ + { + "match": { + "left": { + "payload": { + "field": "hlen", + "protocol": "arp" + } + }, + "op": "!=", + "right": { + "set": [ + { "range": [ 33, 55 ] } + ] + } + } + } +] + # arp plen 22 [ { @@ -388,6 +468,46 @@ } ] +# arp plen { 33-55} +[ + { + "match": { + "left": { + "payload": { + "field": "plen", + "protocol": "arp" + } + }, + "op": "==", + "right": { + "set": [ + { "range": [ 33, 55 ] } + ] + } + } + } +] + +# arp plen != {33-55} +[ + { + "match": { + "left": { + "payload": { + "field": "plen", + "protocol": "arp" + } + }, + "op": "!=", + "right": { + "set": [ + { "range": [ 33, 55 ] } + ] + } + } + } +] + # arp operation {nak, inreply, inrequest, rreply, rrequest, reply, request} [ { diff --git a/tests/py/arp/arp.t.payload b/tests/py/arp/arp.t.payload index 524a5406..33e73417 100644 --- a/tests/py/arp/arp.t.payload +++ b/tests/py/arp/arp.t.payload @@ -45,6 +45,22 @@ arp test-arp input [ payload load 2b @ network header + 0 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] +# arp htype { 33-55} +__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 ] + +# arp htype != { 33-55} +__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 0x1 ] + # arp ptype 0x0800 arp test-arp input [ payload load 2b @ network header + 2 => reg 1 ] @@ -87,6 +103,22 @@ arp test-arp input [ payload load 1b @ network header + 4 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] +# arp hlen { 33-55} +__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 ] + +# arp hlen != { 33-55} +__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 0x1 ] + # arp plen 22 arp test-arp input [ payload load 1b @ network header + 5 => reg 1 ] @@ -124,6 +156,22 @@ arp test-arp input [ payload load 1b @ network header + 5 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] +# arp plen { 33-55} +__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 ] + +# arp plen != {33-55} +__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 0x1 ] + # arp operation {nak, inreply, inrequest, rreply, rrequest, reply, request} __set%d test-arp 3 __set%d test-arp 0 -- cgit v1.2.3