diff --git a/deploy/all.sh b/deploy/all.sh
index 99058b96e10648d1f7816a5d57652a74e14a97d2..4b644cf1170ea0a2ea044dab278465d3ccd77f37 100755
--- a/deploy/all.sh
+++ b/deploy/all.sh
@@ -27,10 +27,10 @@ export TFS_REGISTRY_IMAGES=${TFS_REGISTRY_IMAGES:-"http://localhost:32000/tfs/"}
# If not already set, set the list of components, separated by spaces, you want to build images for, and deploy.
# By default, only basic components are deployed
-export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device pathcomp service slice nbi webui load_generator kpi_manager"}
+export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device pathcomp service slice nbi webui load_generator"}
# Uncomment to activate Monitoring
-#export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring"
+#export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring kpi_manager"
# Uncomment to activate BGP-LS Speaker
#export TFS_COMPONENTS="${TFS_COMPONENTS} bgpls_speaker"
diff --git a/deploy/exporters.sh b/deploy/exporters.sh
deleted file mode 100644
index 6c56f25c9a3e51dbb4e38d71b149960d6c3108fe..0000000000000000000000000000000000000000
--- a/deploy/exporters.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
-
-########################################################################################################################
-# Read deployment settings
-########################################################################################################################
-
-# If not already set, set the namespace where Apache Kafka will be deployed.
-export KFK_NAMESPACE=${KFK_NAMESPACE:-"exporters"}
-
-# Add instruction of exporter automatic deployment here
\ No newline at end of file
diff --git a/deploy/kafka.sh b/deploy/kafka.sh
index 4be5ef6b220a2059d642e550856580d833ab6e0e..4a91bfc9e657d1b8a6a548b9c0a81a2f8a0b45e0 100755
--- a/deploy/kafka.sh
+++ b/deploy/kafka.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
diff --git a/deploy/tfs.sh b/deploy/tfs.sh
index f85e9bbc94445e3d247d2240ed628a1705575a2e..8565077c390534a197e75b194e2ed3e22605c6ac 100755
--- a/deploy/tfs.sh
+++ b/deploy/tfs.sh
@@ -27,7 +27,7 @@ export TFS_REGISTRY_IMAGES=${TFS_REGISTRY_IMAGES:-"http://localhost:32000/tfs/"}
# If not already set, set the list of components, separated by spaces, you want to build images for, and deploy.
# By default, only basic components are deployed
-export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device ztp monitoring pathcomp service slice nbi webui load_generator kpi_manager"}
+export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device pathcomp service slice nbi webui load_generator"}
# If not already set, set the tag you want to use for your images.
export TFS_IMAGE_TAG=${TFS_IMAGE_TAG:-"dev"}
diff --git a/manifests/kafka/01-zookeeper.yaml b/manifests/kafka/01-zookeeper.yaml
index 0f5ade5d945f7be2ede9d5ec0480a755bd7795c2..c0e87ae0c6f12ed56702220f9e15fbe90b3b9c31 100644
--- a/manifests/kafka/01-zookeeper.yaml
+++ b/manifests/kafka/01-zookeeper.yaml
@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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.
+
apiVersion: v1
kind: Service
metadata:
diff --git a/manifests/kafka/02-kafka.yaml b/manifests/kafka/02-kafka.yaml
index 8a2b51724f4ca3687cc695bd85a99d14368b9279..8e4562e6eabec34bf3b87912310479bd98022aeb 100644
--- a/manifests/kafka/02-kafka.yaml
+++ b/manifests/kafka/02-kafka.yaml
@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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.
+
apiVersion: v1
kind: Service
metadata:
diff --git a/manifests/node_exporter_deployment.yaml b/manifests/node_exporter_deployment.yaml
deleted file mode 100644
index bf595d63a22fc5fdcf0a04d706d8fd140c6f2e6e..0000000000000000000000000000000000000000
--- a/manifests/node_exporter_deployment.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: node-exporter
- labels:
- app: node-exporter
-spec:
- replicas: 1
- selector:
- matchLabels:
- app: node-exporter
- template:
- metadata:
- labels:
- app: node-exporter
- spec:
- containers:
- - name: node-exporter
- image: prom/node-exporter:latest
- ports:
- - containerPort: 9100
diff --git a/manifests/node_exporter_service.yaml b/manifests/node_exporter_service.yaml
deleted file mode 100644
index b7bb4f879c3cdc029ac5f106ebfb0f845c03307c..0000000000000000000000000000000000000000
--- a/manifests/node_exporter_service.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
- name: node-exporter
-spec:
- selector:
- app: node-exporter
- ports:
- - protocol: TCP
- port: 9100
- targetPort: 9100
- type: NodePort
diff --git a/my_deploy.sh b/my_deploy.sh
index 83cc898c3770ac8eade5760eb817c8ff41de91e3..a9468a245e30836cbfb28fff527162a2778c7195 100755
--- a/my_deploy.sh
+++ b/my_deploy.sh
@@ -23,7 +23,7 @@ export TFS_REGISTRY_IMAGES="http://localhost:32000/tfs/"
export TFS_COMPONENTS="context device pathcomp service slice nbi webui load_generator"
# Uncomment to activate Monitoring
-export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring kpi_manager"
+#export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring kpi_manager"
# Uncomment to activate BGP-LS Speaker
#export TFS_COMPONENTS="${TFS_COMPONENTS} bgpls_speaker"
@@ -57,7 +57,7 @@ export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring kpi_manager"
#export TFS_COMPONENTS="${TFS_COMPONENTS} forecaster"
# Uncomment to activate E2E Orchestrator
-# export TFS_COMPONENTS="${TFS_COMPONENTS} e2e_orchestrator"
+#export TFS_COMPONENTS="${TFS_COMPONENTS} e2e_orchestrator"
# Set the tag you want to use for your images.
export TFS_IMAGE_TAG="dev"
@@ -69,7 +69,7 @@ export TFS_K8S_NAMESPACE="tfs"
export TFS_EXTRA_MANIFESTS="manifests/nginx_ingress_http.yaml"
# Uncomment to monitor performance of components
-export TFS_EXTRA_MANIFESTS="${TFS_EXTRA_MANIFESTS} manifests/servicemonitors.yaml"
+#export TFS_EXTRA_MANIFESTS="${TFS_EXTRA_MANIFESTS} manifests/servicemonitors.yaml"
# Uncomment when deploying Optical CyberSecurity
#export TFS_EXTRA_MANIFESTS="${TFS_EXTRA_MANIFESTS} manifests/cachingservice.yaml"
@@ -106,7 +106,7 @@ export CRDB_DATABASE="tfs"
export CRDB_DEPLOY_MODE="single"
# Disable flag for dropping database, if it exists.
-export CRDB_DROP_DATABASE_IF_EXISTS="NO"
+export CRDB_DROP_DATABASE_IF_EXISTS=""
# Disable flag for re-deploying CockroachDB from scratch.
export CRDB_REDEPLOY=""
@@ -158,7 +158,7 @@ export QDB_TABLE_MONITORING_KPIS="tfs_monitoring_kpis"
export QDB_TABLE_SLICE_GROUPS="tfs_slice_groups"
# Disable flag for dropping tables if they exist.
-export QDB_DROP_TABLES_IF_EXIST="YES"
+export QDB_DROP_TABLES_IF_EXIST=""
# Disable flag for re-deploying QuestDB from scratch.
export QDB_REDEPLOY=""
diff --git a/proto/analytics_frontend.proto b/proto/analytics_frontend.proto
index c37acceaafd5c36b0372fc0e21edde7778965f77..096c1ee035ae663359d9f4df1e071d3997a0d351 100644
--- a/proto/analytics_frontend.proto
+++ b/proto/analytics_frontend.proto
@@ -1,9 +1,23 @@
+// Copyright 2022-2024 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 device;
+package analytics_frontend;
import "context.proto";
import "kpi_manager.proto";
-import "kpi_sample_types.proto";
+//import "kpi_sample_types.proto";
service AnalyticsFrontendService {
rpc StartAnalyzer (Analyzer ) returns (AnalyzerId ) {}
@@ -15,33 +29,39 @@ message AnalyzerId {
context.Uuid analyzer_id = 1;
}
-enum AnalyzerMode {
- ANALYZERMODE_BATCH = 0;
- ANALYZERMODE_STRAMING = 1;
+enum AnalyzerOperationMode {
+ ANALYZEROPERATIONMODE_BATCH = 0;
+ ANALYZEROPERATIONMODE_STREAMING = 1;
}
message Analyzer {
- repeated kpi_manager.KpiId kpi_id = 1; // The KPI Ids to be processed by the analyzer
- AnalyzerMode mode = 2; // Operation mode of the analyzer
- float batch_min_duration_s = 3; // In batch mode, min duration to collect before executing batch
- float batch_max_duration_s = 4; // In batch mode, max duration collected to execute the batch
- uint64 batch_min_size = 5; // In batch mode, min number of samples to collect before executing batch
- uint64 batch_max_size = 6; // In batch mode, max number of samples collected to execute the batch
+ string algorithm_name = 1; // The algorithm to be executed
+ repeated kpi_manager.KpiId input_kpi_ids = 2; // The KPI Ids to be processed by the analyzer
+ repeated kpi_manager.KpiId output_kpi_ids = 3; // The KPI Ids produced by the analyzer
+ AnalyzerOperationMode operation_mode = 4; // Operation mode of the analyzer
+
+ // In batch mode...
+ float batch_min_duration_s = 5; // ..., min duration to collect before executing batch
+ float batch_max_duration_s = 6; // ..., max duration collected to execute the batch
+ uint64 batch_min_size = 7; // ..., min number of samples to collect before executing batch
+ uint64 batch_max_size = 8; // ..., max number of samples collected to execute the batch
}
message AnalyzerFilter {
// Analyzer that fulfill the filter are those that match ALL the following fields.
// An empty list means: any value is accepted.
// All fields empty means: list all Analyzers
- repeated AnalyzerId analyzer_id = 1;
- repeated kpi_manager.KpiId kpi_id = 2;
- repeated kpi_sample_types.KpiSampleType kpi_sample_type = 3;
- repeated context.DeviceId device_id = 4;
- repeated context.EndPointId endpoint_id = 5;
- repeated context.ServiceId service_id = 6;
- repeated context.SliceId slice_id = 7;
- repeated context.ConnectionId connection_id = 8;
- repeated context.LinkId link_id = 9;
+ repeated AnalyzerId analyzer_id = 1;
+ repeated string algorithm_names = 2;
+ repeated kpi_manager.KpiId input_kpi_ids = 3;
+ repeated kpi_manager.KpiId output_kpi_ids = 4;
+ //repeated kpi_sample_types.KpiSampleType kpi_sample_type = 5; // Not implemented
+ //repeated context.DeviceId device_id = 6; // Not implemented
+ //repeated context.EndPointId endpoint_id = 7; // Not implemented
+ //repeated context.ServiceId service_id = 8; // Not implemented
+ //repeated context.SliceId slice_id = 9; // Not implemented
+ //repeated context.ConnectionId connection_id = 10; // Not implemented
+ //repeated context.LinkId link_id = 11; // Not implemented
}
message AnalyzerList {
diff --git a/proto/device.proto b/proto/device.proto
index 57780adae83ad45ca719d024c3014f740f12bb33..a1882f33f8e177502c456672a0517928f0259ef5 100644
--- a/proto/device.proto
+++ b/proto/device.proto
@@ -16,8 +16,7 @@ syntax = "proto3";
package device;
import "context.proto";
-//import "monitoring.proto";
-import "kpi_manager.proto";
+import "monitoring.proto"; // to be migrated to: "kpi_manager.proto"
service DeviceService {
rpc AddDevice (context.Device ) returns (context.DeviceId ) {}
@@ -28,8 +27,8 @@ service DeviceService {
}
message MonitoringSettings {
- kpi_manager.KpiId kpi_id = 1;
- kpi_manager.KpiDescriptor kpi_descriptor = 2;
- float sampling_duration_s = 3;
- float sampling_interval_s = 4;
+ monitoring.KpiId kpi_id = 1; // to be migrated to: "kpi_manager.KpiId"
+ monitoring.KpiDescriptor kpi_descriptor = 2; // to be migrated to: "kpi_manager.KpiDescriptor"
+ float sampling_duration_s = 3;
+ float sampling_interval_s = 4;
}
diff --git a/proto/kpi_manager.proto b/proto/kpi_manager.proto
index dbb464d73e8a704700d0fd4e86e42b383780c01d..2640b58c60f004e51c8aeacc0ed76963f0436956 100644
--- a/proto/kpi_manager.proto
+++ b/proto/kpi_manager.proto
@@ -1,4 +1,4 @@
-// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+// Copyright 2022-2024 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.
@@ -18,11 +18,11 @@ package kpi_manager;
import "context.proto";
import "kpi_sample_types.proto";
-service KpiManagerService{
- rpc SetKpiDescriptor (KpiDescriptor ) returns (KpiId ) {} // Stable not final
- rpc DeleteKpiDescriptor (KpiId ) returns (context.Empty ) {} // Stable and final
- rpc GetKpiDescriptor (KpiId ) returns (KpiDescriptor ) {} // Stable and final
- rpc SelectKpiDescriptor (KpiDescriptorFilter) returns (KpiDescriptorList ) {} // Stable and final
+service KpiManagerService {
+ rpc SetKpiDescriptor (KpiDescriptor ) returns (KpiId ) {}
+ rpc DeleteKpiDescriptor (KpiId ) returns (context.Empty ) {}
+ rpc GetKpiDescriptor (KpiId ) returns (KpiDescriptor ) {}
+ rpc SelectKpiDescriptor (KpiDescriptorFilter) returns (KpiDescriptorList ) {}
}
message KpiId {
@@ -57,4 +57,4 @@ message KpiDescriptorFilter {
message KpiDescriptorList {
repeated KpiDescriptor kpi_descriptor_list = 1;
-}
\ No newline at end of file
+}
diff --git a/proto/kpi_value_api.proto b/proto/kpi_value_api.proto
index 19069f547b5995862b6fcfdcbb997a8f45f6fca3..dff96272e3d05756dd19a49ecaede7311b196540 100644
--- a/proto/kpi_value_api.proto
+++ b/proto/kpi_value_api.proto
@@ -1,3 +1,17 @@
+// Copyright 2022-2024 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 kpi_value_api;
diff --git a/proto/monitoring.proto b/proto/monitoring.proto
index f240fc3ceb12885557be26cf62597a98e35619f4..083bd82854547478d3a8f4a8935fdf75e9070d9d 100755
--- a/proto/monitoring.proto
+++ b/proto/monitoring.proto
@@ -16,14 +16,13 @@ syntax = "proto3";
package monitoring;
import "context.proto";
-import "kpi_manager.proto";
-//import "kpi_sample_types.proto";
+import "kpi_sample_types.proto";
service MonitoringService {
-// rpc SetKpi (KpiDescriptor ) returns (KpiId ) {} // Stable not final
-// rpc DeleteKpi (KpiId ) returns (context.Empty ) {} // Stable and final
-// rpc GetKpiDescriptor (KpiId ) returns (KpiDescriptor ) {} // Stable and final
-// rpc GetKpiDescriptorList (context.Empty ) returns (KpiDescriptorList ) {} // Stable and final
+ rpc SetKpi (KpiDescriptor ) returns (KpiId ) {} // Stable not final
+ rpc DeleteKpi (KpiId ) returns (context.Empty ) {} // Stable and final
+ rpc GetKpiDescriptor (KpiId ) returns (KpiDescriptor ) {} // Stable and final
+ rpc GetKpiDescriptorList (context.Empty ) returns (KpiDescriptorList ) {} // Stable and final
rpc IncludeKpi (Kpi ) returns (context.Empty ) {} // Stable and final
rpc MonitorKpi (MonitorKpiRequest ) returns (context.Empty ) {} // Stable and final
rpc QueryKpiData (KpiQuery ) returns (RawKpiTable ) {} // Not implemented
@@ -36,25 +35,36 @@ service MonitoringService {
rpc GetAlarmDescriptor (AlarmID ) returns (AlarmDescriptor ) {} // Stable and final
rpc GetAlarmResponseStream(AlarmSubscription ) returns (stream AlarmResponse) {} // Not Stable not final
rpc DeleteAlarm (AlarmID ) returns (context.Empty ) {} // Stable and final
-// rpc GetStreamKpi (KpiId ) returns (stream Kpi ) {} // Stable not final
-// rpc GetInstantKpi (KpiId ) returns (Kpi ) {} // Stable not final
+ rpc GetStreamKpi (KpiId ) returns (stream Kpi ) {} // Stable not final
+ rpc GetInstantKpi (KpiId ) returns (Kpi ) {} // Stable not final
}
-
+message KpiDescriptor {
+ KpiId kpi_id = 1;
+ string kpi_description = 2;
+ repeated KpiId kpi_id_list = 3;
+ kpi_sample_types.KpiSampleType kpi_sample_type = 4;
+ context.DeviceId device_id = 5;
+ context.EndPointId endpoint_id = 6;
+ context.ServiceId service_id = 7;
+ context.SliceId slice_id = 8;
+ context.ConnectionId connection_id = 9;
+ context.LinkId link_id = 10;
+}
message MonitorKpiRequest {
- kpi_manager.KpiId kpi_id = 1;
+ KpiId kpi_id = 1;
float monitoring_window_s = 2;
float sampling_rate_s = 3;
// Pending add field to reflect Available Device Protocols
}
message KpiQuery {
- repeated kpi_manager.KpiId kpi_ids = 1;
- float monitoring_window_s = 2;
- uint32 last_n_samples = 3; // used when you want something like "get the last N many samples
- context.Timestamp start_timestamp = 4; // used when you want something like "get the samples since X date/time"
- context.Timestamp end_timestamp = 5; // used when you want something like "get the samples until X date/time"
+ repeated KpiId kpi_ids = 1;
+ float monitoring_window_s = 2;
+ uint32 last_n_samples = 3; // used when you want something like "get the last N many samples
+ context.Timestamp start_timestamp = 4; // used when you want something like "get the samples since X date/time"
+ context.Timestamp end_timestamp = 5; // used when you want something like "get the samples until X date/time"
}
@@ -64,18 +74,20 @@ message RawKpi { // cell
}
message RawKpiList { // column
- kpi_manager.KpiId kpi_id = 1;
- repeated RawKpi raw_kpis = 2;
+ KpiId kpi_id = 1;
+ repeated RawKpi raw_kpis = 2;
}
message RawKpiTable { // table
repeated RawKpiList raw_kpi_lists = 1;
}
-
+message KpiId {
+ context.Uuid kpi_id = 1;
+}
message Kpi {
- kpi_manager.KpiId kpi_id = 1;
+ KpiId kpi_id = 1;
context.Timestamp timestamp = 2;
KpiValue kpi_value = 3;
}
@@ -105,11 +117,13 @@ message KpiList {
repeated Kpi kpi = 1;
}
-
+message KpiDescriptorList {
+ repeated KpiDescriptor kpi_descriptor_list = 1;
+}
message SubsDescriptor{
SubscriptionID subs_id = 1;
- kpi_manager.KpiId kpi_id = 2;
+ KpiId kpi_id = 2;
float sampling_duration_s = 3;
float sampling_interval_s = 4;
context.Timestamp start_timestamp = 5; // used when you want something like "get the samples since X date/time"
@@ -131,12 +145,12 @@ message SubsList {
}
message AlarmDescriptor {
- AlarmID alarm_id = 1;
- string alarm_description = 2;
- string name = 3;
- kpi_manager.KpiId kpi_id = 4;
- KpiValueRange kpi_value_range = 5;
- context.Timestamp timestamp = 6;
+ AlarmID alarm_id = 1;
+ string alarm_description = 2;
+ string name = 3;
+ KpiId kpi_id = 4;
+ KpiValueRange kpi_value_range = 5;
+ context.Timestamp timestamp = 6;
}
message AlarmID{
@@ -156,5 +170,5 @@ message AlarmResponse {
}
message AlarmList {
- repeated AlarmDescriptor alarm_descriptor = 1;
+ repeated AlarmDescriptor alarm_descriptor = 1;
}
diff --git a/proto/optical_attack_detector.proto b/proto/optical_attack_detector.proto
index bf5cf4db1976932e1126da2263378c7ebdd18b30..f74eea68b8c5a588f5ecc06a59916058cb8d9695 100644
--- a/proto/optical_attack_detector.proto
+++ b/proto/optical_attack_detector.proto
@@ -12,13 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-// protocol buffers documentation: https://developers.google.com/protocol-buffers/docs/proto3
syntax = "proto3";
package optical_attack_detector;
import "context.proto";
-//import "monitoring.proto";
-import "kpi_manager.proto";
+import "monitoring.proto"; // to be migrated to: "kpi_manager.proto"
service OpticalAttackDetectorService {
@@ -29,5 +27,5 @@ service OpticalAttackDetectorService {
message DetectionRequest {
context.ServiceId service_id = 1;
- kpi_manager.KpiId kpi_id = 2;
+ monitoring.KpiId kpi_id = 2; // to be migrated to: "kpi_manager.KpiId"
}
diff --git a/proto/policy_condition.proto b/proto/policy_condition.proto
index 2904f475635b8f87a998418790e6deac37b5bf1a..612dcb1af8eb8adb0db65b8ae47301c87ad6b9ef 100644
--- a/proto/policy_condition.proto
+++ b/proto/policy_condition.proto
@@ -15,14 +15,13 @@
syntax = "proto3";
package policy;
-import "monitoring.proto";
-import "kpi_manager.proto";
+import "monitoring.proto"; // to be migrated to: "kpi_manager.proto"
// Condition
message PolicyRuleCondition {
- kpi_manager.KpiId kpiId = 1;
- NumericalOperator numericalOperator = 2;
- monitoring.KpiValue kpiValue = 3;
+ monitoring.KpiId kpiId = 1; // to be migrated to: "kpi_manager.KpiId"
+ NumericalOperator numericalOperator = 2;
+ monitoring.KpiValue kpiValue = 3;
}
// Operator to be used when comparing Kpis with condition values
diff --git a/proto/telemetry_frontend.proto b/proto/telemetry_frontend.proto
index 01fedd4f3e81dcacc0d9a2741ec5759fa01b1b7c..dbc1e8bf688f9f2df341484c1929e2338c458bbf 100644
--- a/proto/telemetry_frontend.proto
+++ b/proto/telemetry_frontend.proto
@@ -1,5 +1,19 @@
+// Copyright 2022-2024 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 device;
+package telemetry_frontend;
import "context.proto";
import "kpi_manager.proto";
@@ -15,18 +29,18 @@ message CollectorId {
}
message Collector {
- CollectorId collector_id = 1; // The Collector ID
- kpi_manager.KpiId kpi_id = 2; // The KPI Id to be associated to the collected samples
- float duration_s = 3; // Terminate data collection after duration[seconds]; duration==0 means indefinitely
- float interval_s = 4; // Interval between collected samples
+ CollectorId collector_id = 1; // The Collector ID
+ kpi_manager.KpiId kpi_id = 2; // The KPI Id to be associated to the collected samples
+ float duration_s = 3; // Terminate data collection after duration[seconds]; duration==0 means indefinitely
+ float interval_s = 4; // Interval between collected samples
}
message CollectorFilter {
// Collector that fulfill the filter are those that match ALL the following fields.
// An empty list means: any value is accepted.
// All fields empty means: list all Collectors
- repeated CollectorId collector_id = 1;
- repeated kpi_manager.KpiId kpi_id = 2;
+ repeated CollectorId collector_id = 1;
+ repeated kpi_manager.KpiId kpi_id = 2;
}
message CollectorList {
diff --git a/scripts/run_tests_locally-kpi-DB.sh b/scripts/run_tests_locally-kpi-DB.sh
index e46df46576bb47c9763a2b349fc4dad8857ff179..d43be66e1e9843f85e34442d00b10a11d2903c43 100755
--- a/scripts/run_tests_locally-kpi-DB.sh
+++ b/scripts/run_tests_locally-kpi-DB.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
@@ -25,4 +25,4 @@ cd $PROJECTDIR/src
RCFILE=$PROJECTDIR/coverage/.coveragerc
python3 -m pytest --log-level=DEBUG --log-cli-level=DEBUG --verbose \
- kpi_manager/tests/test_kpi_db.py
\ No newline at end of file
+ kpi_manager/tests/test_kpi_db.py
diff --git a/scripts/run_tests_locally-kpi-manager.sh b/scripts/run_tests_locally-kpi-manager.sh
index 742a52685fbb6d327d16d88bb74db85c5c79dff1..db6e786835bcd4550b53394aef23aaa670d43b08 100755
--- a/scripts/run_tests_locally-kpi-manager.sh
+++ b/scripts/run_tests_locally-kpi-manager.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
@@ -25,4 +25,4 @@ cd $PROJECTDIR/src
RCFILE=$PROJECTDIR/coverage/.coveragerc
python3 -m pytest --log-level=DEBUG --log-cli-level=DEBUG --verbose \
- kpi_manager/tests/test_kpi_manager.py
\ No newline at end of file
+ kpi_manager/tests/test_kpi_manager.py
diff --git a/scripts/run_tests_locally-kpi-prom-writer.sh b/scripts/run_tests_locally-kpi-prom-writer.sh
index 63989a13bd9b5200909710f62b8fdc845e779317..1179cbf866969607b880eb41be5c25ab95007bfc 100755
--- a/scripts/run_tests_locally-kpi-prom-writer.sh
+++ b/scripts/run_tests_locally-kpi-prom-writer.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
@@ -20,4 +20,4 @@ cd $PROJECTDIR/src
RCFILE=$PROJECTDIR/coverage/.coveragerc
python3 -m pytest --log-level=DEBUG --log-cli-level=DEBUG --verbose \
- kpi_value_writer/tests/test_metric_writer_to_prom.py
\ No newline at end of file
+ kpi_value_writer/tests/test_metric_writer_to_prom.py
diff --git a/scripts/run_tests_locally-kpi-value-API.sh b/scripts/run_tests_locally-kpi-value-API.sh
index 770c97ce0a37401b02ce446845aded488cf6d560..8dfbfb16237634519dcae2fcc34f850a5188c1e7 100755
--- a/scripts/run_tests_locally-kpi-value-API.sh
+++ b/scripts/run_tests_locally-kpi-value-API.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
@@ -22,4 +22,4 @@ RCFILE=$PROJECTDIR/coverage/.coveragerc
# helpful pytest flags: --log-level=INFO -o log_cli=true --verbose --maxfail=1 --durations=0
python3 -m pytest --log-level=DEBUG --log-cli-level=DEBUG -o log_cli=true --verbose \
- kpi_value_api/tests/test_kpi_value_api.py
\ No newline at end of file
+ kpi_value_api/tests/test_kpi_value_api.py
diff --git a/scripts/run_tests_locally-kpi-value-writer.sh b/scripts/run_tests_locally-kpi-value-writer.sh
index 95cf396f63932342b782365560b72220dce85b78..8faaeb6d895a240278d7ceb0c5c0b2855fa25910 100755
--- a/scripts/run_tests_locally-kpi-value-writer.sh
+++ b/scripts/run_tests_locally-kpi-value-writer.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
@@ -20,4 +20,4 @@ cd $PROJECTDIR/src
RCFILE=$PROJECTDIR/coverage/.coveragerc
python3 -m pytest --log-level=DEBUG --log-cli-level=DEBUG --verbose \
- kpi_value_writer/tests/test_kpi_value_writer.py
\ No newline at end of file
+ kpi_value_writer/tests/test_kpi_value_writer.py
diff --git a/scripts/run_tests_locally-telemetry-DB.sh b/scripts/run_tests_locally-telemetry-DB.sh
index 0a896d92c12fc05deb964373aae602fee9750e5c..bb1c48b76440c00b398875a8f704c2a82ba4ab50 100755
--- a/scripts/run_tests_locally-telemetry-DB.sh
+++ b/scripts/run_tests_locally-telemetry-DB.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
@@ -23,4 +23,4 @@ cd $PROJECTDIR/src
RCFILE=$PROJECTDIR/coverage/.coveragerc
python3 -m pytest --log-cli-level=INFO --verbose \
- telemetry/database/tests/telemetryDBtests.py
\ No newline at end of file
+ telemetry/database/tests/telemetryDBtests.py
diff --git a/scripts/run_tests_locally-telemetry-backend.sh b/scripts/run_tests_locally-telemetry-backend.sh
index 8f72fb28324f47b17b7a9549746b461864697238..9cf404ffcef6c99b261f81eb0c6b910dd60845e5 100755
--- a/scripts/run_tests_locally-telemetry-backend.sh
+++ b/scripts/run_tests_locally-telemetry-backend.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
@@ -25,4 +25,4 @@ cd $PROJECTDIR/src
RCFILE=$PROJECTDIR/coverage/.coveragerc
python3 -m pytest --log-level=INFO --log-cli-level=INFO --verbose \
- telemetry/backend/tests/testTelemetryBackend.py
\ No newline at end of file
+ telemetry/backend/tests/testTelemetryBackend.py
diff --git a/scripts/run_tests_locally-telemetry-frontend.sh b/scripts/run_tests_locally-telemetry-frontend.sh
index 673104af60e7f57f9a4e6986fe61ca5349577901..7652ccb583268285dcd2fcf3090b717dc18e4fc3 100755
--- a/scripts/run_tests_locally-telemetry-frontend.sh
+++ b/scripts/run_tests_locally-telemetry-frontend.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
@@ -25,4 +25,4 @@ cd $PROJECTDIR/src
RCFILE=$PROJECTDIR/coverage/.coveragerc
python3 -m pytest --log-level=INFO --log-cli-level=INFO --verbose \
- telemetry/frontend/tests/test_frontend.py
\ No newline at end of file
+ telemetry/frontend/tests/test_frontend.py
diff --git a/scripts/run_tests_locally-telemetry-mgtDB.sh b/scripts/run_tests_locally-telemetry-mgtDB.sh
index 02a449abf3f441cceb17e12152e1d494514909fe..8b68104eaf343b57ec4953334cda37167cca3529 100755
--- a/scripts/run_tests_locally-telemetry-mgtDB.sh
+++ b/scripts/run_tests_locally-telemetry-mgtDB.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
@@ -23,4 +23,4 @@ cd $PROJECTDIR/src
RCFILE=$PROJECTDIR/coverage/.coveragerc
python3 -m pytest --log-cli-level=INFO --verbose \
- telemetry/database/tests/managementDBtests.py
\ No newline at end of file
+ telemetry/database/tests/managementDBtests.py
diff --git a/scripts/show_logs_telemetry-DB.sh b/scripts/show_logs_telemetry-DB.sh
index 0f57a36af4181790900147accfc66df7d4de76f1..84fc875d01e18eae9b144edaf220d5cb74017ea4 100755
--- a/scripts/show_logs_telemetry-DB.sh
+++ b/scripts/show_logs_telemetry-DB.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
diff --git a/src/kpi_manager/Dockerfile b/src/kpi_manager/Dockerfile
index 4d74030e7b024469a236e7dfd486dcc91987cfc2..a57957759a32b45b715e327b54ebe004a6edf265 100644
--- a/src/kpi_manager/Dockerfile
+++ b/src/kpi_manager/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
diff --git a/src/kpi_value_writer/Dockerfile b/src/kpi_value_writer/Dockerfile
index 4d74030e7b024469a236e7dfd486dcc91987cfc2..a57957759a32b45b715e327b54ebe004a6edf265 100644
--- a/src/kpi_value_writer/Dockerfile
+++ b/src/kpi_value_writer/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
diff --git a/src/kpi_value_writer/__init__.py b/src/kpi_value_writer/__init__.py
index 1549d9811aa5d1c193a44ad45d0d7773236c0612..3ee6f7071f145e06c3aeaefc09a43ccd88e619e3 100644
--- a/src/kpi_value_writer/__init__.py
+++ b/src/kpi_value_writer/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
diff --git a/src/kpi_value_writer/service/KpiWriterOld.py b/src/kpi_value_writer/service/KpiWriterOld.py
index 6c74f1a05de99436b54ce1e5961085d27ecda671..b9a4316b0f5decb2364127052ebf0b44edc05fbd 100644
--- a/src/kpi_value_writer/service/KpiWriterOld.py
+++ b/src/kpi_value_writer/service/KpiWriterOld.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
diff --git a/src/kpi_value_writer/service/MetricWriterToPrometheus.py b/src/kpi_value_writer/service/MetricWriterToPrometheus.py
index b2bfc07a4a1885ede270098562a4961b73c99d1f..b681164786bd310d457998bae55b836522888b94 100644
--- a/src/kpi_value_writer/service/MetricWriterToPrometheus.py
+++ b/src/kpi_value_writer/service/MetricWriterToPrometheus.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
diff --git a/src/kpi_value_writer/service/__init__.py b/src/kpi_value_writer/service/__init__.py
index 1549d9811aa5d1c193a44ad45d0d7773236c0612..3ee6f7071f145e06c3aeaefc09a43ccd88e619e3 100644
--- a/src/kpi_value_writer/service/__init__.py
+++ b/src/kpi_value_writer/service/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
diff --git a/src/kpi_value_writer/tests/test_kpi_composer.py b/src/kpi_value_writer/tests/test_kpi_composer.py
index 787ca6676ac5c59b583e6aee2ec3b7fac34370c9..fa75ba2ab67b73565b408b9404e90e0eab9c2ae6 100644
--- a/src/kpi_value_writer/tests/test_kpi_composer.py
+++ b/src/kpi_value_writer/tests/test_kpi_composer.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
diff --git a/src/kpi_value_writer/tests/test_kpi_value_writer.py b/src/kpi_value_writer/tests/test_kpi_value_writer.py
index 05310aa6bdda7f0f0c23f7829e6cf4bd1ab7ec1b..0a57c7416e13e6f2e491f47a68aba14a264b84e9 100755
--- a/src/kpi_value_writer/tests/test_kpi_value_writer.py
+++ b/src/kpi_value_writer/tests/test_kpi_value_writer.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
diff --git a/src/kpi_value_writer/tests/test_messages.py b/src/kpi_value_writer/tests/test_messages.py
index d4b263c8089e5ce8b65d66d8a6e00c5976b9e997..64add9a63a911eb083c11887e88f92689bbc4e52 100755
--- a/src/kpi_value_writer/tests/test_messages.py
+++ b/src/kpi_value_writer/tests/test_messages.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
diff --git a/src/kpi_value_writer/tests/test_metric_writer_to_prom.py b/src/kpi_value_writer/tests/test_metric_writer_to_prom.py
index cee2877fffb0abf69fe720ca778022da0e6c8794..44f12ecea1a434793649d30bdd7ea5edf1d88e7d 100644
--- a/src/kpi_value_writer/tests/test_metric_writer_to_prom.py
+++ b/src/kpi_value_writer/tests/test_metric_writer_to_prom.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
diff --git a/src/telemetry/__init__.py b/src/telemetry/__init__.py
index 6a8f397461ef6ef2fbcf09b6078482c2df954a1e..234a1af6588c91f6a17f3963f69120cd6e2248d9 100644
--- a/src/telemetry/__init__.py
+++ b/src/telemetry/__init__.py
@@ -1,5 +1,5 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
diff --git a/src/telemetry/backend/__init__.py b/src/telemetry/backend/__init__.py
index 38d04994fb0fa1951fb465bc127eb72659dc2eaf..bbfc943b68af13a11e562abbc8680ade71db8f02 100644
--- a/src/telemetry/backend/__init__.py
+++ b/src/telemetry/backend/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
diff --git a/src/telemetry/backend/service/TelemetryBackendService.py b/src/telemetry/backend/service/TelemetryBackendService.py
index ef57ea8e87b46a3aa09da3a8862cf50c923034ae..d81be79dbe410ccbf2781816f34735f6bfe5639d 100755
--- a/src/telemetry/backend/service/TelemetryBackendService.py
+++ b/src/telemetry/backend/service/TelemetryBackendService.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
diff --git a/src/telemetry/backend/service/__init__.py b/src/telemetry/backend/service/__init__.py
index 38d04994fb0fa1951fb465bc127eb72659dc2eaf..bbfc943b68af13a11e562abbc8680ade71db8f02 100644
--- a/src/telemetry/backend/service/__init__.py
+++ b/src/telemetry/backend/service/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
diff --git a/src/telemetry/backend/tests/__init__.py b/src/telemetry/backend/tests/__init__.py
index 38d04994fb0fa1951fb465bc127eb72659dc2eaf..bbfc943b68af13a11e562abbc8680ade71db8f02 100644
--- a/src/telemetry/backend/tests/__init__.py
+++ b/src/telemetry/backend/tests/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
diff --git a/src/telemetry/backend/tests/messagesBackend.py b/src/telemetry/backend/tests/messagesBackend.py
index 10f5e099a8714d52fd1f9144e62c003be431bfb5..5cf553eaaec41de7599b6723e31e4ca3f82cbcae 100644
--- a/src/telemetry/backend/tests/messagesBackend.py
+++ b/src/telemetry/backend/tests/messagesBackend.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
diff --git a/src/telemetry/backend/tests/testTelemetryBackend.py b/src/telemetry/backend/tests/testTelemetryBackend.py
index 5f0697b7281c9a4aea38e02488f7aa294a05eb8f..d832e54e77589ca677682760d19e68b1bd09b1f7 100644
--- a/src/telemetry/backend/tests/testTelemetryBackend.py
+++ b/src/telemetry/backend/tests/testTelemetryBackend.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
diff --git a/src/telemetry/database/TelemetryDBmanager.py b/src/telemetry/database/TelemetryDBmanager.py
index e2b1f63a2deab0f162bbc16ac2d42c93cca46840..b558180a9e1fbf85bf523c7faededf58f57e2264 100644
--- a/src/telemetry/database/TelemetryDBmanager.py
+++ b/src/telemetry/database/TelemetryDBmanager.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
diff --git a/src/telemetry/database/TelemetryEngine.py b/src/telemetry/database/TelemetryEngine.py
index 2b47e4ec86c70e5944212f7f9259cac834673a58..a563fa09f94c812aed07d0aa3cbd5bc988737fc4 100644
--- a/src/telemetry/database/TelemetryEngine.py
+++ b/src/telemetry/database/TelemetryEngine.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
diff --git a/src/telemetry/database/TelemetryModel.py b/src/telemetry/database/TelemetryModel.py
index 54b7c13ef95897f08c32eb41a2958a5318d092f7..be4f0969c86638520cf226b8e42db90426165804 100644
--- a/src/telemetry/database/TelemetryModel.py
+++ b/src/telemetry/database/TelemetryModel.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
diff --git a/src/telemetry/database/__init__.py b/src/telemetry/database/__init__.py
index 1549d9811aa5d1c193a44ad45d0d7773236c0612..3ee6f7071f145e06c3aeaefc09a43ccd88e619e3 100644
--- a/src/telemetry/database/__init__.py
+++ b/src/telemetry/database/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
diff --git a/src/telemetry/database/__main__.py b/src/telemetry/database/__main__.py
index 10f5e099a8714d52fd1f9144e62c003be431bfb5..5cf553eaaec41de7599b6723e31e4ca3f82cbcae 100644
--- a/src/telemetry/database/__main__.py
+++ b/src/telemetry/database/__main__.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
diff --git a/src/telemetry/database/managementDB.py b/src/telemetry/database/managementDB.py
index 3e0cfc5fbba1102d9a8890bddae7417e077bc732..f79126f279d7bbece6c08ae5eb1cd74e340d1c7d 100644
--- a/src/telemetry/database/managementDB.py
+++ b/src/telemetry/database/managementDB.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
diff --git a/src/telemetry/database/tests/__init__.py b/src/telemetry/database/tests/__init__.py
index f80ccfd52ebfd4fa1783267201c52eb7381741bf..839e45e3b646bc60de7edd81fcfb91b7b38feadf 100644
--- a/src/telemetry/database/tests/__init__.py
+++ b/src/telemetry/database/tests/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
diff --git a/src/telemetry/database/tests/managementDBtests.py b/src/telemetry/database/tests/managementDBtests.py
index 3d7ef66152a5b5acaa5efe74c6a716083f78d756..24138abe42be742bd9b16d7840343f9d7c7fe133 100644
--- a/src/telemetry/database/tests/managementDBtests.py
+++ b/src/telemetry/database/tests/managementDBtests.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
diff --git a/src/telemetry/database/tests/messages.py b/src/telemetry/database/tests/messages.py
index 6452e79e78ee1d56b9288f8401a25b9e2cfaaaa5..6919eecc62da0794869f334c4de85cb129fbab14 100644
--- a/src/telemetry/database/tests/messages.py
+++ b/src/telemetry/database/tests/messages.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
diff --git a/src/telemetry/database/tests/telemetryDBtests.py b/src/telemetry/database/tests/telemetryDBtests.py
index 59043b33f1df9a65036cc9d5e92ae9f8353b101c..0d221106419d6e4ee4b313adf10c90c5e6be7666 100644
--- a/src/telemetry/database/tests/telemetryDBtests.py
+++ b/src/telemetry/database/tests/telemetryDBtests.py
@@ -1,5 +1,5 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
diff --git a/src/telemetry/frontend/__init__.py b/src/telemetry/frontend/__init__.py
index 6a8f397461ef6ef2fbcf09b6078482c2df954a1e..234a1af6588c91f6a17f3963f69120cd6e2248d9 100644
--- a/src/telemetry/frontend/__init__.py
+++ b/src/telemetry/frontend/__init__.py
@@ -1,5 +1,5 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
diff --git a/src/telemetry/frontend/client/TelemetryFrontendClient.py b/src/telemetry/frontend/client/TelemetryFrontendClient.py
index 9b4e27b367579240e3d77056b4a862f17590cada..cd36ecd45933ad10758e408cf03c1bf834d27ba6 100644
--- a/src/telemetry/frontend/client/TelemetryFrontendClient.py
+++ b/src/telemetry/frontend/client/TelemetryFrontendClient.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
diff --git a/src/telemetry/frontend/client/__init__.py b/src/telemetry/frontend/client/__init__.py
index 1549d9811aa5d1c193a44ad45d0d7773236c0612..3ee6f7071f145e06c3aeaefc09a43ccd88e619e3 100644
--- a/src/telemetry/frontend/client/__init__.py
+++ b/src/telemetry/frontend/client/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
diff --git a/src/telemetry/frontend/service/TelemetryFrontendService.py b/src/telemetry/frontend/service/TelemetryFrontendService.py
index 522d125e6f7d01ecd603c761db1461b35c6d614a..dc3f8df363a882db0f0ba3112a38f3bba3921c30 100644
--- a/src/telemetry/frontend/service/TelemetryFrontendService.py
+++ b/src/telemetry/frontend/service/TelemetryFrontendService.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
diff --git a/src/telemetry/frontend/service/TelemetryFrontendServiceServicerImpl.py b/src/telemetry/frontend/service/TelemetryFrontendServiceServicerImpl.py
index c63b42cbfec2f7fee35ffa486c2f565ccd7106a5..e6830ad676d3934c88b01575ebdd1d0549fb00d1 100644
--- a/src/telemetry/frontend/service/TelemetryFrontendServiceServicerImpl.py
+++ b/src/telemetry/frontend/service/TelemetryFrontendServiceServicerImpl.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
diff --git a/src/telemetry/frontend/service/__init__.py b/src/telemetry/frontend/service/__init__.py
index 1549d9811aa5d1c193a44ad45d0d7773236c0612..3ee6f7071f145e06c3aeaefc09a43ccd88e619e3 100644
--- a/src/telemetry/frontend/service/__init__.py
+++ b/src/telemetry/frontend/service/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
diff --git a/src/telemetry/frontend/service/__main__.py b/src/telemetry/frontend/service/__main__.py
index 0f48a4de10168ec5d238a2f0bbdd7a97b0e481c5..3b0263706c3dad3756306d1ba8a3a104d568cd6f 100644
--- a/src/telemetry/frontend/service/__main__.py
+++ b/src/telemetry/frontend/service/__main__.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
diff --git a/src/telemetry/frontend/tests/Messages.py b/src/telemetry/frontend/tests/Messages.py
index 6dc1dffa9ebeaf5a12495250c53d5f159a114a53..1205898d13a610cd262979242e4f489f5e35cdb8 100644
--- a/src/telemetry/frontend/tests/Messages.py
+++ b/src/telemetry/frontend/tests/Messages.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
diff --git a/src/telemetry/frontend/tests/__init__.py b/src/telemetry/frontend/tests/__init__.py
index 1549d9811aa5d1c193a44ad45d0d7773236c0612..3ee6f7071f145e06c3aeaefc09a43ccd88e619e3 100644
--- a/src/telemetry/frontend/tests/__init__.py
+++ b/src/telemetry/frontend/tests/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
diff --git a/src/telemetry/frontend/tests/test_frontend.py b/src/telemetry/frontend/tests/test_frontend.py
index e33545dcc57b4ba7f7efbae8aa95d9c4eb6309ef..002cc430721845aa5aa18274375e2c22b5d77ff7 100644
--- a/src/telemetry/frontend/tests/test_frontend.py
+++ b/src/telemetry/frontend/tests/test_frontend.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.
diff --git a/src/telemetry/requirements.in b/src/telemetry/requirements.in
index 1dd24fe32295556b383ad78c94b844ca3b91c176..a0e78d2bfb7270b9664ad5ba810e2f213d887bf7 100644
--- a/src/telemetry/requirements.in
+++ b/src/telemetry/requirements.in
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 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.