Merge branch... (a2b6f2fe) · Commits · TFS / controller

.gitlab-ci.yml

+1 −0

Original line number	Diff line number	Diff line
		@@ -58,6 +58,7 @@ include:
		- local: '/src/ztp_server/.gitlab-ci.yml'
		- local: '/src/osm_client/.gitlab-ci.yml'
		- local: '/src/simap_connector/.gitlab-ci.yml'
		- local: '/src/pluggables/.gitlab-ci.yml'

		# This should be last one: end-to-end integration tests
		- local: '/src/tests/.gitlab-ci.yml'

+1 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ spec:
		- name: ALLOW_EXPLICIT_ADD_LINK_TO_TOPOLOGY
		value: "FALSE"
		- name: CRDB_DATABASE
		value: "tfs_ip_context"
		value: "tfs_context"
		envFrom:
		- secretRef:
		name: crdb-data

+31 −8

Original line number	Diff line number	Diff line
		@@ -19,8 +19,10 @@ package context;
		import "google/protobuf/any.proto";

		import "acl.proto";
		import "ipowdm.proto";
		import "ip_link.proto";
		import "kpi_sample_types.proto";
		import "tapi_lsp.proto";

		service ContextService {
		rpc ListContextIds (Empty ) returns ( ContextIdList ) {}
		@@ -354,6 +356,8 @@ enum ServiceTypeEnum {
		SERVICETYPE_INT = 9;
		SERVICETYPE_ACL = 10;
		SERVICETYPE_IP_LINK = 11;
		SERVICETYPE_TAPI_LSP = 12;
		SERVICETYPE_IPOWDM = 13;
		}

		enum ServiceStatusEnum {
		@@ -562,9 +566,26 @@ message ConfigRule_Custom {
		string resource_value = 2;
		}

		enum AclDirectionEnum {
		ACLDIRECTION_BOTH = 0;
		ACLDIRECTION_INGRESS = 1;
		ACLDIRECTION_EGRESS = 2;
		}

		message ConfigRule_ACL {
		EndPointId endpoint_id = 1;
		acl.AclRuleSet rule_set = 2;
		AclDirectionEnum direction = 2;
		acl.AclRuleSet rule_set = 3;
		}

		message ConfigRule_IPOWDM {
		EndPointId endpoint_id = 1;
		ipowdm.IpowdmRuleSet rule_set = 2;
		}

		message ConfigRule_TAPI_LSP {
		EndPointId endpoint_id = 1;
		repeated tapi_lsp.TapiLspRuleSet rule_set = 2;
		}

		message ConfigRule_IP_LINK {
		@@ -578,6 +599,8 @@ message ConfigRule {
		ConfigRule_Custom custom = 2;
		ConfigRule_ACL acl = 3;
		ConfigRule_IP_LINK ip_link = 4;
		ConfigRule_TAPI_LSP tapi_lsp = 5;
		ConfigRule_IPOWDM ipowdm = 6;
		}
		}

0 → 100644

+54 −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;

		message RuleEndpoint {
		string uuid = 1;
		string ip_address = 2;
		string ip_mask = 3;
		int32 vlan_id = 4;
		}

		message DigitalSubCarrierId {
		int32 sub_carrier_id = 1;
		string active = 2;
		}

		message DigitalSubCarriersGroup {
		int32 digital_sub_carriers_group_id = 1;
		repeated DigitalSubCarrierId digital_sub_carrier_id = 4;
		}

		message Component {
		string name = 1;
		float frequency = 2;
		float target_output_power = 3;
		int32 operational_mode = 4;
		repeated DigitalSubCarriersGroup digital_sub_carriers_group = 5;
		string operation = 6;
		}

		message Transceiver {
		repeated Component components = 1;
		}

		message IpowdmRuleSet {
		repeated RuleEndpoint src = 1;
		repeated RuleEndpoint dst = 2;
		int32 bw = 3;
		string uuid = 4;
		Transceiver transceiver = 5;
		}

0 → 100644

+36 −0

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 input_sip = 1;
		string output_sip = 2;
		string uuid = 3;
		string bw = 4;
		string tenant_uuid = 5;
		string layer_protocol_name = 6;
		string layer_protocol_qualifier = 7;
		string lower_frequency_mhz = 8;
		string upper_frequency_mhz = 9;
		repeated string link_uuid_path = 10;
		string granularity = 11;
		string grid_type = 12;
		string direction = 13;
		string capacity_unit = 14;
		string capacity_value = 15;
		string route_objective_function = 16;
		string url = 17;
		}