Commit 06094d3d authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Simap Connector: 

- Fixed discovery of supporting links
- Fixed stop of synthesizer workers
parent 4d623809

src/simap_connector/service/Tools.py

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ class SupportingLink: 


def discover_supporting_links(restconf_client : RestConfClient, xpath_filter : str) -> List[SupportingLink]:

    xpath_filter_2 = xpath_filter.replace('/simap-telemetry:simap-telemetry', '')

    xpath_filter_2 = xpath_filter.replace('/simap-telemetry', '')

    xpath_filter_2 = xpath_filter_2.replace('/simap-telemetry', '')

    xpath_data = restconf_client.get(xpath_filter_2)

    if not xpath_data:

        MSG = 'Resource({:s} => {:s}) not found in SIMAP Server'

src/simap_connector/service/simap_updater/SimapUpdater.py

+3 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ from common.tools.grpc.Tools import grpc_message_to_json_string 
from context.client.ContextClient import ContextClient

from simap_connector.service.simap_updater.MockSimaps import delete_mock_simap, set_mock_simap

from simap_connector.service.telemetry.worker.data.Resources import ResourceLink, Resources, SyntheticSampler

from simap_connector.service.telemetry.worker._Worker import WorkerTypeEnum

from simap_connector.service.telemetry.TelemetryPool import TelemetryPool

from .ObjectCache import CachedEntities, ObjectCache

from .SimapClient import SimapClient
@@ -428,7 +429,7 @@ class EventDispatcher(BaseEventDispatcher): 
        self._object_cache.delete(CachedEntities.LINK, link_name)



        worker_name = '{:s}:{:s}'.format(topology_name, link_name)

        self._telemetry_pool.stop_synthesizer(worker_name)

        self._telemetry_pool.stop_worker(WorkerTypeEnum.SYNTHESIZER, worker_name)



        MSG = 'Link Removed: {:s}'

        LOGGER.info(MSG.format(grpc_message_to_json_string(link_event)))
@@ -630,7 +631,7 @@ class EventDispatcher(BaseEventDispatcher): 
        #self._object_cache.delete(CachedEntities.SERVICE, service_uuid)

        #self._object_cache.delete(CachedEntities.SERVICE, service_name)



        self._telemetry_pool.stop_synthesizer(domain_name)

        self._telemetry_pool.stop_worker(WorkerTypeEnum.SYNTHESIZER, domain_name)



        MSG = 'Logical Link Removed for Service: {:s}'

        LOGGER.info(MSG.format(grpc_message_to_json_string(service_event)))