Re: [ovs-dev] [PATCH net-next 5/7] selftests: openvswitch: Support implicit ipv6 arguments.

Aaron Conole
2024-06-18T16:04:51Z

Aaron Conole <aconole@redhat.com> writes:

> The current iteration of IPv6 support requires explicit fields to be set
> in addition to not properly support the actual IPv6 addresses properly.
> With this change, make it so that the ipv6() bare option is usable to
> create wildcarded flows to match broad swaths of ipv6 traffic.
>
> Reviewed-by: Simon Horman <horms@kernel.org>
> Tested-by: Simon Horman <horms@kernel.org>
> Signed-off-by: Aaron Conole <aconole@redhat.com>
> ---
> .../selftests/net/openvswitch/ovs-dpctl.py | 42 ++++++++++++-------
> 1 file changed, 27 insertions(+), 15 deletions(-)
>
> diff --git a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py b/tools/testing/selftests/net/openvswitch/ovs-dpctl.py
> index 2f16df2fb16b..2062e7e6e99e 100644
> --- a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py
> +++ b/tools/testing/selftests/net/openvswitch/ovs-dpctl.py
> @@ -200,6 +200,18 @@ def convert_ipv4(data):
>
> return int(ipaddress.IPv4Address(ip)), int(ipaddress.IPv4Address(mask))
>
> +def convert_ipv6(data):
> + ip, _, mask = data.partition('/')
> +
> + if not ip:
> + ip = mask = 0
> + elif not mask:
> + mask = 'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff'
> + elif mask.isdigit():
> + mask = ipaddress.IPv6Network("::/" + mask).hostmask
> +
> + return ipaddress.IPv6Address(ip).packed, ipaddress.IPv6Address(mask).packed
> +
> def convert_int(size):
> def convert_int_sized(data):
> value, _, mask = data.partition('/')
> @@ -941,21 +953,21 @@ class ovskey(nla):
> "src",
> "src",
> lambda x: str(ipaddress.IPv6Address(x)),
> - lambda x: int.from_bytes(x, "big"),
> - lambda x: ipaddress.IPv6Address(x),
> + lambda x: ipaddress.IPv6Address(x).packed if x else 0,
> + convert_ipv6,
> ),
> (
> "dst",
> "dst",
> lambda x: str(ipaddress.IPv6Address(x)),
> - lambda x: int.from_bytes(x, "big"),
> - lambda x: ipaddress.IPv6Address(x),
> + lambda x: ipaddress.IPv6Address(x).packed if x else 0,
> + convert_ipv6,
> ),
> - ("label", "label", "%d", int),
> - ("proto", "proto", "%d", int),
> - ("tclass", "tclass", "%d", int),
> - ("hlimit", "hlimit", "%d", int),
> - ("frag", "frag", "%d", int),
> + ("label", "label", "%d", lambda x: int(x) if x else 0),
> + ("proto", "proto", "%d", lambda x: int(x) if x else 0),
> + ("tclass", "tclass", "%d", lambda x: int(x) if x else 0),
> + ("hlimit", "hlimit", "%d", lambda x: int(x) if x else 0),
> + ("frag", "frag", "%d", lambda x: int(x) if x else 0),
> )
>
> def __init__(
> @@ -1152,8 +1164,8 @@ class ovskey(nla):
> (
> "target",
> "target",
> - lambda x: str(ipaddress.IPv6Address(x)),
> - lambda x: int.from_bytes(x, "big"),
> + lambda x: ipaddress.IPv6Address(x).packed,

This (and the following str() calls) shouldn't have been changed. I'll
send a v2. Sorry about the noise. It isn't visible in this test, but
when doing some additional ipv6 test development for a future series, I
caught it.

> + convert_ipv6,
> ),
> ("sll", "sll", macstr, lambda x: int.from_bytes(x, "big")),
> ("tll", "tll", macstr, lambda x: int.from_bytes(x, "big")),
> @@ -1237,14 +1249,14 @@ class ovskey(nla):
> (
> "src",
> "src",
> - lambda x: str(ipaddress.IPv6Address(x)),
> - lambda x: int.from_bytes(x, "big", convertmac),
> + lambda x: ipaddress.IPv6Address(x).packed,
> + convert_ipv6,
> ),
> (
> "dst",
> "dst",
> - lambda x: str(ipaddress.IPv6Address(x)),
> - lambda x: int.from_bytes(x, "big"),
> + lambda x: ipaddress.IPv6Address(x).packed,
> + convert_ipv6,
> ),
> ("tp_src", "tp_src", "%d", int),
> ("tp_dst", "tp_dst", "%d", int),