From ed1b4bbee442a2b1a3bb4dfdde331c0c6b2b1a54 Mon Sep 17 00:00:00 2001
From: jjdiaz <jjdiaz@cttc.es>
Date: Tue, 10 Sep 2024 12:06:06 +0200
Subject: [PATCH] Code Cleanup
---
src/dlt/connector/client/DltEventsCollector.py | 2 +-
src/dlt/connector/service/DltConnectorServiceServicerImpl.py | 2 +-
.../connector/service/event_dispatcher/DltEventDispatcher.py | 4 ++--
src/dlt/performance/__main__.py | 2 +-
src/dlt/performance/play_ground/Dlt.py | 2 +-
src/dlt/performance/play_ground/__init__.py | 2 +-
src/interdomain/service/InterdomainServiceServicerImpl.py | 2 +-
.../service/topology_abstractor/DltRecordSender.py | 2 +-
.../service/topology_abstractor/TopologyAbstractor.py | 2 +-
src/load_generator/load_gen/DltTools.py | 2 +-
src/load_generator/load_gen/RequestGenerator.py | 2 +-
src/load_generator/tests/test_dlt_functional.py | 2 +-
12 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/dlt/connector/client/DltEventsCollector.py b/src/dlt/connector/client/DltEventsCollector.py
index 594d84838..e59784a4d 100644
--- a/src/dlt/connector/client/DltEventsCollector.py
+++ b/src/dlt/connector/client/DltEventsCollector.py
@@ -16,7 +16,7 @@ from typing import Callable, Optional
import grpc, logging, queue, threading, time
from common.proto.dlt_gateway_pb2 import DltRecordEvent, DltRecordSubscription
from common.tools.grpc.Tools import grpc_message_to_json_string
-from src.dlt.connector.client.DltGatewayClient import DltGatewayClient
+from dlt.connector.client.DltGatewayClient import DltGatewayClient
LOGGER = logging.getLogger(__name__)
LOGGER.setLevel(logging.DEBUG)
diff --git a/src/dlt/connector/service/DltConnectorServiceServicerImpl.py b/src/dlt/connector/service/DltConnectorServiceServicerImpl.py
index 17cc6fd33..1d4066fc9 100644
--- a/src/dlt/connector/service/DltConnectorServiceServicerImpl.py
+++ b/src/dlt/connector/service/DltConnectorServiceServicerImpl.py
@@ -22,7 +22,7 @@ from common.proto.dlt_connector_pb2_grpc import DltConnectorServiceServicer
from common.proto.dlt_gateway_pb2 import DltRecord, DltRecordId, DltRecordOperationEnum, DltRecordTypeEnum
from common.tools.grpc.Tools import grpc_message_to_json_string
from context.client.ContextClient import ContextClient
-from src.dlt.connector.client.DltGatewayClientAsync import DltGatewayClientAsync
+from dlt.connector.client.DltGatewayClientAsync import DltGatewayClientAsync
from .tools.Checkers import record_exists
LOGGER = logging.getLogger(__name__)
diff --git a/src/dlt/connector/service/event_dispatcher/DltEventDispatcher.py b/src/dlt/connector/service/event_dispatcher/DltEventDispatcher.py
index 4ae6fec54..779bae9c1 100644
--- a/src/dlt/connector/service/event_dispatcher/DltEventDispatcher.py
+++ b/src/dlt/connector/service/event_dispatcher/DltEventDispatcher.py
@@ -26,9 +26,9 @@ from common.tools.grpc.Tools import 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
-from src.dlt.connector.client.DltConnectorClient import DltConnectorClient
+from dlt.connector.client.DltConnectorClient import DltConnectorClient
from dlt.connector.client.DltEventsCollector import DltEventsCollector
-from src.dlt.connector.client.DltGatewayClient import DltGatewayClient
+from dlt.connector.client.DltGatewayClient import DltGatewayClient
from interdomain.client.InterdomainClient import InterdomainClient
LOGGER = logging.getLogger(__name__)
diff --git a/src/dlt/performance/__main__.py b/src/dlt/performance/__main__.py
index 09248c1b1..1d6c41965 100644
--- a/src/dlt/performance/__main__.py
+++ b/src/dlt/performance/__main__.py
@@ -14,7 +14,7 @@
import functools, logging, pathlib, sys, time
from common.proto.dlt_gateway_pb2 import DltRecordEvent
-from src.dlt.connector.client.DltGatewayClient import DltGatewayClient
+from dlt.connector.client.DltGatewayClient import DltGatewayClient
from dlt.connector.client.DltEventsCollector import DltEventsCollector
from .play_ground.Enums import CONTEXT_EVENT_TYPE_TO_ACTION, RECORD_TYPE_TO_ENUM
from .play_ground import PlayGround
diff --git a/src/dlt/performance/play_ground/Dlt.py b/src/dlt/performance/play_ground/Dlt.py
index 5de186c8c..b2c889545 100644
--- a/src/dlt/performance/play_ground/Dlt.py
+++ b/src/dlt/performance/play_ground/Dlt.py
@@ -18,7 +18,7 @@ from common.proto.context_pb2 import Device, Link, Service, Slice
from common.proto.dlt_gateway_pb2 import (
DltRecord, DltRecordId, DltRecordOperationEnum, DltRecordStatus, DltRecordTypeEnum)
from common.tools.grpc.Tools import grpc_message_to_json_string
-from src.dlt.connector.client.DltGatewayClient import DltGatewayClient
+from dlt.connector.client.DltGatewayClient import DltGatewayClient
from .PerfPoint import PerfPoint
DLT_OPERATION_CREATE = DltRecordOperationEnum.DLTRECORDOPERATION_ADD
diff --git a/src/dlt/performance/play_ground/__init__.py b/src/dlt/performance/play_ground/__init__.py
index ce34d30a4..68ad14dee 100644
--- a/src/dlt/performance/play_ground/__init__.py
+++ b/src/dlt/performance/play_ground/__init__.py
@@ -15,7 +15,7 @@
import logging, operator, random
from typing import Dict, Tuple
from common.proto.context_pb2 import Device, Link, Service, Slice
-from src.dlt.connector.client.DltGatewayClient import DltGatewayClient
+from dlt.connector.client.DltGatewayClient import DltGatewayClient
from .Enums import ActionEnum, RecordTypeEnum
from .Dlt import (
DLT_OPERATION_CREATE, DLT_OPERATION_DELETE, DLT_OPERATION_UPDATE,
diff --git a/src/interdomain/service/InterdomainServiceServicerImpl.py b/src/interdomain/service/InterdomainServiceServicerImpl.py
index 146284aaa..bce5e6920 100644
--- a/src/interdomain/service/InterdomainServiceServicerImpl.py
+++ b/src/interdomain/service/InterdomainServiceServicerImpl.py
@@ -34,7 +34,7 @@ from common.tools.object_factory.Device import json_device_id
from common.tools.object_factory.EndPoint import json_endpoint_id
from common.tools.object_factory.Topology import json_topology_id
from context.client.ContextClient import ContextClient
-from src.dlt.connector.client.DltConnectorClientAsync import DltConnectorClientAsync
+from dlt.connector.client.DltConnectorClientAsync import DltConnectorClientAsync
from pathcomp.frontend.client.PathCompClient import PathCompClient
from service.client.ServiceClient import ServiceClient
from slice.client.SliceClient import SliceClient
diff --git a/src/interdomain/service/topology_abstractor/DltRecordSender.py b/src/interdomain/service/topology_abstractor/DltRecordSender.py
index 104f2e378..2dd899be2 100644
--- a/src/interdomain/service/topology_abstractor/DltRecordSender.py
+++ b/src/interdomain/service/topology_abstractor/DltRecordSender.py
@@ -21,7 +21,7 @@ from common.proto.context_pb2 import Device, Link, Service, Slice, TopologyId
from common.proto.dlt_connector_pb2 import DltDeviceId, DltLinkId, DltServiceId, DltSliceId
from common.tools.grpc.Tools import grpc_message_to_json_string
from context.client.ContextClient import ContextClient
-from src.dlt.connector.client.DltConnectorClientAsync import DltConnectorClientAsync
+from dlt.connector.client.DltConnectorClientAsync import DltConnectorClientAsync
LOGGER = logging.getLogger(__name__)
LOGGER.setLevel(logging.DEBUG)
diff --git a/src/interdomain/service/topology_abstractor/TopologyAbstractor.py b/src/interdomain/service/topology_abstractor/TopologyAbstractor.py
index 0dbb332db..2a6ef5e32 100644
--- a/src/interdomain/service/topology_abstractor/TopologyAbstractor.py
+++ b/src/interdomain/service/topology_abstractor/TopologyAbstractor.py
@@ -33,7 +33,7 @@ from common.tools.object_factory.Device import json_device_id
from common.tools.object_factory.Topology import json_topology_id
from context.client.ContextClient import ContextClient
from context.client.EventsCollector import EventsCollector
-from src.dlt.connector.client.DltConnectorClient import DltConnectorClient
+from dlt.connector.client.DltConnectorClient import DltConnectorClient
from .AbstractDevice import AbstractDevice
from .AbstractLink import AbstractLink
from .DltRecordSender import DltRecordSender
diff --git a/src/load_generator/load_gen/DltTools.py b/src/load_generator/load_gen/DltTools.py
index 8321dffa5..0ac7ab3f0 100644
--- a/src/load_generator/load_gen/DltTools.py
+++ b/src/load_generator/load_gen/DltTools.py
@@ -19,7 +19,7 @@ from common.proto.dlt_connector_pb2 import DltDeviceId, DltLinkId, DltServiceId,
from common.tools.grpc.Tools import grpc_message_to_json_string
from common.tools.object_factory.Topology import json_topology_id
from context.client.ContextClient import ContextClient
-from src.dlt.connector.client.DltConnectorClient import DltConnectorClient
+from dlt.connector.client.DltConnectorClient import DltConnectorClient
def explore_entities_to_record(
slice_id : Optional[SliceId] = None, service_id : Optional[ServiceId] = None
diff --git a/src/load_generator/load_gen/RequestGenerator.py b/src/load_generator/load_gen/RequestGenerator.py
index e6e934b68..2a3e89fe0 100644
--- a/src/load_generator/load_gen/RequestGenerator.py
+++ b/src/load_generator/load_gen/RequestGenerator.py
@@ -27,7 +27,7 @@ from common.tools.object_factory.Service import (
from common.tools.object_factory.Slice import json_slice
from common.tools.object_factory.Topology import json_topology_id
from context.client.ContextClient import ContextClient
-from src.dlt.connector.client.DltConnectorClient import DltConnectorClient
+from dlt.connector.client.DltConnectorClient import DltConnectorClient
from load_generator.tools.ListScalarRange import generate_value
from .Constants import ENDPOINT_COMPATIBILITY, RequestType
from .DltTools import record_device_to_dlt, record_link_to_dlt
diff --git a/src/load_generator/tests/test_dlt_functional.py b/src/load_generator/tests/test_dlt_functional.py
index 588200e0c..f3dea3b4a 100644
--- a/src/load_generator/tests/test_dlt_functional.py
+++ b/src/load_generator/tests/test_dlt_functional.py
@@ -19,7 +19,7 @@ from common.proto.dlt_connector_pb2 import DltDeviceId, DltLinkId, DltServiceId,
from common.tools.object_factory.Device import json_device
from common.tools.object_factory.Topology import json_topology_id
from context.client.ContextClient import ContextClient
-from src.dlt.connector.client.DltConnectorClient import DltConnectorClient
+from dlt.connector.client.DltConnectorClient import DltConnectorClient
def record_device_to_dlt(
dlt_connector_client : DltConnectorClient, domain_id : TopologyId, device_id : DeviceId, delete : bool = False
--
GitLab