Commit 203a3268 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

PathComp component: 

- Fixed service type selection for sub-service computation
parent 6b9c15f9

src/pathcomp/frontend/service/algorithms/tools/ServiceTypes.py

+5 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ OPTICAL_DEVICE_TYPES = { 
SERVICE_TYPE_L2NM     = {ServiceTypeEnum.SERVICETYPE_L2NM}

SERVICE_TYPE_L3NM     = {ServiceTypeEnum.SERVICETYPE_L3NM}

SERVICE_TYPE_LXNM     = {ServiceTypeEnum.SERVICETYPE_L3NM, ServiceTypeEnum.SERVICETYPE_L2NM}

SERVICE_TYPE_OPTICAL  = {ServiceTypeEnum.SERVICETYPE_OPTICAL_CONNECTIVITY}

SERVICE_TYPE_TAPI     = {ServiceTypeEnum.SERVICETYPE_TAPI_CONNECTIVITY_SERVICE}

SERVICE_TYPE_IP_LINK  = {ServiceTypeEnum.SERVICETYPE_IP_LINK}

SERVICE_TYPE_IPOWDM   = {ServiceTypeEnum.SERVICETYPE_IPOWDM}
@@ -69,6 +70,10 @@ def get_service_type( 
        prv_service_type in SERVICE_TYPE_IP_LINK

    ): return prv_service_type

    if device_type in L2_DEVICE_TYPES: return ServiceTypeEnum.SERVICETYPE_L2NM

    if (

        device_type in OPTICAL_DEVICE_TYPES and

        prv_service_type in SERVICE_TYPE_OPTICAL

    ): return prv_service_type

    if device_type in OPTICAL_DEVICE_TYPES: return ServiceTypeEnum.SERVICETYPE_TAPI_CONNECTIVITY_SERVICE

    if device_type in NETWORK_DEVICE_TYPES: return prv_service_type

    if (