Commit 3ae303ca authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Service component: 

- IETF L2VPN Service Handler: corrected endpoint conditions and selection
- TAPI Service Handler: corrected endpoint conditions and selection
- TAPI-XR Service Handler: separated from TAPI to prevent collisions in endpoint selection and config message composition
parent d15ce17e

src/service/service/service_handlers/__init__.py

+10 −3
Original line number Diff line number Diff line
@@ -15,13 +15,14 @@ 
from common.proto.context_pb2 import DeviceDriverEnum, ServiceTypeEnum

from ..service_handler_api.FilterFields import FilterFieldEnum

from .l2nm_emulated.L2NMEmulatedServiceHandler import L2NMEmulatedServiceHandler

from .l2nm_ietfl2vpn.L2NM_IETFL2VPN_ServiceHandler import L2NM_IETFL2VPN_ServiceHandler

from .l2nm_openconfig.L2NMOpenConfigServiceHandler import L2NMOpenConfigServiceHandler

from .l3nm_emulated.L3NMEmulatedServiceHandler import L3NMEmulatedServiceHandler

from .l3nm_openconfig.L3NMOpenConfigServiceHandler import L3NMOpenConfigServiceHandler

from .microwave.MicrowaveServiceHandler import MicrowaveServiceHandler

from .p4.p4_service_handler import P4ServiceHandler

from .tapi_tapi.TapiServiceHandler import TapiServiceHandler

from .microwave.MicrowaveServiceHandler import MicrowaveServiceHandler

from .l2nm_ietfl2vpn.L2NM_IETFL2VPN_ServiceHandler import L2NM_IETFL2VPN_ServiceHandler

from .tapi_xr.TapiXrServiceHandler import TapiXrServiceHandler



