Commit a0226a17 authored by Pablo Armingol's avatar Pablo Armingol
Browse files

Remove TAPI LSP support and related configurations 

- Deleted TAPI LSP service handlers and configuration rules from context.proto and related files.
- Removed references to TAPI LSP in Service.py, Assertions.py, ConfigRule.py, Service.py, and other modules.
- Cleaned up service handler factory and settings handler to eliminate TAPI LSP handling.
- Removed associated JSON templates and tools related to TAPI LSP.
- Updated service type enumerations and validation functions to exclude TAPI LSP.
parent 3812e8c4

proto/context.proto

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

  SERVICETYPE_INT = 9;

  SERVICETYPE_ACL = 10;

  SERVICETYPE_TAPI_LSP = 11;

  SERVICETYPE_IPOWDM = 12;

}
@@ -553,17 +552,13 @@ message ConfigRule_IPOWDM { 
  ipowdm.IpowdmRuleSet rule_set = 2;

}



message ConfigRule_TAPI_LSP {

  EndPointId endpoint_id           = 1;

  tapi_lsp.TapiLspRuleSet rule_set = 2;

}





message ConfigRule {

  ConfigActionEnum action = 1;

  oneof config_rule {

    ConfigRule_Custom custom = 2;

    ConfigRule_ACL acl = 3;

    ConfigRule_TAPI_LSP tapi_lsp = 4;

    ConfigRule_IPOWDM ipowdm = 5;

  }

}

proto/tapi_lsp.proto

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
// 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.

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



syntax = "proto3";

package tapi_lsp;



message TapiLspRuleSet {

  string  src  = 1;

  string  dst  = 2;

  string  uuid = 3;

  string  bw   = 4;

  string  direction = 5;

  string  layer_protocol_name = 6;

  string  layer_protocol_qualifier = 7;

  string  lower_frequency_mhz = 8;

  string  upper_frequency_mhz = 9;

}
 
 No newline at end of file

src/common/tools/object_factory/Service.py

+0 −10
Original line number Diff line number Diff line
@@ -74,16 +74,6 @@ def json_service_l3nm_planned( 
        status=ServiceStatusEnum.SERVICESTATUS_PLANNED, endpoint_ids=endpoint_ids, constraints=constraints,

        config_rules=config_rules)



def json_service_tapi_planned(

        service_uuid : str, endpoint_ids : List[Dict] = [], constraints : List[Dict] = [],

        config_rules : List[Dict] = [], context_uuid : str = DEFAULT_CONTEXT_NAME

    ):



    return json_service(

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

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

        config_rules=config_rules)



def json_service_p4_planned(

        service_uuid : str, endpoint_ids : List[Dict] = [], constraints : List[Dict] = [],

        config_rules : List[Dict] = [], context_uuid : str = DEFAULT_CONTEXT_NAME

src/common/type_checkers/Assertions.py

+1 −3
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ def validate_service_type_enum(message): 
        'SERVICETYPE_OPTICAL_CONNECTIVITY',

        'SERVICETYPE_QKD',

        'SERVICETYPE_IPOWDM',

        'SERVICETYPE_TAPI_LSP',

    ]



def validate_service_state_enum(message):
@@ -148,8 +147,7 @@ def validate_uuid(message, allow_empty=False): 
CONFIG_RULE_TYPES = {

    'custom',

    'acl',

    'ipowdm',

    'tapi_lsp'

    'ipowdm'

}

def validate_config_rule(message):

    assert isinstance(message, dict)

src/context/service/database/ConfigRule.py

+0 −3
Original line number Diff line number Diff line
@@ -74,9 +74,6 @@ def compose_config_rules_data( 
        elif kind == ConfigRuleKindEnum.IPOWDM:

            _, _, endpoint_uuid = endpoint_get_uuid(config_rule.ipowdm.endpoint_id, allow_random=False)

            configrule_name = '{:s}:{:s}:{:s}'.format(parent_kind, kind.value, endpoint_uuid)

        elif kind == ConfigRuleKindEnum.TAPI_LSP:

            _, _, endpoint_uuid = endpoint_get_uuid(config_rule.tapi_lsp.endpoint_id, allow_random=False)

            configrule_name = '{:s}:{:s}:{:s}'.format(parent_kind, kind.value, endpoint_uuid)

        else:

            MSG = 'Name for ConfigRule({:s}) cannot be inferred '+\

                  '(device_uuid={:s}, service_uuid={:s}, slice_uuid={:s})'