Commit 6ade08f3 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

SIMAP Connector: 

- Corrected retrieval of Link device/endpoint names in SimapUpdater
parent 7e9a189b

src/simap_connector/service/simap_updater/SimapUpdater.py

+45 −11
Original line number Diff line number Diff line
@@ -194,12 +194,29 @@ class EventDispatcher(BaseEventDispatcher): 
        te_topo = self._simap_client.network(topology_name)

        te_topo.update()



        src_device_name   = self._object_cache.get(CachedEntities.DEVICE,   endpoint_uuids[0][0], auto_retrieve=False)

        src_endpoint_name = self._object_cache.get(CachedEntities.ENDPOINT, *(endpoint_uuids[0]), auto_retrieve=False)

        dst_device_name   = self._object_cache.get(CachedEntities.DEVICE,   endpoint_uuids[1][0], auto_retrieve=False)

        dst_endpoint_name = self._object_cache.get(CachedEntities.ENDPOINT, *(endpoint_uuids[1]), auto_retrieve=False)



        te_topo.link(link_name).create(src_device_name, src_endpoint_name, dst_device_name, dst_endpoint_name)

        src_device   = self._object_cache.get(CachedEntities.DEVICE,   endpoint_uuids[0][0], auto_retrieve=False)

        src_endpoint = self._object_cache.get(CachedEntities.ENDPOINT, *(endpoint_uuids[0]), auto_retrieve=False)

        dst_device   = self._object_cache.get(CachedEntities.DEVICE,   endpoint_uuids[1][0], auto_retrieve=False)

        dst_endpoint = self._object_cache.get(CachedEntities.ENDPOINT, *(endpoint_uuids[1]), auto_retrieve=False)



        try:

            if src_device is None:

                MSG = 'Device({:s}) not found in cache'

                raise Exception(MSG.format(str(endpoint_uuids[0][0])))

            if src_endpoint is None:

                MSG = 'Endpoint({:s}) not found in cache'

                raise Exception(MSG.format(str(endpoint_uuids[0])))

            if dst_device is None:

                MSG = 'Device({:s}) not found in cache'

                raise Exception(MSG.format(str(endpoint_uuids[1][0])))

            if dst_endpoint is None:

                MSG = 'Endpoint({:s}) not found in cache'

                raise Exception(MSG.format(str(endpoint_uuids[1])))

        except Exception as e:

            MSG = '{:s} in Link({:s})'

            raise Exception(MSG.format(str(e), grpc_message_to_json_string(link))) from e



        te_topo.link(link_name).create(src_device.name, src_endpoint.name, dst_device.name, dst_endpoint.name)



        MSG = 'Link Created: {:s}'

        LOGGER.info(MSG.format(grpc_message_to_json_string(link_event)))
@@ -219,13 +236,30 @@ class EventDispatcher(BaseEventDispatcher): 
        te_topo = self._simap_client.network(topology_name)

        te_topo.update()



        src_device_name   = self._object_cache.get(CachedEntities.DEVICE,   endpoint_uuids[0][0], auto_retrieve=False)

        src_endpoint_name = self._object_cache.get(CachedEntities.ENDPOINT, *(endpoint_uuids[0]), auto_retrieve=False)

        dst_device_name   = self._object_cache.get(CachedEntities.DEVICE,   endpoint_uuids[1][0], auto_retrieve=False)

        dst_endpoint_name = self._object_cache.get(CachedEntities.ENDPOINT, *(endpoint_uuids[1]), auto_retrieve=False)

        src_device   = self._object_cache.get(CachedEntities.DEVICE,   endpoint_uuids[0][0], auto_retrieve=False)

        src_endpoint = self._object_cache.get(CachedEntities.ENDPOINT, *(endpoint_uuids[0]), auto_retrieve=False)

        dst_device   = self._object_cache.get(CachedEntities.DEVICE,   endpoint_uuids[1][0], auto_retrieve=False)

        dst_endpoint = self._object_cache.get(CachedEntities.ENDPOINT, *(endpoint_uuids[1]), auto_retrieve=False)



        try:

            if src_device is None:

                MSG = 'Device({:s}) not found in cache'

                raise Exception(MSG.format(str(endpoint_uuids[0][0])))

            if src_endpoint is None:

                MSG = 'Endpoint({:s}) not found in cache'

                raise Exception(MSG.format(str(endpoint_uuids[0])))

            if dst_device is None:

                MSG = 'Device({:s}) not found in cache'

                raise Exception(MSG.format(str(endpoint_uuids[1][0])))

            if dst_endpoint is None:

                MSG = 'Endpoint({:s}) not found in cache'

                raise Exception(MSG.format(str(endpoint_uuids[1])))

        except Exception as e:

            MSG = '{:s} in Link({:s})'

            raise Exception(MSG.format(str(e), grpc_message_to_json_string(link))) from e



        te_link = te_topo.link(link_name)

        te_link.update(src_device_name, src_endpoint_name, dst_device_name, dst_endpoint_name)

        te_link.update(src_device.name, src_endpoint.name, dst_device.name, dst_endpoint.name)



        MSG = 'Link Updated: {:s}'

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