| Message ID | 20240411012815.174400-3-kuba@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 72ba6cba0a6e9f06c09187ddbbdc9f80ee93ffb3 |
| Headers | show |
| Series | selftests: net: exercise page pool reporting via netlink | expand |
Jakub Kicinski <kuba@kernel.org> writes: > YNL currently reports None for empty dump: > > $ cli.py ...netdev.yaml --dump page-pool-get > None > > This doesn't matter for the CLI but when writing YNL based tests > having to deal with either list or None is annoying. Limit the > None conversion to non-dump ops: > > $ cli.py ...netdev.yaml --dump page-pool-get > [] Makes sense and I'll need to update my --multi patch to retain this behaviour. Reviewed-by: Donald Hunter <donald.hunter@gmail.com> > Signed-off-by: Jakub Kicinski <kuba@kernel.org> > --- > CC: donald.hunter@gmail.com > CC: jiri@resnulli.us > --- > tools/net/ynl/lib/ynl.py | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/tools/net/ynl/lib/ynl.py b/tools/net/ynl/lib/ynl.py > index 0ba5f6fb8747..a67f7b6fef92 100644 > --- a/tools/net/ynl/lib/ynl.py > +++ b/tools/net/ynl/lib/ynl.py > @@ -995,9 +995,11 @@ genl_family_name_to_id = None > rsp_msg.update(self._decode_struct(decoded.raw, op.fixed_header)) > rsp.append(rsp_msg) > > + if dump: > + return rsp > if not rsp: > return None > - if not dump and len(rsp) == 1: > + if len(rsp) == 1: > return rsp[0] > return rsp
diff --git a/tools/net/ynl/lib/ynl.py b/tools/net/ynl/lib/ynl.py index 0ba5f6fb8747..a67f7b6fef92 100644 --- a/tools/net/ynl/lib/ynl.py +++ b/tools/net/ynl/lib/ynl.py @@ -995,9 +995,11 @@ genl_family_name_to_id = None rsp_msg.update(self._decode_struct(decoded.raw, op.fixed_header)) rsp.append(rsp_msg) + if dump: + return rsp if not rsp: return None - if not dump and len(rsp) == 1: + if len(rsp) == 1: return rsp[0] return rsp
YNL currently reports None for empty dump: $ cli.py ...netdev.yaml --dump page-pool-get None This doesn't matter for the CLI but when writing YNL based tests having to deal with either list or None is annoying. Limit the None conversion to non-dump ops: $ cli.py ...netdev.yaml --dump page-pool-get [] Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- CC: donald.hunter@gmail.com CC: jiri@resnulli.us --- tools/net/ynl/lib/ynl.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)