Pre-merge cleanup

proto/kpi_manager.proto

-// 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
+}

proto/kpi_value_api.proto

+// 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;
 

proto/monitoring.proto

@@ -16,7 +16,6 @@ syntax = "proto3";
 package monitoring;
 
 import "context.proto";
-import "monitoring.proto";
 import "kpi_sample_types.proto";
 
 service MonitoringService {
@@ -54,7 +53,7 @@ message KpiDescriptor {
 }
 
 message MonitorKpiRequest {
-  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
@@ -62,10 +61,10 @@ message MonitorKpiRequest {
 
 message KpiQuery {
   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"
+  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"
 }
 
 
@@ -75,8 +74,8 @@ message RawKpi { // cell
 }
 
 message RawKpiList { // column
-  KpiId  kpi_id    = 1;
-  repeated RawKpi    raw_kpis  = 2;
+  KpiId           kpi_id    = 1;
+  repeated RawKpi raw_kpis  = 2;
 }
 
 message RawKpiTable { // table
@@ -122,7 +121,7 @@ message KpiList {
 
 message SubsDescriptor{
   SubscriptionID    subs_id             = 1;
-  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"
@@ -144,12 +143,12 @@ message SubsList {
 }
 
 message AlarmDescriptor {
-  AlarmID                     alarm_id              = 1;
-  string                      alarm_description     = 2;
-  string                      name                  = 3;
-  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{
@@ -169,5 +168,5 @@ message AlarmResponse {
 }
 
 message AlarmList {
-    repeated AlarmDescriptor alarm_descriptor = 1;
+  repeated AlarmDescriptor alarm_descriptor = 1;
 }

proto/telemetry_frontend.proto

+// 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 {