Commit 68ab8ba9 authored by David Wei's avatar David Wei Committed by Jakub Kicinski
Browse files

selftests/net: Export Netlink class via lib.py 



Making rtnl newlink calls requires constants defined in Netlink class in
pyynl. Export it.

Signed-off-by: default avatarDavid Wei <dw@davidwei.uk>
Link: https://patch.msgid.link/20260305181803.2912736-3-dw@davidwei.uk


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

tools/testing/selftests/drivers/net/lib/py/__init__.py

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ try: 
    # Import one by one to avoid pylint false positives

    from net.lib.py import NetNS, NetNSEnter, NetdevSimDev

    from net.lib.py import EthtoolFamily, NetdevFamily, NetshaperFamily, \

        NlError, RtnlFamily, DevlinkFamily, PSPFamily

        NlError, RtnlFamily, DevlinkFamily, PSPFamily, Netlink

    from net.lib.py import CmdExitFailure

    from net.lib.py import bkg, cmd, bpftool, bpftrace, defer, ethtool, \

        fd_read_timeout, ip, rand_port, rand_ports, wait_port_listen, wait_file
@@ -31,7 +31,7 @@ try: 


    __all__ = ["NetNS", "NetNSEnter", "NetdevSimDev",

               "EthtoolFamily", "NetdevFamily", "NetshaperFamily",

               "NlError", "RtnlFamily", "DevlinkFamily", "PSPFamily",

               "NlError", "RtnlFamily", "DevlinkFamily", "PSPFamily", "Netlink",

               "CmdExitFailure",

               "bkg", "cmd", "bpftool", "bpftrace", "defer", "ethtool",

               "fd_read_timeout", "ip", "rand_port", "rand_ports",

tools/testing/selftests/net/lib/py/__init__.py

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ from .utils import CmdExitFailure, fd_read_timeout, cmd, bkg, defer, \ 
    bpftool, ip, ethtool, bpftrace, rand_port, rand_ports, wait_port_listen, \

    wait_file, tool

from .ynl import NlError, YnlFamily, EthtoolFamily, NetdevFamily, RtnlFamily, RtnlAddrFamily

from .ynl import NetshaperFamily, DevlinkFamily, PSPFamily

from .ynl import NetshaperFamily, DevlinkFamily, PSPFamily, Netlink



__all__ = ["KSRC",

           "KsftFailEx", "KsftSkipEx", "KsftXfailEx", "ksft_pr", "ksft_eq",
@@ -31,4 +31,4 @@ __all__ = ["KSRC", 
           "NetdevSim", "NetdevSimDev",

           "NetshaperFamily", "DevlinkFamily", "PSPFamily", "NlError",

           "YnlFamily", "EthtoolFamily", "NetdevFamily", "RtnlFamily",

           "RtnlAddrFamily"]
 
           "RtnlAddrFamily", "Netlink"]

tools/testing/selftests/net/lib/py/ynl.py

+8 −2
Original line number Diff line number Diff line
@@ -13,20 +13,26 @@ try: 
        SPEC_PATH = KSFT_DIR / "net/lib/specs"



        sys.path.append(tools_full_path.as_posix())

        from net.lib.ynl.pyynl.lib import YnlFamily, NlError

        from net.lib.ynl.pyynl.lib import YnlFamily, NlError, Netlink

    else:

        # Running in tree

        tools_full_path = KSRC / "tools"

        SPEC_PATH = KSRC / "Documentation/netlink/specs"



        sys.path.append(tools_full_path.as_posix())

        from net.ynl.pyynl.lib import YnlFamily, NlError

        from net.ynl.pyynl.lib import YnlFamily, NlError, Netlink

except ModuleNotFoundError as e:

    ksft_pr("Failed importing `ynl` library from kernel sources")

    ksft_pr(str(e))

    ktap_result(True, comment="SKIP")

    sys.exit(4)



__all__ = [

    "NlError", "Netlink", "YnlFamily", "SPEC_PATH",

    "EthtoolFamily", "RtnlFamily", "RtnlAddrFamily",

    "NetdevFamily", "NetshaperFamily", "DevlinkFamily", "PSPFamily",

]



#

# Wrapper classes, loading the right specs

# Set schema='' to avoid jsonschema validation, it's slow