Commit 663ad748 authored by Donald Hunter's avatar Donald Hunter Committed by Jakub Kicinski
Browse files

tools/net/ynl: fix sub-message key lookup for nested attributes 



Use the correct attribute space for sub-message key lookup in nested
attributes when adding attributes. This fixes rt_link where the "kind"
key and "data" sub-message are nested attributes in "linkinfo".

For example:

./tools/net/ynl/cli.py \
    --create \
    --spec Documentation/netlink/specs/rt_link.yaml \
    --do newlink \
    --json '{"link": 99,
             "linkinfo": { "kind": "vlan", "data": {"id": 4 } }
             }'

Signed-off-by: default avatarDonald Hunter <donald.hunter@gmail.com>
Fixes: ab463c43 ("tools/net/ynl: Add support for encoding sub-messages")
Link: https://patch.msgid.link/20241213130711.40267-1-donald.hunter@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent ee767463

tools/net/ynl/lib/ynl.py

+3 −3
Original line number Diff line number Diff line
@@ -556,10 +556,10 @@ class YnlFamily(SpecFamily): 
        if attr["type"] == 'nest':

            nl_type |= Netlink.NLA_F_NESTED

            attr_payload = b''

            sub_attrs = SpaceAttrs(self.attr_sets[space], value, search_attrs)

            sub_space = attr['nested-attributes']

            sub_attrs = SpaceAttrs(self.attr_sets[sub_space], value, search_attrs)

            for subname, subvalue in value.items():

                attr_payload += self._add_attr(attr['nested-attributes'],

                                               subname, subvalue, sub_attrs)

                attr_payload += self._add_attr(sub_space, subname, subvalue, sub_attrs)

        elif attr["type"] == 'flag':

            if not value:

                # If value is absent or false then skip attribute creation.