Re: [PATCH net-next 1/5] tools: ynl: allow passing binary data

[Donald Hunter <donald.hunter@gmail.com>]

Jakub Kicinski <kuba@kernel.org> writes:

> Recent changes made us assume that input for binary data is in hex.
> When using YNL as a Python library it's possible to pass in raw bytes.
> Bring the ability to do that back.
>
> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
> ---
>  tools/net/ynl/lib/ynl.py | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/tools/net/ynl/lib/ynl.py b/tools/net/ynl/lib/ynl.py
> index 6951bcc7efdc..fa4f1c28efc5 100644
> --- a/tools/net/ynl/lib/ynl.py
> +++ b/tools/net/ynl/lib/ynl.py
> @@ -410,7 +410,12 @@ genl_family_name_to_id = None
>          elif attr["type"] == 'string':
>              attr_payload = str(value).encode('ascii') + b'\x00'
>          elif attr["type"] == 'binary':
> -            attr_payload = bytes.fromhex(value)
> +            if isinstance(value, bytes):
> +                attr_payload = value
> +            elif isinstance(value, str):
> +                attr_payload = bytes.fromhex(value)
> +            else:
> +                raise Exception(f'Unknown type for binary attribute, value: {value}')
>          elif attr['type'] in NlAttr.type_formats:
>              format = NlAttr.get_format(attr['type'], attr.byte_order)
>              attr_payload = format.pack(int(value))

Reviewed-by: Donald Hunter <donald.hunter@gmail.com>