Service component:

- Corrected logic for processing a normal service request
- Corrected imports of ServicerImpl

src/service/service/ServiceServiceServicerImpl.py

@@ -12,19 +12,24 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import copy, grpc, json, logging, random, uuid
+import grpc, json, logging, random, uuid
 from typing import Optional
 from common.method_wrappers.Decorator import MetricsPool, safe_and_metered_rpc_method
 from common.method_wrappers.ServiceExceptions import (
     AlreadyExistsException, InvalidArgumentException, NotFoundException, NotImplementedException,
     OperationFailedException)
 from common.proto.context_pb2 import (
-    Connection, Empty, Service, ServiceId, ServiceStatusEnum, ServiceTypeEnum, ConstraintActionEnum)
+    Connection, ConstraintActionEnum, Empty, Service, ServiceId, ServiceStatusEnum,
+    ServiceTypeEnum, TopologyId
+)
 from common.proto.pathcomp_pb2 import PathCompRequest
 from common.proto.e2eorchestrator_pb2 import E2EOrchestratorRequest
 from common.proto.service_pb2_grpc import ServiceServiceServicer
 from common.tools.context_queries.Service import get_service_by_id
 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 common.Constants import DEFAULT_CONTEXT_NAME, DEFAULT_TOPOLOGY_NAME
 from context.client.ContextClient import ContextClient
 from e2e_orchestrator.client.E2EOrchestratorClient import E2EOrchestratorClient
 from pathcomp.frontend.client.PathCompClient import PathCompClient
@@ -33,12 +38,9 @@ from service.client.TEServiceClient import TEServiceClient
 from .service_handler_api.ServiceHandlerFactory import ServiceHandlerFactory
 from .task_scheduler.TaskScheduler import TasksScheduler
 from .tools.GeodesicDistance import gps_distance
-
-from common.tools.object_factory.Context import json_context_id
-from common.tools.object_factory.Topology import json_topology_id
-from common.Constants import DEFAULT_CONTEXT_NAME, DEFAULT_TOPOLOGY_NAME
-from common.proto.context_pb2 import Empty, TopologyId
-from service.service.tools.OpticalTools import add_lightpath, delete_lightpath, adapt_reply, get_device_name_from_uuid, get_optical_band
+from .tools.OpticalTools import (
+    add_lightpath, delete_lightpath, adapt_reply, get_device_name_from_uuid, get_optical_band
+)
 
 
 LOGGER = logging.getLogger(__name__)
@@ -310,19 +312,19 @@ class ServiceServiceServicerImpl(ServiceServiceServicer):
                 pathcomp_request = PathCompRequest()
                 pathcomp_request.services.append(service_with_uuids)    # pylint: disable=no-member
 
-            if num_disjoint_paths is None or num_disjoint_paths in {0, 1} :
-                pathcomp_request.shortest_path.Clear()              # pylint: disable=no-member
-            else:
-                pathcomp_request.k_disjoint_path.num_disjoint = num_disjoint_paths  # pylint: disable=no-member
+                if num_disjoint_paths is None or num_disjoint_paths in {0, 1} :
+                    pathcomp_request.shortest_path.Clear()              # pylint: disable=no-member
+                else:
+                    pathcomp_request.k_disjoint_path.num_disjoint = num_disjoint_paths  # pylint: disable=no-member
 
-            pathcomp = PathCompClient()
-            pathcomp_reply = pathcomp.Compute(pathcomp_request)
-            pathcomp.close()
+                pathcomp = PathCompClient()
+                pathcomp_reply = pathcomp.Compute(pathcomp_request)
+                pathcomp.close()
 
-            # Feed TaskScheduler with this path computation reply. TaskScheduler identifies inter-dependencies among
-            # the services and connections retrieved and produces a schedule of tasks (an ordered list of tasks to be
-            # executed) to implement the requested create/update operation.
-            tasks_scheduler.compose_from_pathcompreply(pathcomp_reply, is_delete=False)
+                # Feed TaskScheduler with this path computation reply. TaskScheduler identifies inter-dependencies among
+                # the services and connections retrieved and produces a schedule of tasks (an ordered list of tasks to be
+                # executed) to implement the requested create/update operation.
+                tasks_scheduler.compose_from_pathcompreply(pathcomp_reply, is_delete=False)
 
         tasks_scheduler.execute_all()
         return service_with_uuids.service_id