Commit 0bca73aa authored by Pablo Armingol's avatar Pablo Armingol
Browse files

code cleanup

parent ded005de

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

+0 −7
Original line number Original line Diff line number Diff line
@@ -53,7 +53,6 @@ MAX_RETRIES = 15 
DELAY_FUNCTION = delay_exponential(initial=0.01, increment=2.0, maximum=5.0)

DELAY_FUNCTION = delay_exponential(initial=0.01, increment=2.0, maximum=5.0)

RETRY_DECORATOR = retry(max_retries=MAX_RETRIES, delay_function=DELAY_FUNCTION, prepare_method_name='connect')

RETRY_DECORATOR = retry(max_retries=MAX_RETRIES, delay_function=DELAY_FUNCTION, prepare_method_name='connect')





LOGGER = logging.getLogger(__name__)





class NetconfSessionHandler:

class NetconfSessionHandler:

    def __init__(self, address : str, port : int, **settings) -> None:

    def __init__(self, address : str, port : int, **settings) -> None:
@@ -112,14 +111,8 @@ class NetconfSessionHandler: 
    def get(self, filter=None, with_defaults=None): # pylint: disable=redefined-builtin

    def get(self, filter=None, with_defaults=None): # pylint: disable=redefined-builtin

        with self.__lock:

        with self.__lock:

            if self.__vendor == 'JUNIPER'and not 'component' in str(filter):

            if self.__vendor == 'JUNIPER'and not 'component' in str(filter):

                LOGGER.info('filtros = {:s}'.format(str(filter)))

                data = self.__manager.get_config(source="running", filter=filter, with_defaults=with_defaults)

                LOGGER.info('resultado = {:s}'.format(str(data)))

                return self.__manager.get_config(source="running", filter=filter, with_defaults=with_defaults)

                return self.__manager.get_config(source="running", filter=filter, with_defaults=with_defaults)

            else:

            else:

                LOGGER.info('filtros2 = {:s}'.format(str(filter)))

                data = self.__manager.get(filter=filter, with_defaults=with_defaults)

                LOGGER.info('resultado2 = {:s}'.format(str(data)))

                return self.__manager.get(filter=filter, with_defaults=with_defaults)

                return self.__manager.get(filter=filter, with_defaults=with_defaults)





    @RETRY_DECORATOR

    @RETRY_DECORATOR