SERVICE_HANDLERS = [

    (L2NMEmulatedServiceHandler, [
@@ -51,7 +52,13 @@ SERVICE_HANDLERS = [ 
    (TapiServiceHandler, [

        {

            FilterFieldEnum.SERVICE_TYPE  : ServiceTypeEnum.SERVICETYPE_TAPI_CONNECTIVITY_SERVICE,

            FilterFieldEnum.DEVICE_DRIVER : [DeviceDriverEnum.DEVICEDRIVER_TRANSPORT_API, DeviceDriverEnum.DEVICEDRIVER_XR],

            FilterFieldEnum.DEVICE_DRIVER : [DeviceDriverEnum.DEVICEDRIVER_TRANSPORT_API],

        }

    ]),

    (TapiXrServiceHandler, [

        {

            FilterFieldEnum.SERVICE_TYPE  : ServiceTypeEnum.SERVICETYPE_TAPI_CONNECTIVITY_SERVICE,

            FilterFieldEnum.DEVICE_DRIVER : [DeviceDriverEnum.DEVICEDRIVER_XR],

        }

    ]),

    (MicrowaveServiceHandler, [

src/service/service/service_handlers/l2nm_ietfl2vpn/L2NM_IETFL2VPN_ServiceHandler.py

+3 −3
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ class L2NM_IETFL2VPN_ServiceHandler(_ServiceHandler): 
    ) -> List[Union[bool, Exception]]:



        chk_type('endpoints', endpoints, list)

        if len(endpoints) != 2: return []

        if len(endpoints) < 2: return []



        service_uuid = self.__service.service_id.service_uuid.uuid

        settings = self.__settings_handler.get('/settings')
@@ -57,7 +57,7 @@ class L2NM_IETFL2VPN_ServiceHandler(_ServiceHandler): 
            src_endpoint = get_endpoint_matching(src_device, src_endpoint_uuid)

            src_controller = self.__task_executor.get_device_controller(src_device)



            dst_device_uuid, dst_endpoint_uuid = get_device_endpoint_uuids(endpoints[1])

            dst_device_uuid, dst_endpoint_uuid = get_device_endpoint_uuids(endpoints[-1])

            dst_device = self.__task_executor.get_device(DeviceId(**json_device_id(dst_device_uuid)))

            dst_endpoint = get_endpoint_matching(dst_device, dst_endpoint_uuid)

            dst_controller = self.__task_executor.get_device_controller(dst_device)
@@ -91,7 +91,7 @@ class L2NM_IETFL2VPN_ServiceHandler(_ServiceHandler): 
    ) -> List[Union[bool, Exception]]:



        chk_type('endpoints', endpoints, list)

        if len(endpoints) != 2: return []

        if len(endpoints) < 2: return []



        service_uuid = self.__service.service_id.service_uuid.uuid

src/service/service/service_handlers/tapi_tapi/TapiServiceHandler.py

+6 −8
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ from common.proto.context_pb2 import ConfigRule, DeviceId, Service 
from common.tools.object_factory.ConfigRule import json_config_rule_delete, json_config_rule_set

from common.tools.object_factory.Device import json_device_id

from common.type_checkers.Checkers import chk_type

from service.service.service_handler_api.Tools import get_device_endpoint_uuids, get_endpoint_matching

from service.service.service_handler_api.Tools import get_device_endpoint_uuids

from service.service.service_handler_api._ServiceHandler import _ServiceHandler

from service.service.service_handler_api.SettingsHandler import SettingsHandler

from service.service.task_scheduler.TaskExecutor import TaskExecutor
@@ -42,7 +42,7 @@ class TapiServiceHandler(_ServiceHandler): 
    ) -> List[Union[bool, Exception]]:



        chk_type('endpoints', endpoints, list)

        if len(endpoints) != 2: return []

        if len(endpoints) < 2: return []



        service_uuid = self.__service.service_id.service_uuid.uuid

        settings = self.__settings_handler.get('/settings')
@@ -57,13 +57,11 @@ class TapiServiceHandler(_ServiceHandler): 
        try:

            src_device_uuid, src_endpoint_uuid = get_device_endpoint_uuids(endpoints[0])

            src_device = self.__task_executor.get_device(DeviceId(**json_device_id(src_device_uuid)))

            src_endpoint = get_endpoint_matching(src_device, src_endpoint_uuid)

            src_controller = self.__task_executor.get_device_controller(src_device)

            if src_controller is None: src_controller = src_device



            dst_device_uuid, dst_endpoint_uuid = get_device_endpoint_uuids(endpoints[1])

            dst_device_uuid, dst_endpoint_uuid = get_device_endpoint_uuids(endpoints[-1])

            dst_device = self.__task_executor.get_device(DeviceId(**json_device_id(dst_device_uuid)))

            dst_endpoint = get_endpoint_matching(dst_device, dst_endpoint_uuid)

            dst_controller = self.__task_executor.get_device_controller(dst_device)

            if dst_controller is None: dst_controller = dst_device
@@ -73,8 +71,8 @@ class TapiServiceHandler(_ServiceHandler): 


            json_config_rule = json_config_rule_set('/services/service[{:s}]'.format(service_uuid), {

                'uuid'                    : service_uuid,

                'input_sip'               : src_endpoint.name,

                'output_sip'              : dst_endpoint.name,

                'input_sip_uuid'          : src_endpoint_uuid,

                'output_sip_uuid'         : dst_endpoint_uuid,

                'capacity_unit'           : capacity_unit,

                'capacity_value'          : capacity_value,

                'layer_protocol_name'     : layer_proto_name,
@@ -97,7 +95,7 @@ class TapiServiceHandler(_ServiceHandler): 
    ) -> List[Union[bool, Exception]]:



        chk_type('endpoints', endpoints, list)

        if len(endpoints) != 2: return []

        if len(endpoints) < 2: return []



        service_uuid = self.__service.service_id.service_uuid.uuid

src/service/service/service_handlers/tapi_xr/TapiXrServiceHandler.py

0 → 100644
+176 −0
Original line number Diff line number Diff line 
# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



import json, logging

from typing import Any, Dict, List, Optional, Tuple, Union

from common.method_wrappers.Decorator import MetricsPool, metered_subclass_method

from common.proto.context_pb2 import ConfigRule, DeviceId, Service

from common.tools.object_factory.ConfigRule import json_config_rule_delete, json_config_rule_set

from common.tools.object_factory.Device import json_device_id

from common.type_checkers.Checkers import chk_type

from service.service.service_handler_api.Tools import get_device_endpoint_uuids, get_endpoint_matching

from service.service.service_handler_api._ServiceHandler import _ServiceHandler

from service.service.service_handler_api.SettingsHandler import SettingsHandler

from service.service.task_scheduler.TaskExecutor import TaskExecutor



LOGGER = logging.getLogger(__name__)



METRICS_POOL = MetricsPool('Service', 'Handler', labels={'handler': 'tapi_xr'})



class TapiXrServiceHandler(_ServiceHandler):

    def __init__(   # pylint: disable=super-init-not-called

        self, service : Service, task_executor : TaskExecutor, **settings

    ) -> None:

        self.__service = service

        self.__task_executor = task_executor

        self.__settings_handler = SettingsHandler(service.service_config, **settings)



    @metered_subclass_method(METRICS_POOL)

    def SetEndpoint(

        self, endpoints : List[Tuple[str, str, Optional[str]]], connection_uuid : Optional[str] = None

    ) -> List[Union[bool, Exception]]:



        chk_type('endpoints', endpoints, list)

        if len(endpoints) != 4: return []



        service_uuid = self.__service.service_id.service_uuid.uuid

        settings = self.__settings_handler.get('/settings')

        json_settings : Dict = {} if settings is None else settings.value

        capacity_value   = json_settings.get('capacity_value', 50.0)

        capacity_unit    = json_settings.get('capacity_unit',  'GHz')



        results = []

        try:

            src_device_uuid, src_endpoint_uuid = get_device_endpoint_uuids(endpoints[1])

            src_device = self.__task_executor.get_device(DeviceId(**json_device_id(src_device_uuid)))

            src_endpoint = get_endpoint_matching(src_device, src_endpoint_uuid)

            src_controller = self.__task_executor.get_device_controller(src_device)

            if src_controller is None: src_controller = src_device



            dst_device_uuid, dst_endpoint_uuid = get_device_endpoint_uuids(endpoints[2])

            dst_device = self.__task_executor.get_device(DeviceId(**json_device_id(dst_device_uuid)))

            dst_endpoint = get_endpoint_matching(dst_device, dst_endpoint_uuid)

            dst_controller = self.__task_executor.get_device_controller(dst_device)

            if dst_controller is None: dst_controller = dst_device



            if src_controller.device_id.device_uuid.uuid != dst_controller.device_id.device_uuid.uuid:

                raise Exception('Different Src-Dst devices not supported by now')

            controller = src_controller



            json_config_rule = json_config_rule_set('/services/service[{:s}]'.format(service_uuid), {

                'uuid'           : service_uuid,

                'input_sip_name' : '|'.join([src_device.name, src_endpoint.name]),

                'output_sip_name': '|'.join([dst_device.name, dst_endpoint.name]),

                'capacity_unit'  : capacity_unit,

                'capacity_value' : capacity_value,

            })



            del controller.device_config.config_rules[:]

            controller.device_config.config_rules.append(ConfigRule(**json_config_rule))

            self.__task_executor.configure_device(controller)

            results.append(True)

        except Exception as e: # pylint: disable=broad-except

            LOGGER.exception('Unable to SetEndpoint for Service({:s})'.format(str(service_uuid)))

            results.append(e)



        return results



    @metered_subclass_method(METRICS_POOL)

    def DeleteEndpoint(

        self, endpoints : List[Tuple[str, str, Optional[str]]], connection_uuid : Optional[str] = None

    ) -> List[Union[bool, Exception]]:



        chk_type('endpoints', endpoints, list)

        if len(endpoints) < 2: return []



        service_uuid = self.__service.service_id.service_uuid.uuid



        results = []

        try:

            src_device_uuid, _ = get_device_endpoint_uuids(endpoints[0])

            src_device = self.__task_executor.get_device(DeviceId(**json_device_id(src_device_uuid)))

            src_controller = self.__task_executor.get_device_controller(src_device)

            if src_controller is None: src_controller = src_device



            dst_device_uuid, _ = get_device_endpoint_uuids(endpoints[1])

            dst_device = self.__task_executor.get_device(DeviceId(**json_device_id(dst_device_uuid)))

            dst_controller = self.__task_executor.get_device_controller(dst_device)

            if dst_controller is None: dst_controller = dst_device



            if src_controller.device_id.device_uuid.uuid != dst_controller.device_id.device_uuid.uuid:

                raise Exception('Different Src-Dst devices not supported by now')

            controller = src_controller



            json_config_rule = json_config_rule_delete('/services/service[{:s}]'.format(service_uuid), {

                'uuid': service_uuid

            })

            del controller.device_config.config_rules[:]

            controller.device_config.config_rules.append(ConfigRule(**json_config_rule))

            self.__task_executor.configure_device(controller)

            results.append(True)

        except Exception as e: # pylint: disable=broad-except

            LOGGER.exception('Unable to DeleteEndpoint for Service({:s})'.format(str(service_uuid)))

            results.append(e)



        return results



    @metered_subclass_method(METRICS_POOL)

    def SetConstraint(self, constraints : List[Tuple[str, Any]]) -> List[Union[bool, Exception]]:

        chk_type('constraints', constraints, list)

        if len(constraints) == 0: return []



        msg = '[SetConstraint] Method not implemented. Constraints({:s}) are being ignored.'

        LOGGER.warning(msg.format(str(constraints)))

        return [True for _ in range(len(constraints))]



    @metered_subclass_method(METRICS_POOL)

    def DeleteConstraint(self, constraints : List[Tuple[str, Any]]) -> List[Union[bool, Exception]]:

        chk_type('constraints', constraints, list)

        if len(constraints) == 0: return []



        msg = '[DeleteConstraint] Method not implemented. Constraints({:s}) are being ignored.'

        LOGGER.warning(msg.format(str(constraints)))

        return [True for _ in range(len(constraints))]



    @metered_subclass_method(METRICS_POOL)

    def SetConfig(self, resources : List[Tuple[str, Any]]) -> List[Union[bool, Exception]]:

        chk_type('resources', resources, list)

        if len(resources) == 0: return []



        results = []

        for resource in resources:

            try:

                resource_value = json.loads(resource[1])

                self.__settings_handler.set(resource[0], resource_value)

                results.append(True)

            except Exception as e: # pylint: disable=broad-except

                LOGGER.exception('Unable to SetConfig({:s})'.format(str(resource)))

                results.append(e)



        return results



    @metered_subclass_method(METRICS_POOL)

    def DeleteConfig(self, resources : List[Tuple[str, Any]]) -> List[Union[bool, Exception]]:

        chk_type('resources', resources, list)

        if len(resources) == 0: return []



        results = []

        for resource in resources:

            try:

                self.__settings_handler.delete(resource[0])

            except Exception as e: # pylint: disable=broad-except

                LOGGER.exception('Unable to DeleteConfig({:s})'.format(str(resource)))

                results.append(e)



        return results

src/service/service/service_handlers/tapi_xr/__init__.py

0 → 100644
+14 −0
Original line number Diff line number Diff line 
# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.