Commit 0c8e3025 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

netlink: specs: rt_addr: pull the ifa- prefix out of the names 



YAML specs don't normally include the C prefix name in the name
of the YAML attr. Remove the ifa- prefix from all attributes
in addr-attrs and specify name-prefix instead.

This is a bit risky, hopefully there aren't many users out there.

Fixes: dfb0f7d9 ("doc/netlink: Add spec for rt addr messages")
Reviewed-by: default avatarDonald Hunter <donald.hunter@gmail.com>
Link: https://patch.msgid.link/20250403013706.2828322-4-kuba@kernel.org


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

Documentation/netlink/specs/rt_addr.yaml

+20 −19
Original line number Diff line number Diff line
@@ -78,45 +78,46 @@ definitions: 
attribute-sets:

  -

    name: addr-attrs

    name-prefix: ifa-

    attributes:

      -

        name: ifa-address

        name: address

        type: binary

        display-hint: ipv4

      -

        name: ifa-local

        name: local

        type: binary

        display-hint: ipv4

      -

        name: ifa-label

        name: label

        type: string

      -

        name: ifa-broadcast

        name: broadcast

        type: binary

        display-hint: ipv4

      -

        name: ifa-anycast

        name: anycast

        type: binary

      -

        name: ifa-cacheinfo

        name: cacheinfo

        type: binary

        struct: ifa-cacheinfo

      -

        name: ifa-multicast

        name: multicast

        type: binary

      -

        name: ifa-flags

        name: flags

        type: u32

        enum: ifa-flags

        enum-as-flags: true

      -

        name: ifa-rt-priority

        name: rt-priority

        type: u32

      -

        name: ifa-target-netnsid

        name: target-netnsid

        type: binary

      -

        name: ifa-proto

        name: proto

        type: u8
@@ -137,10 +138,10 @@ operations: 
            - ifa-prefixlen

            - ifa-scope

            - ifa-index

            - ifa-address

            - ifa-label

            - ifa-local

            - ifa-cacheinfo

            - address

            - label

            - local

            - cacheinfo

    -

      name: deladdr

      doc: Remove address
@@ -154,8 +155,8 @@ operations: 
            - ifa-prefixlen

            - ifa-scope

            - ifa-index

            - ifa-address

            - ifa-local

            - address

            - local

    -

      name: getaddr

      doc: Dump address information.
@@ -182,8 +183,8 @@ operations: 
        reply:

          value: 58

          attributes: &mcaddr-attrs

            - ifa-multicast

            - ifa-cacheinfo

            - multicast

            - cacheinfo

      dump:

        request:

          value: 58

tools/testing/selftests/net/rtnetlink.py

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ def dump_mcaddr_check(rtnl: RtnlAddrFamily) -> None: 
    addresses = rtnl.getmulticast({"ifa-family": socket.AF_INET}, dump=True)



    all_host_multicasts = [

        addr for addr in addresses if addr['ifa-multicast'] == IPV4_ALL_HOSTS_MULTICAST

        addr for addr in addresses if addr['multicast'] == IPV4_ALL_HOSTS_MULTICAST

    ]



    ksft_ge(len(all_host_multicasts), 1,