Commit 5a98709d authored by Pablo Armingol's avatar Pablo Armingol
Browse files

Merge branch 'develop' of https://labs.etsi.org/rep/tfs/controller into... 

Merge branch 'develop' of https://labs.etsi.org/rep/tfs/controller into feat/418-tid-fix-init-device-driver-custom-ipowdm
parents 5f131ffa c5d518d2

src/nbi/service/tfs_api/Resources.py

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ from flask.json import jsonify 
from flask_restful import Resource, request

from werkzeug.exceptions import BadRequest

from common.Constants import ServiceNameEnum

from common.proto.context_pb2 import Empty, LinkTypeEnum, Service, ServiceTypeEnum, ConfigActionEnum, ConfigRule

from common.proto.context_pb2 import Empty, LinkTypeEnum, Service as GrpcService, ServiceTypeEnum, ConfigActionEnum, ConfigRule

from common.Settings import get_service_host, get_service_port_grpc

from common.proto.e2eorchestrator_pb2 import E2EOrchestratorRequest

from common.tools.descriptor.Tools import format_device_custom_config_rules, format_service_custom_config_rules
@@ -602,7 +602,7 @@ class E2epathcomp(Resource): 


        try:

            # Construct a Service protobuf to encapsulate the intent for the E2E Orchestrator

            service = Service()

            service = GrpcService()

            service.service_id.service_uuid.uuid = "e2e-optical-service"

            service.service_id.context_id.context_uuid.uuid = "admin"

            service.service_type = ServiceTypeEnum.SERVICETYPE_OPTICAL_CONNECTIVITY