From a206f22bdbd03a9c8dcf2f98e3ed7566b198d281 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Tue, 26 Jan 2021 17:06:33 +0100 Subject: reject: Fix for missing dependencies in netdev family Like with bridge family, rejecting with either icmp or icmpv6 must create a dependency match on meta protocol. Upon delinearization, treat netdev reject identical to bridge as well so no family info is lost. This makes reject statement in netdev family fully symmetric so fix the tests in tests/py/netdev/reject.t, adjust the related payload dumps and add JSON equivalents which were missing altogether. Fixes: 0c42a1f2a0cc5 ("evaluate: add netdev support for reject default") Fixes: a51a0bec1f698 ("tests: py: add netdev folder and reject.t icmp cases") Cc: Jose M. Guisado Gomez Signed-off-by: Phil Sutter --- tests/py/netdev/reject.t | 26 ++++---- tests/py/netdev/reject.t.json | 137 +++++++++++++++++++++++++++++++++++++++ tests/py/netdev/reject.t.payload | 42 +++++++++--- 3 files changed, 184 insertions(+), 21 deletions(-) create mode 100644 tests/py/netdev/reject.t.json (limited to 'tests/py/netdev') diff --git a/tests/py/netdev/reject.t b/tests/py/netdev/reject.t index a4434b6c..8f8c4e03 100644 --- a/tests/py/netdev/reject.t +++ b/tests/py/netdev/reject.t @@ -2,19 +2,19 @@ *netdev;test-netdev;ingress -reject with icmp type host-unreachable;ok;reject -reject with icmp type net-unreachable;ok;reject -reject with icmp type prot-unreachable;ok;reject -reject with icmp type port-unreachable;ok;reject -reject with icmp type net-prohibited;ok;reject -reject with icmp type host-prohibited;ok;reject -reject with icmp type admin-prohibited;ok;reject +reject with icmp type host-unreachable;ok +reject with icmp type net-unreachable;ok +reject with icmp type prot-unreachable;ok +reject with icmp type port-unreachable;ok +reject with icmp type net-prohibited;ok +reject with icmp type host-prohibited;ok +reject with icmp type admin-prohibited;ok -reject with icmpv6 type no-route;ok;reject -reject with icmpv6 type admin-prohibited;ok;reject -reject with icmpv6 type addr-unreachable;ok;reject -reject with icmpv6 type port-unreachable;ok;reject -reject with icmpv6 type policy-fail;ok;reject -reject with icmpv6 type reject-route;ok;reject +reject with icmpv6 type no-route;ok +reject with icmpv6 type admin-prohibited;ok +reject with icmpv6 type addr-unreachable;ok +reject with icmpv6 type port-unreachable;ok +reject with icmpv6 type policy-fail;ok +reject with icmpv6 type reject-route;ok reject;ok diff --git a/tests/py/netdev/reject.t.json b/tests/py/netdev/reject.t.json new file mode 100644 index 00000000..ffc72794 --- /dev/null +++ b/tests/py/netdev/reject.t.json @@ -0,0 +1,137 @@ +# reject with icmp type host-unreachable +[ + { + "reject": { + "expr": "host-unreachable", + "type": "icmp" + } + } +] + +# reject with icmp type net-unreachable +[ + { + "reject": { + "expr": "net-unreachable", + "type": "icmp" + } + } +] + +# reject with icmp type prot-unreachable +[ + { + "reject": { + "expr": "prot-unreachable", + "type": "icmp" + } + } +] + +# reject with icmp type port-unreachable +[ + { + "reject": { + "expr": "port-unreachable", + "type": "icmp" + } + } +] + +# reject with icmp type net-prohibited +[ + { + "reject": { + "expr": "net-prohibited", + "type": "icmp" + } + } +] + +# reject with icmp type host-prohibited +[ + { + "reject": { + "expr": "host-prohibited", + "type": "icmp" + } + } +] + +# reject with icmp type admin-prohibited +[ + { + "reject": { + "expr": "admin-prohibited", + "type": "icmp" + } + } +] + +# reject with icmpv6 type no-route +[ + { + "reject": { + "expr": "no-route", + "type": "icmpv6" + } + } +] + +# reject with icmpv6 type admin-prohibited +[ + { + "reject": { + "expr": "admin-prohibited", + "type": "icmpv6" + } + } +] + +# reject with icmpv6 type addr-unreachable +[ + { + "reject": { + "expr": "addr-unreachable", + "type": "icmpv6" + } + } +] + +# reject with icmpv6 type port-unreachable +[ + { + "reject": { + "expr": "port-unreachable", + "type": "icmpv6" + } + } +] + +# reject with icmpv6 type policy-fail +[ + { + "reject": { + "expr": "policy-fail", + "type": "icmpv6" + } + } +] + +# reject with icmpv6 type reject-route +[ + { + "reject": { + "expr": "reject-route", + "type": "icmpv6" + } + } +] + +# reject +[ + { + "reject": null + } +] + diff --git a/tests/py/netdev/reject.t.payload b/tests/py/netdev/reject.t.payload index d3af2f33..aead4127 100644 --- a/tests/py/netdev/reject.t.payload +++ b/tests/py/netdev/reject.t.payload @@ -1,56 +1,82 @@ # reject with icmp type host-unreachable netdev + [ meta load protocol => reg 1 ] + [ cmp eq reg 1 0x00000008 ] [ reject type 0 code 1 ] -# reject -netdev - [ reject type 2 code 1 ] - -# reject with icmp type admin-prohibited -netdev - [ reject type 0 code 13 ] - # reject with icmp type net-unreachable netdev + [ meta load protocol => reg 1 ] + [ cmp eq reg 1 0x00000008 ] [ reject type 0 code 0 ] # reject with icmp type prot-unreachable netdev + [ meta load protocol => reg 1 ] + [ cmp eq reg 1 0x00000008 ] [ reject type 0 code 2 ] # reject with icmp type port-unreachable netdev + [ meta load protocol => reg 1 ] + [ cmp eq reg 1 0x00000008 ] [ reject type 0 code 3 ] # reject with icmp type net-prohibited netdev + [ meta load protocol => reg 1 ] + [ cmp eq reg 1 0x00000008 ] [ reject type 0 code 9 ] # reject with icmp type host-prohibited netdev + [ meta load protocol => reg 1 ] + [ cmp eq reg 1 0x00000008 ] [ reject type 0 code 10 ] +# reject with icmp type admin-prohibited +netdev + [ meta load protocol => reg 1 ] + [ cmp eq reg 1 0x00000008 ] + [ reject type 0 code 13 ] + # reject with icmpv6 type no-route netdev + [ meta load protocol => reg 1 ] + [ cmp eq reg 1 0x0000dd86 ] [ reject type 0 code 0 ] # reject with icmpv6 type admin-prohibited netdev + [ meta load protocol => reg 1 ] + [ cmp eq reg 1 0x0000dd86 ] [ reject type 0 code 1 ] # reject with icmpv6 type addr-unreachable netdev + [ meta load protocol => reg 1 ] + [ cmp eq reg 1 0x0000dd86 ] [ reject type 0 code 3 ] # reject with icmpv6 type port-unreachable netdev + [ meta load protocol => reg 1 ] + [ cmp eq reg 1 0x0000dd86 ] [ reject type 0 code 4 ] # reject with icmpv6 type policy-fail netdev + [ meta load protocol => reg 1 ] + [ cmp eq reg 1 0x0000dd86 ] [ reject type 0 code 5 ] # reject with icmpv6 type reject-route netdev + [ meta load protocol => reg 1 ] + [ cmp eq reg 1 0x0000dd86 ] [ reject type 0 code 6 ] +# reject +netdev + [ reject type 2 code 1 ] + -- cgit v1.2.3