Commit 3de33cb0 authored by Pablo Armingol's avatar Pablo Armingol
Browse files

code clean up

parent 358c7f50

src/device/service/Tools.py

+1 −2
Original line number Diff line number Diff line
@@ -555,7 +555,6 @@ def extract_resources(config : dict, device : Device) -> list[list[dict], dict]: 


    return [resources, conditions]





def update_sap_id(device: Device, sap_id: int) -> None:



    found = False

src/device/service/driver_api/DriverInstanceCache.py

+1 −6
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ from .DriverFactory import DriverFactory 
from .Exceptions import DriverInstanceCacheTerminatedException

from .FilterFields import FilterFieldEnum, get_device_driver_filter_fields





LOGGER = logging.getLogger(__name__)



class DriverInstanceCache:
@@ -95,7 +94,6 @@ def get_driver(driver_instance_cache : DriverInstanceCache, device : Device) -> 
    port     = connect_rules.get('port',     '0')

    settings = connect_rules.get('settings', '{}')





    try:

        settings = json.loads(settings)

    except ValueError as e:
@@ -104,9 +102,6 @@ def get_driver(driver_instance_cache : DriverInstanceCache, device : Device) -> 
            extra_details='_connect/settings Config Rules provided cannot be decoded as JSON dictionary.'

        ) from e









    driver : _Driver = driver_instance_cache.get(

        device_uuid, filter_fields=driver_filter_fields, address=address, port=port, settings=settings)

    driver.Connect()

src/device/service/drivers/__init__.py

+0 −11
Original line number Diff line number Diff line
@@ -217,14 +217,3 @@ if LOAD_ALL_DEVICE_DRIVERS: 
                FilterFieldEnum.DRIVER     : DeviceDriverEnum.DEVICEDRIVER_QKD,

            }

        ]))
 


if LOAD_ALL_DEVICE_DRIVERS:

    from .pon_driver.PON_Driver import PON_Driver # pylint: disable=wrong-import-position

    DRIVERS.append(

        (PON_Driver, [

            {

                # Close enough, it does optical switching

                FilterFieldEnum.DEVICE_TYPE: DeviceTypeEnum.PON_CONTROLLER,

                FilterFieldEnum.DRIVER     : DeviceDriverEnum.DEVICEDRIVER_PON,

            }

        ]))
 
 No newline at end of file

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

+2 −14
Original line number Diff line number Diff line
@@ -33,8 +33,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)
@@ -42,8 +40,6 @@ logging.getLogger('apscheduler.executors.default').setLevel(logging.INFO if DEBU 
logging.getLogger('apscheduler.scheduler').setLevel(logging.INFO if DEBUG_MODE else logging.ERROR)

logging.getLogger('monitoring-client').setLevel(logging.INFO if DEBUG_MODE else logging.ERROR)



LOGGER = logging.getLogger(__name__)



RE_GET_ENDPOINT_FROM_INTERFACE_KEY = re.compile(r'.*interface\[([^\]]+)\].*')

RE_GET_ENDPOINT_FROM_INTERFACE_XPATH = re.compile(r".*interface\[oci\:name\='([^\]]+)'\].*")
@@ -78,7 +74,6 @@ class NetconfSessionHandler: 
        self.__manager_params   = settings.get('manager_params', {})

        self.__nc_params        = settings.get('nc_params', {})

        self.__message_renderer = settings.get('message_renderer','jinja')

        LOGGER.info(f"[OpenConfigDriver] Settings recibidos: {settings}")

        self.__manager : Manager   = None

        self.__candidate_supported = False
@@ -287,7 +282,7 @@ class OpenConfigDriver(_Driver): 
        self.__out_samples = queue.Queue()

        self.__netconf_handler = NetconfSessionHandler(self.address, self.port, **(self.settings))

        self.__samples_cache = SamplesCache(self.__netconf_handler, self.__logger)

        self.sap_id = 0  # Inicializar sap_id a cero

        self.sap_id = 0  # Initialize sap_id to zero



    def Connect(self) -> bool:

        with self.__lock:
@@ -335,13 +330,6 @@ class OpenConfigDriver(_Driver): 
                    self.__logger.exception(MSG.format(str_resource_name, str(resource_key)))

                    results.append((resource_key, e)) # if validation fails, store the exception

        self.sap_id += 1

        #LOGGER.info("RESULTS---------------")

        #LOGGER.info(results)

        #results.append(('/device/sap_id', {'sap_id': f'SAP_{self.sap_id}'}))



        #LOGGER.info("RESULTS---------------")

        #LOGGER.info(results)

        #OpenConfigDriver.sap_id += 1

        return results



    @metered_subclass_method(METRICS_POOL)

src/device/service/drivers/openconfig/templates/EndPoints.py

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ import logging, lxml.etree as ET 
from typing import Any, Dict, List, Tuple

from common.proto.kpi_sample_types_pb2 import KpiSampleType

from .Namespace import NAMESPACES

from .Tools import add_value_from_collection, add_value_from_tag#, get_sap_id

from .Tools import add_value_from_collection, add_value_from_tag



LOGGER = logging.getLogger(__name__)