Pre-merge code cleanup

src/interdomain/service/__main__.py

@@ -18,7 +18,7 @@ from common.Constants import ServiceNameEnum
 from common.Settings import (
     ENVVAR_SUFIX_SERVICE_HOST, ENVVAR_SUFIX_SERVICE_PORT_GRPC, get_env_var_name, get_log_level, get_metrics_port,
     wait_for_environment_variables)
-from interdomain.Config import is_dlt_enabled
+from interdomain.Config import is_dlt_enabled, is_topology_abstractor_enabled
 from .topology_abstractor.TopologyAbstractor import TopologyAbstractor
 from .topology_abstractor.DltRecorder import DLTRecorder
 from .InterdomainService import InterdomainService

src/interdomain/service/topology_abstractor/DltRecordSender.py

@@ -77,29 +77,29 @@ class DltRecordSender:
                 device_id = dlt_record.device_id
                 if self.dlt_connector_client is None: continue
                 dlt_device_id = DltDeviceId()
-                dlt_device_id.topology_id.CopyFrom(topology_id)  # pylint: disable=no-member
-                dlt_device_id.device_id.CopyFrom(device_id)      # pylint: disable=no-member
+                dlt_device_id.topology_id.CopyFrom(topology_id)     # pylint: disable=no-member
+                dlt_device_id.device_id.CopyFrom(device_id)         # pylint: disable=no-member
                 tasks.append(self.dlt_connector_client.RecordDevice(dlt_device_id))
             elif isinstance(dlt_record, Link):
                 link_id = dlt_record.link_id
                 if self.dlt_connector_client is None: continue
                 dlt_link_id = DltLinkId()
-                dlt_link_id.topology_id.CopyFrom(topology_id)    # pylint: disable=no-member
-                dlt_link_id.link_id.CopyFrom(link_id)            # pylint: disable=no-member
+                dlt_link_id.topology_id.CopyFrom(topology_id)       # pylint: disable=no-member
+                dlt_link_id.link_id.CopyFrom(link_id)               # pylint: disable=no-member
                 tasks.append(self.dlt_connector_client.RecordLink(dlt_link_id))
             elif isinstance(dlt_record, Service):
                 service_id = dlt_record.service_id
                 if self.dlt_connector_client is None: continue
                 dlt_service_id = DltServiceId()
-                dlt_service_id.topology_id.CopyFrom(topology_id) # pylint: disable=no-member
-                dlt_service_id.service_id.CopyFrom(service_id)   # pylint: disable=no-member
+                dlt_service_id.topology_id.CopyFrom(topology_id)    # pylint: disable=no-member
+                dlt_service_id.service_id.CopyFrom(service_id)      # pylint: disable=no-member
                 tasks.append(self.dlt_connector_client.RecordService(dlt_service_id))
             elif isinstance(dlt_record, Slice):
                 slice_id = dlt_record.slice_id
                 if self.dlt_connector_client is None: continue
                 dlt_slice_id = DltSliceId()
-                dlt_slice_id.topology_id.CopyFrom(topology_id)   # pylint: disable=no-member
-                dlt_slice_id.slice_id.CopyFrom(slice_id)         # pylint: disable=no-member
+                dlt_slice_id.topology_id.CopyFrom(topology_id)      # pylint: disable=no-member
+                dlt_slice_id.slice_id.CopyFrom(slice_id)            # pylint: disable=no-member
                 tasks.append(self.dlt_connector_client.RecordSlice(dlt_slice_id))
             else:
                 LOGGER.error(f'Unsupported Record({str(dlt_record)})')