Commit 4e6eea65 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'develop' of ssh://gifrerenom_labs.etsi.org/tfs/controller into tmp-integration

parents a2174620 7499455d

proto/context.proto

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

  SERVICETYPE_INT = 9;

  SERVICETYPE_ACL = 10;

  SERVICETYPE_IPLINK = 11;

  SERVICETYPE_IP_LINK = 11;

}



enum ServiceStatusEnum {

proto/ip_link.proto

+1 −1
Original line number Diff line number Diff line 
// Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)

// Copyright 2022-2025 ETSI OSG/SDG TeraFlowSDN (TFS) (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.

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/Link.py

+6 −6
Original line number Diff line number Diff line
@@ -79,12 +79,12 @@ def link_set(db_engine : Engine, messagebroker : MessageBroker, request : Link) 
    related_topologies : List[Dict] = list()



    # By default, always add link to default Context/Topology

    # _,topology_uuid = topology_get_uuid(TopologyId(), allow_random=False, allow_default=True)

    # related_topologies.append({

    #     'topology_uuid': topology_uuid,

    #     'link_uuid'    : link_uuid,

    # })

    # topology_uuids.add(topology_uuid)

    _,topology_uuid = topology_get_uuid(TopologyId(), allow_random=False, allow_default=True)

    related_topologies.append({

        'topology_uuid': topology_uuid,

        'link_uuid'    : link_uuid,

    })

    topology_uuids.add(topology_uuid)



    link_endpoints_data : List[Dict] = list()

    for i,endpoint_id in enumerate(request.link_endpoint_ids):