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

Pre-merge code cleanup

parent 86858b16

proto/context.proto

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ enum ServiceTypeEnum { 
  SERVICETYPE_L1NM = 8;

  SERVICETYPE_INT = 9;

  SERVICETYPE_ACL = 10;

  SERVICETYPE_IPLINK = 11;

  SERVICETYPE_IP_LINK = 11;

}



enum ServiceStatusEnum {

src/common/tools/object_factory/Service.py

+2 −2
Original line number Diff line number Diff line
@@ -100,6 +100,6 @@ def json_service_iplink_planned( 
    ):



    return json_service(

        service_uuid, ServiceTypeEnum.SERVICETYPE_IPLINK, context_id=json_context_id(context_uuid),

        service_uuid, ServiceTypeEnum.SERVICETYPE_IP_LINK, context_id=json_context_id(context_uuid),

        status=ServiceStatusEnum.SERVICESTATUS_PLANNED, endpoint_ids=endpoint_ids, constraints=constraints,

        config_rules=config_rules)

src/common/type_checkers/Assertions.py

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ def validate_service_type_enum(message): 
        'SERVICETYPE_TAPI_CONNECTIVITY_SERVICE',

        'SERVICETYPE_TE',

        'SERVICETYPE_E2E',

        'SERVICETYPE_IPLINK'

        'SERVICETYPE_IP_LINK'

        'SERVICETYPE_OPTICAL_CONNECTIVITY',

        'SERVICETYPE_QKD',

    ]

src/context/service/database/Service.py

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ def service_set(db_engine : Engine, messagebroker : MessageBroker, request : Ser 
    service_type = grpc_to_enum__service_type(request.service_type)

    if service_type is None and request.service_type == ServiceTypeEnum.SERVICETYPE_OPTICAL_CONNECTIVITY:

        service_type = "OPTICAL_CONNECTIVITY"

    if service_type is None and request.service_type == ServiceTypeEnum.SERVICETYPE_IPLINK :

    if service_type is None and request.service_type == ServiceTypeEnum.SERVICETYPE_IP_LINK :

        service_type = "IP_LINK"



    service_status = grpc_to_enum__service_status(request.service_status.service_status)

src/context/service/database/models/enums/ServiceType.py

+2 −2
Original line number Diff line number Diff line
@@ -25,15 +25,15 @@ class ORM_ServiceTypeEnum(enum.Enum): 
    UNKNOWN                   = ServiceTypeEnum.SERVICETYPE_UNKNOWN

    L3NM                      = ServiceTypeEnum.SERVICETYPE_L3NM

    L2NM                      = ServiceTypeEnum.SERVICETYPE_L2NM

    L1NM                      = ServiceTypeEnum.SERVICETYPE_L1NM

    TAPI_CONNECTIVITY_SERVICE = ServiceTypeEnum.SERVICETYPE_TAPI_CONNECTIVITY_SERVICE

    TE                        = ServiceTypeEnum.SERVICETYPE_TE

    E2E                       = ServiceTypeEnum.SERVICETYPE_E2E

    OPTICAL_CONNECTIVITY      = ServiceTypeEnum.SERVICETYPE_OPTICAL_CONNECTIVITY

    IP_LINK                   = ServiceTypeEnum.SERVICETYPE_IPLINK

    QKD                       = ServiceTypeEnum.SERVICETYPE_QKD

    L1NM                      = ServiceTypeEnum.SERVICETYPE_L1NM

    INT                       = ServiceTypeEnum.SERVICETYPE_INT

    ACL                       = ServiceTypeEnum.SERVICETYPE_ACL

    IP_LINK                   = ServiceTypeEnum.SERVICETYPE_IP_LINK



grpc_to_enum__service_type = functools.partial(

    grpc_to_enum, ServiceTypeEnum, ORM_ServiceTypeEnum)