From cadc2f92d2e75394ce84eaff9380cad3a610c260 Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Tue, 3 Nov 2020 13:48:20 +0100 Subject: tests: avoid warning and add missing json test cases make dnat.t pass in json mode. Signed-off-by: Florian Westphal --- tests/py/inet/dnat.t | 4 ++-- tests/py/inet/dnat.t.json | 55 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/py/inet/dnat.t b/tests/py/inet/dnat.t index a2661008..b460af39 100644 --- a/tests/py/inet/dnat.t +++ b/tests/py/inet/dnat.t @@ -15,7 +15,7 @@ dnat to 1.2.3.4;fail dnat ip6 to ct mark . ip daddr map { 0x00000014 . 1.1.1.1 : 1.2.3.4};fail ip6 daddr dead::beef dnat to 10.1.2.3;fail -meta l4proto { tcp, udp } dnat ip to 1.1.1.1:80;ok -ip protocol { tcp, udp } dnat ip to 1.1.1.1:80;ok +meta l4proto { tcp, udp } dnat ip to 1.1.1.1:80;ok;meta l4proto { 6, 17} dnat ip to 1.1.1.1:80 +ip protocol { tcp, udp } dnat ip to 1.1.1.1:80;ok;ip protocol { 6, 17} dnat ip to 1.1.1.1:80 meta l4proto { tcp, udp } tcp dport 20 dnat to 1.1.1.1:80;fail ip protocol { tcp, udp } tcp dport 20 dnat to 1.1.1.1:80;fail diff --git a/tests/py/inet/dnat.t.json b/tests/py/inet/dnat.t.json index ac6dac62..1b8aba62 100644 --- a/tests/py/inet/dnat.t.json +++ b/tests/py/inet/dnat.t.json @@ -164,3 +164,58 @@ } ] +# meta l4proto { tcp, udp } dnat ip to 1.1.1.1:80 +[ + { + "match": { + "left": { + "meta": { + "key": "l4proto" + } + }, + "op": "==", + "right": { + "set": [ + 6, + 17 + ] + } + } + }, + { + "dnat": { + "addr": "1.1.1.1", + "family": "ip", + "port": 80 + } + } +] + +# ip protocol { tcp, udp } dnat ip to 1.1.1.1:80 +[ + { + "match": { + "left": { + "payload": { + "field": "protocol", + "protocol": "ip" + } + }, + "op": "==", + "right": { + "set": [ + 6, + 17 + ] + } + } + }, + { + "dnat": { + "addr": "1.1.1.1", + "family": "ip", + "port": 80 + } + } +] + -- cgit v1.2.3