Commit 1768d8a7 authored by Donald Hunter's avatar Donald Hunter Committed by Jakub Kicinski
Browse files

tools/net/ynl: Add support for create flags 



Add support for using NLM_F_REPLACE, _EXCL, _CREATE and _APPEND flags
in requests.

Signed-off-by: default avatarDonald Hunter <donald.hunter@gmail.com>
Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Link: https://lore.kernel.org/r/20230825122756.7603-10-donald.hunter@gmail.com


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

tools/net/ynl/cli.py

+10 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ import json 
import pprint

import time



from lib import YnlFamily

from lib import YnlFamily, Netlink





def main():
@@ -19,6 +19,14 @@ def main(): 
    parser.add_argument('--dump', dest='dump', type=str)

    parser.add_argument('--sleep', dest='sleep', type=int)

    parser.add_argument('--subscribe', dest='ntf', type=str)

    parser.add_argument('--replace', dest='flags', action='append_const',

                        const=Netlink.NLM_F_REPLACE)

    parser.add_argument('--excl', dest='flags', action='append_const',

                        const=Netlink.NLM_F_EXCL)

    parser.add_argument('--create', dest='flags', action='append_const',

                        const=Netlink.NLM_F_CREATE)

    parser.add_argument('--append', dest='flags', action='append_const',

                        const=Netlink.NLM_F_APPEND)

    args = parser.parse_args()



    if args.no_schema:
@@ -37,7 +45,7 @@ def main(): 
        time.sleep(args.sleep)



    if args.do:

        reply = ynl.do(args.do, attrs)

        reply = ynl.do(args.do, attrs, args.flags)

        pprint.PrettyPrinter().pprint(reply)

    if args.dump:

        reply = ynl.dump(args.dump, attrs)

tools/net/ynl/lib/__init__.py

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


from .nlspec import SpecAttr, SpecAttrSet, SpecEnumEntry, SpecEnumSet, \

    SpecFamily, SpecOperation

from .ynl import YnlFamily

from .ynl import YnlFamily, Netlink



__all__ = ["SpecAttr", "SpecAttrSet", "SpecEnumEntry", "SpecEnumSet",

           "SpecFamily", "SpecOperation", "YnlFamily"]
 
           "SpecFamily", "SpecOperation", "YnlFamily", "Netlink"]

tools/net/ynl/lib/ynl.py

+10 −4
Original line number Diff line number Diff line
@@ -35,6 +35,10 @@ class Netlink: 
    NLM_F_ACK = 4

    NLM_F_ROOT = 0x100

    NLM_F_MATCH = 0x200



    NLM_F_REPLACE = 0x100

    NLM_F_EXCL = 0x200

    NLM_F_CREATE = 0x400

    NLM_F_APPEND = 0x800



    NLM_F_CAPPED = 0x100
@@ -654,10 +658,12 @@ class YnlFamily(SpecFamily): 


      return op['do']['request']['attributes'].copy()



    def _op(self, method, vals, dump=False):

    def _op(self, method, vals, flags, dump=False):

        op = self.ops[method]



        nl_flags = Netlink.NLM_F_REQUEST | Netlink.NLM_F_ACK

        for flag in flags or []:

            nl_flags |= flag

        if dump:

            nl_flags |= Netlink.NLM_F_DUMP
@@ -716,8 +722,8 @@ class YnlFamily(SpecFamily): 
            return rsp[0]

        return rsp



    def do(self, method, vals):

        return self._op(method, vals)

    def do(self, method, vals, flags):

        return self._op(method, vals, flags)



    def dump(self, method, vals):

        return self._op(method, vals, dump=True)
 
        return self._op(method, vals, [], dump=True)