tests/py: add more interval tests for anonymous sets
Pablo Neira Ayuso
maintainerPATCH 1/3 tests/py: add more interval tests for anonymous sets
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- tests/py/any/ct.t | 1 + tests/py/any/ct.t.payload | 9 +++++++++ tests/py/any/meta.t | 3 +++ tests/py/any/meta.t.payload | 27 +++++++++++++++++++++++++++ 4 files changed, 40 insertions(+)
tests/py/any/ct.t +1 -0
@@ -44,6 +44,7 @@ ct mark != 0x00000032;ok ct mark 0x00000032-0x00000045;ok ct mark != 0x00000032-0x00000045;ok ct mark {0x32, 0x2222, 0x42de3};ok;ct mark { 0x00042de3, 0x00002222, 0x00000032} +ct mark {0x32-0x2222, 0x4444-0x42de3};ok;ct mark { 0x00000032-0x00002222, 0x00004444-0x00042de3} - ct mark != {0x32, 0x2222, 0x42de3};ok # ct mark != {0x32, 0x2222, 0x42de3};ok
tests/py/any/ct.t.payload +9 -0
@@ -166,6 +166,15 @@ ip test-ip4 output [ ct load mark => reg 1 ] [ lookup reg 1 set set%d ] +# ct mark {0x32-0x2222, 0x4444-0x42de3} +set%d test-ip4 7 +set%d test-ip4 0 + element 00000000 : 1 [end] element 32000000 : 0 [end] element 23220000 : 1 [end] element 44440000 : 0 [end] element e42d0400 : 1 [end] +ip test-ip4 output + [ ct load mark => reg 1 ] + [ byteorder reg 1 = hton(reg 1, 4, 4) ] + [ lookup reg 1 set set%d ] + # ct mark set 0x11 xor 0x1331 ip test-ip4 output [ immediate reg 1 0x00001320 ]
tests/py/any/meta.t +3 -0
@@ -14,6 +14,8 @@ meta length != 233;ok meta length 33-45;ok meta length != 33-45;ok meta length { 33, 55, 67, 88};ok +meta length { 33-55, 67-88};ok +meta length { 33-55, 55-88, 100-120};ok;meta length { 33-88, 100-120} - meta length != { 33, 55, 67, 88};ok meta length { 33-55};ok - meta length != { 33-55};ok
@@ -162,6 +164,7 @@ meta cpu != 1;ok;cpu != 1 meta cpu 1-3;ok;cpu 1-3 meta cpu != 1-2;ok;cpu != 1-2 meta cpu { 2,3};ok;cpu { 2,3} +meta cpu { 2-3, 5-7};ok -meta cpu != { 2,3};ok; cpu != { 2,3} meta iifgroup 0;ok;iifgroup default
tests/py/any/meta.t.payload +27 -0
@@ -44,6 +44,24 @@ ip test-ip4 input [ byteorder reg 1 = hton(reg 1, 4, 4) ] [ lookup reg 1 set set%d ] +# meta length { 33-55, 67-88} +set%d test-ip4 7 +set%d test-ip4 0 + element 00000000 : 1 [end] element 21000000 : 0 [end] element 38000000 : 1 [end] element 43000000 : 0 [end] element 59000000 : 1 [end] +ip test-ip4 input + [ meta load len => reg 1 ] + [ byteorder reg 1 = hton(reg 1, 4, 4) ] + [ lookup reg 1 set set%d ] + +# meta length { 33-55, 55-88, 100-120} +set%d test-ip4 7 +set%d test-ip4 0 + element 00000000 : 1 [end] element 21000000 : 0 [end] element 59000000 : 1 [end] element 64000000 : 0 [end] element 79000000 : 1 [end] +ip test-ip4 input + [ meta load len => reg 1 ] + [ byteorder reg 1 = hton(reg 1, 4, 4) ] + [ lookup reg 1 set set%d ] + # meta protocol { ip, arp, ip6, vlan } set%d test-ip4 3 set%d test-ip4 0
@@ -594,6 +612,15 @@ ip test-ip4 input [ meta load cpu => reg 1 ] [ lookup reg 1 set set%d ] +# meta cpu { 2-3, 5-7} +set%d test-ip4 7 +set%d test-ip4 0 + element 00000000 : 1 [end] element 02000000 : 0 [end] element 04000000 : 1 [end] element 05000000 : 0 [end] element 08000000 : 1 [end] +ip test-ip4 input + [ meta load cpu => reg 1 ] + [ byteorder reg 1 = hton(reg 1, 4, 4) ] + [ lookup reg 1 set set%d ] + # meta iifgroup 0 ip test-ip4 input [ meta load iifgroup => reg 1 ]
Signature · 1 line
2.1.4
Pablo Neira Ayuso
maintainerPATCH 2/3 tests/py: explicitly indication of set type and flags from test definitions
This patch adds explicit set type in test definitions, as well as flags.
This has triggered a rework that starts by introducing a Set class to make this whole code more extensible and maintainable.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- tests/py/ip/sets.t | 12 ++++---- tests/py/ip6/sets.t | 10 +++---- tests/py/nft-test.py | 78 ++++++++++++++++++++++++++++++++++++++-------------- 3 files changed, 68 insertions(+), 32 deletions(-)
tests/py/ip/sets.t +6 -6
@@ -5,12 +5,12 @@ *inet;test-inet;input *netdev;test-netdev;ingress -!set_ipv4_add ipv4_addr;ok -!set_inet inet_proto;ok -!set_inet_serv inet_service;ok -!set_time time;ok +!w type ipv4_addr;ok +!x type inet_proto;ok +!y type inet_service;ok +!z type time;ok -!set1 ipv4_addr;ok +!set1 type ipv4_addr;ok ?set1 192.168.3.4;ok ?set1 192.168.3.4;fail
@@ -21,7 +21,7 @@ ?set1 1234:1234:1234:1234:1234:1234:1234:1234;fail ?set2 192.168.3.4;fail -!set2 ipv4_addr;ok +!set2 type ipv4_addr;ok ?set2 192.168.3.4;ok ?set2 192.168.3.5 192.168.3.6;ok ?set2 192.168.3.5 192.168.3.6;fail
tests/py/ip6/sets.t +5 -5
@@ -5,13 +5,13 @@ *inet;test-inet;input *netdev;test-netdev;ingress -!set_ipv6_add1 ipv6_addr;ok -!set_inet1 inet_proto;ok -!set_inet inet_service;ok -!set_time time;ok +!w type ipv6_addr;ok +!x type inet_proto;ok +!y type inet_service;ok +!z type time;ok ?set2 192.168.3.4;fail -!set2 ipv6_addr;ok +!set2 type ipv6_addr;ok ?set2 1234:1234::1234:1234:1234:1234:1234;ok ?set2 1234:1234::1234:1234:1234:1234:1234;fail ?set2 1234::1234:1234:1234;ok
tests/py/nft-test.py +57 -21
122 lines not on this page · raw message
Signature · 1 line
2.1.4
Pablo Neira Ayuso
maintainerPATCH 3/3 tests/py: add interval tests
In reply to Pablo Neira AyusoAdd some initial tests to cover dynamic interval sets.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- tests/py/ip/sets.t | 12 ++++++++++++ tests/py/ip6/sets.t | 11 +++++++++++ 2 files changed, 23 insertions(+)
tests/py/ip/sets.t +12 -0
@@ -31,3 +31,15 @@ ip saddr @set1 drop;ok ip saddr @set2 drop;ok ip saddr @set33 drop;fail + +!set3 type ipv4_addr flags interval;ok +?set3 192.168.0.0/16;ok +?set3 172.16.0.0/12;ok +?set3 10.0.0.0/8;ok + +!set4 type ipv4_addr flags interval;ok +?set4 192.168.1.0/24;ok +?set4 192.168.0.0/24;ok +?set4 192.168.2.0/24;ok +?set4 192.168.1.1;fail +?set4 192.168.3.0/24;ok
tests/py/ip6/sets.t +11 -0
@@ -23,3 +23,14 @@ ip6 saddr @set2 drop;ok ip6 saddr @set33 drop;fail + +!set3 type ipv6_addr flags interval;ok +?set3 1234:1234:1234:1234::/64;ok +?set3 1324:1234:1234:1235::/64;ok +?set3 1324:1234:1234:1233::/64;ok +?set3 1234:1234:1234:1234:1234:1234:/96;fail +?set3 1324:1234:1234:1236::/64;ok + +!set4 type ipv6_addr flags interval;ok +?set4 1234:1234:1234:1234::/64 4321:1234:1234:1234::/64;ok +?set4 4321:1234:1234:1234:1234:1234::/96;fail
Signature · 1 line
2.1.4