Commit 9cd46b0d authored by Pablo Armingol's avatar Pablo Armingol
Browse files

Update proto file license information, refactor DeviceTypes and ServiceTypes,...

Update proto file license information, refactor DeviceTypes and ServiceTypes, and clean up unused settings in ComposeConfigRules
parent f753ad64
Loading
Loading
Loading
Loading
+14 −0
Original line number Diff line number Diff line
// Copyright 2022-2025 ETSI 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 ipowdm;

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ class DeviceTypeEnum(Enum):
    OPEN_ROADM                      = 'openroadm'
    MORPHEUS                        = 'morpheus'
    OPENFLOW_RYU_CONTROLLER         = 'openflow-ryu-controller'
    IPOWDM_ROUTER                   = 'ipowdm-router'

    # ETSI TeraFlowSDN controller
    TERAFLOWSDN_CONTROLLER          = 'teraflowsdn'
+1 −10
Original line number Diff line number Diff line
@@ -54,15 +54,6 @@ TAPI_SETTINGS_FIELD_DEFAULTS = {
    'direction'       : 'UNIDIRECTIONAL',
}

TAPI_LSP_SETINGS_FIELD_DEFAULTS = {
    'lsp_type'        : 'TAPI_LSP_TYPE_UNI',
    'lsp_direction'   : 'TAPI_LSP_DIRECTION_UNI',
    'lsp_bandwidth'   : 50.0,
    'lsp_bandwidth_unit': 'GHz',
    'lsp_layer_protocol_name': 'PHOTONIC_MEDIA',
    'lsp_layer_protocol_qualifier': 'tapi-photonic-media:PHOTONIC_LAYER_QUALIFIER_NMC',
}

IPLINK_SETTINGS_FIELD_DEFAULTS = {
    'mtu'               : 1450,
}
@@ -250,7 +241,7 @@ def compose_ipowdm_config_rules(main_service_config_rules : List, subservice_con
        compose_config_rules(main_service_config_rules, subservice_config_rules, rule_name, defaults)

def compose_tapi_lsp_config_rules(main_service_config_rules : List, subservice_config_rules : List) -> None:
    CONFIG_RULES: List[Tuple[str, dict]] = [(SETTINGS_RULE_NAME, TAPI_LSP_SETINGS_FIELD_DEFAULTS)]
    CONFIG_RULES: List[Tuple[str, dict]] = [(SETTINGS_RULE_NAME, TAPI_SETTINGS_FIELD_DEFAULTS)]
    for rule_name, defaults in CONFIG_RULES:
        compose_config_rules(main_service_config_rules, subservice_config_rules, rule_name, defaults)

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ PACKET_DEVICE_TYPES = {
    DeviceTypeEnum.PACKET_POP,
    DeviceTypeEnum.PACKET_ROUTER, DeviceTypeEnum.EMULATED_PACKET_ROUTER,
    DeviceTypeEnum.PACKET_SWITCH, DeviceTypeEnum.EMULATED_PACKET_SWITCH,
    DeviceTypeEnum.IPOWDM_ROUTER
}

L2_DEVICE_TYPES = {

tfs/lib64

deleted120000 → 0
+0 −1
Original line number Diff line number Diff line
lib
 No newline at end of file
+1 −1

File changed.

Contains only whitespace changes.

+4 −4

File changed.

Contains only whitespace changes.

Loading