Commit ff70a457 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Service component: 

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

src/service/service/ServiceServiceServicerImpl.py

+21 −19
Original line number Diff line number Diff line
@@ -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__)