Commit b6268dc8 authored by Jean Rebiffe's avatar Jean Rebiffe
Browse files

Merge branch 'huaweiyang_workaround_namespace' into 'main' 

Adding device_params= {"name": "huaweiyang"} workaround for huawei namespace issue on <rpc-reply>

See merge request sdn/mwt/mwt-sdn-plugtests-4-materials!6
parents a9a505b6 0cf20cb0

lncc.py

+7 −2
Original line number Original line Diff line number Diff line
@@ -6,7 +6,7 @@ Emulates a real SDN Controller by pushing NETCONF operations, ... 
License

License

=======

=======

Software Name : Lightweight NETCONF Controller (LNCC)

Software Name : Lightweight NETCONF Controller (LNCC)

Version: 0.3.0

Version: 0.3.2

SPDX-FileCopyrightText: Copyright (c) 2022 Jean Rebiffé, Orange Innovation Networks

SPDX-FileCopyrightText: Copyright (c) 2022 Jean Rebiffé, Orange Innovation Networks

SPDX-License-Identifier: BSD-3-Clause

SPDX-License-Identifier: BSD-3-Clause

SPDX-FileType: SOURCE

SPDX-FileType: SOURCE
@@ -21,7 +21,7 @@ Software description: Emulates a real SDN Controller by pushing NETCONF 
operations, ...

operations, ...

"""

"""





__version__ = "0.3.1"

__version__ = "0.3.2"

__author__ = "Jean Rebiffe, Orange Innovation Networks, 2022"

__author__ = "Jean Rebiffe, Orange Innovation Networks, 2022"





import argparse

import argparse
@@ -349,6 +349,9 @@ class LnccCli(cmd2.Cmd): 
            params["password"] = args.password

            params["password"] = args.password

        if args.port:

        if args.port:

            params["port"] = args.port

            params["port"] = args.port

        # Workaround for namespace issue on <reply xmlnc:nc="...">

        if args.device_params == "huaweiyang":

            params["device_params"] = {"name": "huaweiyang"}





        n_e = NetworkElement(args.name, params)

        n_e = NetworkElement(args.name, params)

        self.nes[args.name] = n_e

        self.nes[args.name] = n_e
@@ -429,6 +432,8 @@ class LnccCli(cmd2.Cmd): 
    _ne_add_parser.add_argument("--username")

    _ne_add_parser.add_argument("--username")

    _ne_add_parser.add_argument("--password")

    _ne_add_parser.add_argument("--password")

    _ne_add_parser.add_argument("--port")

    _ne_add_parser.add_argument("--port")

    # Workaround for namespace issue

    _ne_add_parser.add_argument("--device_params", choices=["huaweiyang"])

    _ne_add_parser.set_defaults(func=ne_add)

    _ne_add_parser.set_defaults(func=ne_add)





    _ne_delete_parser = _ne_subparsers.add_parser("delete")

    _ne_delete_parser = _ne_subparsers.add_parser("delete")