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

Merge branch... 

Merge branch 'feat/388-cttc-fix-ofc22-and-ecoc22-tests-to-check-if-services-are-active' into 'develop'

Resolve "(CTTC) Fix OFC22 and ECOC22 tests to check if services are active"

See merge request !449
parents 14e5486e 3ca32cde

hackfest/mock_osm/WimconnectorIETFL2VPN.py

+3 −3
Original line number Original line Diff line number Diff line
@@ -167,7 +167,7 @@ class WimconnectorIETFL2VPN(SdnConnectorBase): 
        """

        """

        SETTINGS = {    # min_endpoints, max_endpoints, vpn_service_type

        SETTINGS = {    # min_endpoints, max_endpoints, vpn_service_type

            'ELINE': (2,    2, 'vpws'), # Virtual Private Wire Service

            'ELINE': (2,    2, 'vpws'), # Virtual Private Wire Service

            'ELAN' : (2, None, 'vpls'), # Virtual Private LAN  Service

            'ELAN' : (2, None, 'bgp-vpls'), # Virtual Private LAN  Service

        }

        }

        settings = SETTINGS.get(service_type)

        settings = SETTINGS.get(service_type)

        if settings is None: raise NotImplementedError('Unsupported service_type({:s})'.format(str(service_type)))

        if settings is None: raise NotImplementedError('Unsupported service_type({:s})'.format(str(service_type)))
@@ -291,12 +291,12 @@ class WimconnectorIETFL2VPN(SdnConnectorBase): 
            if access_priority is not None:

            if access_priority is not None:

                availability = {}

                availability = {}

                availability["access-priority"] = access_priority

                availability["access-priority"] = access_priority

                availability["single-active"] = [None]

                availability["single-active"] = None

                site_network_access["availability"] = availability

                site_network_access["availability"] = availability





                constraint = {}

                constraint = {}

                constraint['constraint-type'] = 'end-to-end-diverse'

                constraint['constraint-type'] = 'end-to-end-diverse'

                constraint['target'] = {'all-other-accesses': [None]}

                constraint['target'] = {'all-other-accesses': None}





                access_diversity = {}

                access_diversity = {}

                access_diversity['constraints'] = {'constraint': []}

                access_diversity['constraints'] = {'constraint': []}

src/device/service/drivers/ietf_l2vpn/WimconnectorIETFL2VPN.py

+3 −3
Original line number Original line Diff line number Diff line
@@ -165,7 +165,7 @@ class WimconnectorIETFL2VPN(SdnConnectorBase): 
        """

        """

        SETTINGS = {    # min_endpoints, max_endpoints, vpn_service_type

        SETTINGS = {    # min_endpoints, max_endpoints, vpn_service_type

            'ELINE': (2,    2, 'vpws'), # Virtual Private Wire Service

            'ELINE': (2,    2, 'vpws'), # Virtual Private Wire Service

            'ELAN' : (2, None, 'vpls'), # Virtual Private LAN  Service

            'ELAN' : (2, None, 'bgp-vpls'), # Virtual Private LAN  Service

        }

        }

        settings = SETTINGS.get(service_type)

        settings = SETTINGS.get(service_type)

        if settings is None: raise NotImplementedError('Unsupported service_type({:s})'.format(str(service_type)))

        if settings is None: raise NotImplementedError('Unsupported service_type({:s})'.format(str(service_type)))
@@ -288,12 +288,12 @@ class WimconnectorIETFL2VPN(SdnConnectorBase): 
            if access_priority is not None:

            if access_priority is not None:

                availability = {}

                availability = {}

                availability["access-priority"] = access_priority

                availability["access-priority"] = access_priority

                availability["single-active"] = [None]

                availability["single-active"] = None

                site_network_access["availability"] = availability

                site_network_access["availability"] = availability





                constraint = {}

                constraint = {}

                constraint['constraint-type'] = 'end-to-end-diverse'

                constraint['constraint-type'] = 'end-to-end-diverse'

                constraint['target'] = {'all-other-accesses': [None]}

                constraint['target'] = {'all-other-accesses': None}





                access_diversity = {}

                access_diversity = {}

                access_diversity['constraints'] = {'constraint': []}

                access_diversity['constraints'] = {'constraint': []}

src/nbi/service/ietf_l2vpn/Handlers.py

+2 −3
Original line number Original line Diff line number Diff line
@@ -183,15 +183,14 @@ def process_site_network_access( 
            constraint['constraint-type']:([

            constraint['constraint-type']:([

                target[0]

                target[0]

                for target in constraint['target'].items()

                for target in constraint['target'].items()

                if len(target[1]) == 1

            ][0], raise_if_differs)

            ][0], raise_if_differs)

            for constraint in diversity_constraints

            for constraint in diversity_constraints

        }

        }





        network_access_availability = network_access.get('availability', {})

        network_access_availability = network_access.get('availability', {})

        access_priority : Optional[int] = network_access_availability.get('access-priority')

        access_priority : Optional[int] = network_access_availability.get('access-priority')

        single_active   : bool = len(network_access_availability.get('single-active', [])) > 0

        single_active   : bool = 'single-active' in network_access_availability

        all_active      : bool = len(network_access_availability.get('all-active', [])) > 0

        all_active      : bool = 'all-active' in network_access_availability





        context_client = ContextClient()

        context_client = ContextClient()

        service = get_service_by_uuid(

        service = get_service_by_uuid(

src/nbi/service/ietf_l2vpn/yang/ietf-l2vpn-svc@2018-10-09.yang

+6 −0
Original line number Original line Diff line number Diff line
@@ -971,6 +971,12 @@ module ietf-l2vpn-svc { 
      "Identity for having sites connected using the same bearer.";

      "Identity for having sites connected using the same bearer.";

  }

  }





  identity end-to-end-diverse {

    base placement-diversity;

    description

      "CUSTOM TERAFLOWSDN - Identity for having full end-to-end diverse connections.";

  }



  identity tagged-inf-type {

  identity tagged-inf-type {

    description

    description

      "Identity for the tagged interface type.";

      "Identity for the tagged interface type.";

src/service/service/service_handlers/__init__.py

+4 −1
Original line number Original line Diff line number Diff line
@@ -106,7 +106,10 @@ SERVICE_HANDLERS = [ 
    (TapiServiceHandler, [

    (TapiServiceHandler, [

        {

        {

            FilterFieldEnum.SERVICE_TYPE  : ServiceTypeEnum.SERVICETYPE_TAPI_CONNECTIVITY_SERVICE,

            FilterFieldEnum.SERVICE_TYPE  : ServiceTypeEnum.SERVICETYPE_TAPI_CONNECTIVITY_SERVICE,

            FilterFieldEnum.DEVICE_DRIVER : [DeviceDriverEnum.DEVICEDRIVER_TRANSPORT_API],

            FilterFieldEnum.DEVICE_DRIVER : [

                DeviceDriverEnum.DEVICEDRIVER_TRANSPORT_API,

                DeviceDriverEnum.DEVICEDRIVER_UNDEFINED,

            ],

        }

        }

    ]),

    ]),

    (TapiXrServiceHandler, [

    (TapiXrServiceHandler, [