| Message ID | 20240613181333.984810-6-aconole@redhat.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | selftests: net: Switch pmtu.sh to use the internal ovs script. | expand |
On Thu, Jun 13, 2024 at 02:13:31PM -0400, Aaron Conole wrote: > 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. > > Signed-off-by: Aaron Conole <aconole@redhat.com> > --- > .../selftests/net/openvswitch/ovs-dpctl.py | 43 ++++++++++++------- > 1 file changed, 28 insertions(+), 15 deletions(-) > > diff --git a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py b/tools/testing/selftests/net/openvswitch/ovs-dpctl.py > index 5545e5cab1d6..2577a06c58cf 100644 > --- a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py > +++ b/tools/testing/selftests/net/openvswitch/ovs-dpctl.py > @@ -200,6 +200,19 @@ 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 > + > + nit: Perhaps one blank line is enough > def convert_int(size): > def convert_int_sized(data): > value, _, mask = data.partition('/') ... The nit above notwithstanding, this patch looks good to me. Reviewed-by: Simon Horman <horms@kernel.org> Tested-by: Simon Horman <horms@kernel.org>
Simon Horman <horms@kernel.org> writes: > On Thu, Jun 13, 2024 at 02:13:31PM -0400, Aaron Conole wrote: >> 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. >> >> Signed-off-by: Aaron Conole <aconole@redhat.com> >> --- >> .../selftests/net/openvswitch/ovs-dpctl.py | 43 ++++++++++++------- >> 1 file changed, 28 insertions(+), 15 deletions(-) >> >> diff --git a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py b/tools/testing/selftests/net/openvswitch/ovs-dpctl.py >> index 5545e5cab1d6..2577a06c58cf 100644 >> --- a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py >> +++ b/tools/testing/selftests/net/openvswitch/ovs-dpctl.py >> @@ -200,6 +200,19 @@ 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 >> + >> + > > nit: Perhaps one blank line is enough Sure - dropped. >> def convert_int(size): >> def convert_int_sized(data): >> value, _, mask = data.partition('/') > > ... > > The nit above notwithstanding, this patch looks good to me. > > Reviewed-by: Simon Horman <horms@kernel.org> > Tested-by: Simon Horman <horms@kernel.org>
diff --git a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py b/tools/testing/selftests/net/openvswitch/ovs-dpctl.py index 5545e5cab1d6..2577a06c58cf 100644 --- a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py +++ b/tools/testing/selftests/net/openvswitch/ovs-dpctl.py @@ -200,6 +200,19 @@ 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('/') @@ -937,21 +950,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__( @@ -1148,8 +1161,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, + convert_ipv6, ), ("sll", "sll", macstr, lambda x: int.from_bytes(x, "big")), ("tll", "tll", macstr, lambda x: int.from_bytes(x, "big")), @@ -1233,14 +1246,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),
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. Signed-off-by: Aaron Conole <aconole@redhat.com> --- .../selftests/net/openvswitch/ovs-dpctl.py | 43 ++++++++++++------- 1 file changed, 28 insertions(+), 15 deletions(-)