json: icmp: move expected parts to json.output
Florian Westphal
maintainerPATCH 1/1 json: icmp: move expected parts to json.output
Phil Sutter says:
In general, *.t.json files should contain JSON equivalents for rules as they are *input* into nft. So we want them to be as close to the introductory standard syntax comment as possible.
Undo earlier change and place the expected dependency added by nft internals to json.output rather than icmp.t.json.
Signed-off-by Florian Westphal <[email protected]>
--- tests/py/ip/icmp.t.json | 73 +----------------- tests/py/ip/icmp.t.json.output | 134 +++++++++++++++++++++++---------- 2 files changed, 98 insertions(+), 109 deletions(-)
tests/py/ip/icmp.t.json +2 -71
@@ -485,8 +485,8 @@ "op": "==", "right": { "set": [ - "prot-unreachable", - "frag-needed", + 2, + 4, 33, 54, 56
@@ -714,23 +714,6 @@ # icmp id 1245 log [ - { - "match": { - "left": { - "payload": { - "field": "type", - "protocol": "icmp" - } - }, - "op": "==", - "right": { - "set": [ - "echo-reply", - "echo-request" - ] - } - } - }, { "match": { "left": {
@@ -750,23 +733,6 @@ # icmp id 22 [ - { - "match": { - "left": { - "payload": { - "field": "type", - "protocol": "icmp" - } - }, - "op": "==", - "right": { - "set": [ - "echo-reply", - "echo-request" - ] - } - } - }, { "match": { "left": {
@@ -783,23 +749,6 @@ # icmp id != 233 [ - { - "match": { - "left": { - "payload": { - "field": "type", - "protocol": "icmp" - } - }, - "op": "==", - "right": { - "set": [ - "echo-reply", - "echo-request" - ] - } - } - }, { "match": { "left": {
@@ -892,23 +841,6 @@ # icmp id { 33-55} [ - { - "match": { - "left": { - "payload": { - "field": "type", - "protocol": "icmp" - } - }, - "op": "==", - "right": { - "set": [ - "echo-reply", - "echo-request" - ] - } - } - }, { "match": { "left": {
@@ -1911,4 +1843,3 @@ } } ] -
tests/py/ip/icmp.t.json.output +96 -38
204 lines not on this page · raw message
Signature · 1 line
2.26.2