Commit 0d7152ad authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Interdomain Component: 

- Added missing return statements in TopologyAbstractor
- Improved logging of TopologyAbstractor
parent bd0abb4f

src/interdomain/service/topology_abstractor/TopologyAbstractor.py

+8 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ from common.tools.context_queries.Context import create_context, get_context 
from common.tools.context_queries.Device import get_device, get_devices_in_topology

from common.tools.context_queries.Link import get_link

from common.tools.context_queries.Topology import create_missing_topologies, get_topology_details

from common.tools.grpc.Tools import grpc_message_to_json_string

from common.tools.grpc.Tools import grpc_message_to_json, grpc_message_to_json_string

from common.tools.object_factory.Context import json_context_id

from common.tools.object_factory.Topology import json_topology_id

from context.client.ContextClient import ContextClient
@@ -251,7 +251,11 @@ class TopologyAbstractor(threading.Thread): 
            interdomain_device.name : interdomain_device

            for interdomain_device in interdomain_devices

        }

        LOGGER.info('[_infer_abstract_links] interdomain_devices={:s}'.format(str(interdomain_devices)))

        str_interdomain_devices = {

            interdomain_device_name : grpc_message_to_json(interdomain_device)

            for interdomain_device_name,interdomain_device in interdomain_devices

        }

        LOGGER.info('[_infer_abstract_links] interdomain_devices={:s}'.format(str(str_interdomain_devices)))



        for endpoint in device.device_endpoints:

            LOGGER.info('[_infer_abstract_links] endpoint={:s}'.format(grpc_message_to_json_string(endpoint)))
@@ -349,6 +353,7 @@ class TopologyAbstractor(threading.Thread): 
            MSG = 'Ignoring ({:s}/{:s})({:s}/{:s}) TopologyEvent({:s})... Wrong context name'

            args = context_uuid, context_name, topology_uuid, topology_name, grpc_message_to_json_string(event)

            LOGGER.warning(MSG.format(*args))

            return



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

        LOGGER.info('  topology_name={:s}'.format(str(topology_name)))
@@ -357,6 +362,7 @@ class TopologyAbstractor(threading.Thread): 
            MSG = 'Ignoring ({:s}/{:s})({:s}/{:s}) TopologyEvent({:s})... Not a domain topology'

            args = context_uuid, context_name, topology_uuid, topology_name, grpc_message_to_json_string(event)

            LOGGER.warning(MSG.format(*args))

            return



        abstract_topology_id = TopologyId(**json_topology_id(topology_name, context_id=ADMIN_CONTEXT_ID))

        self._get_or_create_abstract_device(