Commit 94059e57 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Pre-merge code cleanup

parent 2d441fa7

src/device/service/drivers/__init__.py

+10 −9
Original line number Diff line number Diff line
@@ -85,16 +85,17 @@ DRIVERS.append( 
    ]))



if LOAD_ALL_DEVICE_DRIVERS:

    #from .openconfig.OpenConfigDriver import OpenConfigDriver # pylint: disable=wrong-import-position

    #DRIVERS.append(

    #    (OpenConfigDriver, [

    #        {

    #            # Real Packet Router, specifying OpenConfig Driver => use OpenConfigDriver

    #            FilterFieldEnum.DEVICE_TYPE: DeviceTypeEnum.PACKET_ROUTER,

    #            FilterFieldEnum.DRIVER     : DeviceDriverEnum.DEVICEDRIVER_OPENCONFIG,

    #        }

    #    ]))

    from .openconfig.OpenConfigDriver import OpenConfigDriver # pylint: disable=wrong-import-position

    DRIVERS.append(

        (OpenConfigDriver, [

            {

                # Real Packet Router, specifying OpenConfig Driver => use OpenConfigDriver

                FilterFieldEnum.DEVICE_TYPE: DeviceTypeEnum.PACKET_ROUTER,

                FilterFieldEnum.DRIVER     : DeviceDriverEnum.DEVICEDRIVER_OPENCONFIG,

            }

        ]))



if LOAD_ALL_DEVICE_DRIVERS:

    from .gnmi_openconfig.GnmiOpenConfigDriver import GnmiOpenConfigDriver # pylint: disable=wrong-import-position

    DRIVERS.append(

        (GnmiOpenConfigDriver, [

src/device/service/drivers/openconfig/OpenConfigDriver.py

+14 −15
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ from device.service.driver_api.AnyTreeTools import TreeNode, get_subnode, set_su 
from .templates import ALL_RESOURCE_KEYS, EMPTY_CONFIG, compose_config, get_filter, parse, cli_compose_config

from .RetryDecorator import retry





DEBUG_MODE = False

logging.getLogger('ncclient.manager').setLevel(logging.DEBUG if DEBUG_MODE else logging.WARNING)

logging.getLogger('ncclient.transport.ssh').setLevel(logging.DEBUG if DEBUG_MODE else logging.WARNING)
@@ -202,7 +201,7 @@ def do_sampling( 
    except: # pylint: disable=bare-except

        logger.exception('Error retrieving samples')



def edit_config(

def edit_config(                                                                                                            # edit the configuration of openconfig devices

    netconf_handler : NetconfSessionHandler, logger : logging.Logger, resources : List[Tuple[str, Any]], delete=False,

    commit_per_rule=False, target='running', default_operation='merge', test_option=None, error_option=None,

    format='xml' # pylint: disable=redefined-builtin