From ec1ea13314fa55e43e3034bf43297829b25ba582 Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Thu, 3 Jun 2021 22:45:13 +0200 Subject: tests: remove redundant test cases Check for ... 23-42 ... ... { 23-42 } ... and remove the latter. Followup patch will translate the former to the latter during evaluation step to avoid the unneded anon set. A separate test case will be added that checks for such rewrites. Signed-off-by: Florian Westphal --- tests/py/ip/icmp.t.json | 407 ------------------------------------------------ 1 file changed, 407 deletions(-) (limited to 'tests/py/ip/icmp.t.json') diff --git a/tests/py/ip/icmp.t.json b/tests/py/ip/icmp.t.json index 12b53b0f..576335cc 100644 --- a/tests/py/ip/icmp.t.json +++ b/tests/py/ip/icmp.t.json @@ -422,56 +422,6 @@ } ] -# icmp code { 33-55} -[ - { - "match": { - "left": { - "payload": { - "field": "code", - "protocol": "icmp" - } - }, - "op": "==", - "right": { - "set": [ - { - "range": [ - 33, - 55 - ] - } - ] - } - } - } -] - -# icmp code != { 33-55} -[ - { - "match": { - "left": { - "payload": { - "field": "code", - "protocol": "icmp" - } - }, - "op": "!=", - "right": { - "set": [ - { - "range": [ - 33, - 55 - ] - } - ] - } - } - } -] - # icmp code { 2, 4, 54, 33, 56} [ { @@ -606,62 +556,6 @@ } ] -# icmp checksum { 11-343} accept -[ - { - "match": { - "left": { - "payload": { - "field": "checksum", - "protocol": "icmp" - } - }, - "op": "==", - "right": { - "set": [ - { - "range": [ - 11, - 343 - ] - } - ] - } - } - }, - { - "accept": null - } -] - -# icmp checksum != { 11-343} accept -[ - { - "match": { - "left": { - "payload": { - "field": "checksum", - "protocol": "icmp" - } - }, - "op": "!=", - "right": { - "set": [ - { - "range": [ - 11, - 343 - ] - } - ] - } - } - }, - { - "accept": null - } -] - # icmp checksum { 1111, 222, 343} accept [ { @@ -839,73 +733,6 @@ } ] -# icmp id { 33-55} -[ - { - "match": { - "left": { - "payload": { - "field": "id", - "protocol": "icmp" - } - }, - "op": "==", - "right": { - "set": [ - { - "range": [ - 33, - 55 - ] - } - ] - } - } - } -] - -# icmp id != { 33-55} -[ - { - "match": { - "left": { - "payload": { - "field": "type", - "protocol": "icmp" - } - }, - "op": "==", - "right": { - "set": [ - "echo-reply", - "echo-request" - ] - } - } - }, - { - "match": { - "left": { - "payload": { - "field": "id", - "protocol": "icmp" - } - }, - "op": "!=", - "right": { - "set": [ - { - "range": [ - 33, - 55 - ] - } - ] - } - } - } -] - # icmp id { 22, 34, 333} [ { @@ -1206,90 +1033,6 @@ } ] -# icmp sequence { 33-55} -[ - { - "match": { - "left": { - "payload": { - "field": "type", - "protocol": "icmp" - } - }, - "op": "==", - "right": { - "set": [ - "echo-reply", - "echo-request" - ] - } - } - }, - { - "match": { - "left": { - "payload": { - "field": "sequence", - "protocol": "icmp" - } - }, - "op": "==", - "right": { - "set": [ - { - "range": [ - 33, - 55 - ] - } - ] - } - } - } -] - -# icmp sequence != { 33-55} -[ - { - "match": { - "left": { - "payload": { - "field": "type", - "protocol": "icmp" - } - }, - "op": "==", - "right": { - "set": [ - "echo-reply", - "echo-request" - ] - } - } - }, - { - "match": { - "left": { - "payload": { - "field": "sequence", - "protocol": "icmp" - } - }, - "op": "!=", - "right": { - "set": [ - { - "range": [ - 33, - 55 - ] - } - ] - } - } - } -] - # icmp id 1 icmp sequence 2 [ { @@ -1417,56 +1160,6 @@ } ] -# icmp mtu { 22-33} -[ - { - "match": { - "left": { - "payload": { - "field": "mtu", - "protocol": "icmp" - } - }, - "op": "==", - "right": { - "set": [ - { - "range": [ - 22, - 33 - ] - } - ] - } - } - } -] - -# icmp mtu != { 22-33} -[ - { - "match": { - "left": { - "payload": { - "field": "mtu", - "protocol": "icmp" - } - }, - "op": "!=", - "right": { - "set": [ - { - "range": [ - 22, - 33 - ] - } - ] - } - } - } -] - # icmp mtu 22 [ { @@ -1587,56 +1280,6 @@ } ] -# icmp mtu { 33-55} -[ - { - "match": { - "left": { - "payload": { - "field": "mtu", - "protocol": "icmp" - } - }, - "op": "==", - "right": { - "set": [ - { - "range": [ - 33, - 55 - ] - } - ] - } - } - } -] - -# icmp mtu != { 33-55} -[ - { - "match": { - "left": { - "payload": { - "field": "mtu", - "protocol": "icmp" - } - }, - "op": "!=", - "right": { - "set": [ - { - "range": [ - 33, - 55 - ] - } - ] - } - } - } -] - # icmp gateway 22 [ { @@ -1757,56 +1400,6 @@ } ] -# icmp gateway { 33-55} -[ - { - "match": { - "left": { - "payload": { - "field": "gateway", - "protocol": "icmp" - } - }, - "op": "==", - "right": { - "set": [ - { - "range": [ - 33, - 55 - ] - } - ] - } - } - } -] - -# icmp gateway != { 33-55} -[ - { - "match": { - "left": { - "payload": { - "field": "gateway", - "protocol": "icmp" - } - }, - "op": "!=", - "right": { - "set": [ - { - "range": [ - 33, - 55 - ] - } - ] - } - } - } -] - # icmp gateway != 34 [ { -- cgit v1.2.3