change of proto file name from "Kpi_management" to "Kpi_manager"

proto/analytics_frontend.proto

@@ -2,7 +2,7 @@ syntax = "proto3";
 package device;
 
 import "context.proto";
-import "kpi_management.proto";
+import "kpi_manager.proto";
 import "kpi_sample_types.proto";
 
 service AnalyticsFrontendService {
@@ -21,7 +21,7 @@ enum AnalyzerMode {
 }
 
 message Analyzer {
-  repeated kpi_management.KpiId kpi_id               = 1; // The KPI Ids to be processed by the 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
@@ -34,7 +34,7 @@ message AnalyzerFilter {
   // An empty list means: any value is accepted.
   // All fields empty means: list all Analyzers
   repeated AnalyzerId                     analyzer_id    = 1;
-  repeated kpi_management.KpiId           kpi_id          = 2;
+  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;

proto/device.proto

@@ -17,7 +17,7 @@ package device;
 
 import "context.proto";
 //import "monitoring.proto";
-import "kpi_management.proto";
+import "kpi_manager.proto";
 
 service DeviceService {
   rpc AddDevice       (context.Device    ) returns (context.DeviceId    ) {}
@@ -28,8 +28,8 @@ service DeviceService {
 }
 
 message MonitoringSettings {
-  kpi_management.KpiId kpi_id = 1;
-  kpi_management.KpiDescriptor kpi_descriptor = 2;
+  kpi_manager.KpiId kpi_id = 1;
+  kpi_manager.KpiDescriptor kpi_descriptor = 2;
   float sampling_duration_s = 3;
   float sampling_interval_s = 4;
 }

proto/kpi_management.proto → proto/kpi_manager.proto

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 syntax = "proto3";
-package kpi_management;
+package kpi_manager;
 
 import "context.proto";
 import "kpi_sample_types.proto";

proto/monitoring.proto

@@ -16,7 +16,7 @@ syntax = "proto3";
 package monitoring;
 
 import "context.proto";
-import "kpi_management.proto";
+import "kpi_manager.proto";
 //import "kpi_sample_types.proto";
 
 service MonitoringService {
@@ -43,14 +43,14 @@ service MonitoringService {
 
 
 message MonitorKpiRequest {
-  kpi_management.KpiId kpi_id  = 1;
+  kpi_manager.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_management.KpiId    kpi_ids             = 1;
+  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"
@@ -64,7 +64,7 @@ message RawKpi { // cell
 }
 
 message RawKpiList { // column
-  kpi_management.KpiId  kpi_id    = 1;
+  kpi_manager.KpiId  kpi_id    = 1;
   repeated RawKpi    raw_kpis  = 2;
 }
 
@@ -75,7 +75,7 @@ message RawKpiTable { // table
 
 
 message Kpi {
-  kpi_management.KpiId kpi_id    = 1;
+  kpi_manager.KpiId kpi_id    = 1;
   context.Timestamp timestamp = 2;
   KpiValue          kpi_value = 3;
 }
@@ -109,7 +109,7 @@ message KpiList {
 
 message SubsDescriptor{
   SubscriptionID    subs_id             = 1;
-  kpi_management.KpiId kpi_id              = 2;
+  kpi_manager.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"
@@ -134,7 +134,7 @@ message AlarmDescriptor {
   AlarmID                     alarm_id              = 1;
   string                      alarm_description     = 2;
   string                      name                  = 3;
-  kpi_management.KpiId           kpi_id                = 4;
+  kpi_manager.KpiId           kpi_id                = 4;
   KpiValueRange               kpi_value_range       = 5;
   context.Timestamp           timestamp             = 6;
 }

proto/optical_attack_detector.proto

@@ -18,7 +18,7 @@ package optical_attack_detector;
 
 import "context.proto";
 //import "monitoring.proto";
-import "kpi_management.proto";
+import "kpi_manager.proto";
 
 service OpticalAttackDetectorService {
   
@@ -29,5 +29,5 @@ service OpticalAttackDetectorService {
 
 message DetectionRequest {
   context.ServiceId service_id = 1;
-  kpi_management.KpiId  kpi_id     = 2;
+  kpi_manager.KpiId  kpi_id     = 2;
 }

proto/policy_condition.proto

@@ -16,11 +16,11 @@ syntax = "proto3";
 package policy;
 
 import "monitoring.proto";
-import "kpi_management.proto";
+import "kpi_manager.proto";
 
 // Condition
 message PolicyRuleCondition {
-  kpi_management.KpiId kpiId = 1;
+  kpi_manager.KpiId kpiId = 1;
   NumericalOperator numericalOperator = 2;
   monitoring.KpiValue kpiValue = 3;
 }

proto/telemetry_frontend.proto

@@ -2,7 +2,7 @@ syntax = "proto3";
 package device;
 
 import "context.proto";
-import "kpi_management.proto";
+import "kpi_manager.proto";
 
 service TelemetryFrontendService {
   rpc StartCollector  (Collector      ) returns (CollectorId  ) {}
@@ -16,7 +16,7 @@ message CollectorId {
 
 message Collector {
   CollectorId          collector_id     = 1;     // The Collector ID
-  kpi_management.KpiId kpi_id           = 2;     // The KPI Id to be associated to the collected samples
+  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
 }
@@ -26,7 +26,7 @@ message CollectorFilter {
   // An empty list means: any value is accepted.
   // All fields empty means: list all Collectors
   repeated CollectorId          collector_id    = 1;
-  repeated kpi_management.KpiId kpi_id          = 2;
+  repeated kpi_manager.KpiId kpi_id          = 2;
 }
 
 message CollectorList {

src/kpi_manager/client/KpiManagerClient.py

@@ -19,8 +19,8 @@ from common.Settings import get_service_host, get_service_port_grpc
 from common.proto.context_pb2 import Empty
 from common.tools.grpc.Tools import grpc_message_to_json_string
 from common.tools.client.RetryDecorator import retry, delay_exponential
-from common.proto.kpi_management_pb2_grpc import KpiManagerServiceStub
-from common.proto.kpi_management_pb2 import KpiId, KpiDescriptor, KpiDescriptorFilter, KpiDescriptorList
+from common.proto.kpi_manager_pb2_grpc import KpiManagerServiceStub
+from common.proto.kpi_manager_pb2 import KpiId, KpiDescriptor, KpiDescriptorFilter, KpiDescriptorList
 
 LOGGER = logging.getLogger(__name__)
 MAX_RETRIES = 10

src/kpi_manager/database/KpiModel.py

@@ -16,7 +16,7 @@ import logging
 from sqlalchemy.dialects.postgresql import UUID
 from sqlalchemy import Column, Integer, String, Float, Text
 from sqlalchemy.orm import registry
-from common.proto.kpi_management_pb2 import KpiDescriptor
+from common.proto.kpi_manager_pb2 import KpiDescriptor
 
 logging.basicConfig(level=logging.INFO)
 LOGGER = logging.getLogger(__name__)

src/kpi_manager/service/KpiManagerService.py

@@ -14,7 +14,7 @@
 
 from common.Constants import ServiceNameEnum
 from common.Settings import get_service_port_grpc
-from common.proto.kpi_management_pb2_grpc import add_KpiManagerServiceServicer_to_server
+from common.proto.kpi_manager_pb2_grpc import add_KpiManagerServiceServicer_to_server
 from common.tools.service.GenericGrpcService import GenericGrpcService
 from kpi_manager.service.KpiManagerServiceServicerImpl import KpiManagerServiceServicerImpl
 from monitoring.service.NameMapping import NameMapping

src/kpi_manager/service/KpiManagerServiceServicerImpl.py

@@ -18,8 +18,8 @@ from typing import List, Set
 from sqlalchemy.sql.expression import BinaryExpression
 from common.method_wrappers.Decorator import MetricsPool, safe_and_metered_rpc_method
 from common.proto.context_pb2 import Empty
-from common.proto.kpi_management_pb2_grpc import KpiManagerServiceServicer
-from common.proto.kpi_management_pb2 import KpiId, KpiDescriptor, KpiDescriptorFilter, KpiDescriptorList
+from common.proto.kpi_manager_pb2_grpc import KpiManagerServiceServicer
+from common.proto.kpi_manager_pb2 import KpiId, KpiDescriptor, KpiDescriptorFilter, KpiDescriptorList
 from monitoring.service.NameMapping import NameMapping
 from kpi_manager.database.Kpi_DB import KpiDB
 from kpi_manager.database.KpiModel import Kpi as KpiModel

src/kpi_manager/tests/test_kpi_manager.py

@@ -24,7 +24,7 @@ from common.Settings import (
 from common.tests.MockServicerImpl_Context import MockServicerImpl_Context
 from common.proto.context_pb2_grpc import add_ContextServiceServicer_to_server
 
-from common.proto.kpi_management_pb2 import KpiId, KpiDescriptor, KpiDescriptorFilter, KpiDescriptorList
+from common.proto.kpi_manager_pb2 import KpiId, KpiDescriptor, KpiDescriptorFilter, KpiDescriptorList
 from common.tools.service.GenericGrpcService import GenericGrpcService
 from context.client.ContextClient import ContextClient
 

src/kpi_manager/tests/test_messages.py

@@ -13,13 +13,13 @@
 # limitations under the License.
 
 import uuid
-from common.proto import kpi_management_pb2
+from common.proto import kpi_manager_pb2
 from common.proto.kpi_sample_types_pb2 import KpiSampleType
 from common.proto.context_pb2 import DeviceId, LinkId, ServiceId, SliceId,\
                              ConnectionId, EndPointId
 
 def create_kpi_descriptor_request(descriptor_name: str = "Test_name"):
-    _create_kpi_request                                    = kpi_management_pb2.KpiDescriptor()
+    _create_kpi_request                                    = kpi_manager_pb2.KpiDescriptor()
     _create_kpi_request.kpi_id.kpi_id.uuid                 = str(uuid.uuid4())
     _create_kpi_request.kpi_description                    = descriptor_name
     _create_kpi_request.kpi_sample_type                    = KpiSampleType.KPISAMPLETYPE_PACKETS_RECEIVED
@@ -32,7 +32,7 @@ def create_kpi_descriptor_request(descriptor_name: str = "Test_name"):
     return _create_kpi_request
 
 def create_kpi_filter_request():
-    _create_kpi_filter_request = kpi_management_pb2.KpiDescriptorFilter()
+    _create_kpi_filter_request = kpi_manager_pb2.KpiDescriptorFilter()
     _create_kpi_filter_request.kpi_sample_type.append(KpiSampleType.KPISAMPLETYPE_PACKETS_RECEIVED)
 
     device_id_obj     = DeviceId()

src/monitoring/client/MonitoringClient.py

@@ -20,7 +20,7 @@ from common.Settings import get_service_host, get_service_port_grpc
 from common.tools.client.RetryDecorator import retry, delay_exponential
 from common.tools.grpc.Tools import grpc_message_to_json_string
 from common.proto.context_pb2 import Empty
-from common.proto.kpi_management_pb2 import KpiId, KpiDescriptor, KpiDescriptorList
+from common.proto.kpi_manager_pb2 import KpiId, KpiDescriptor, KpiDescriptorList
 from common.proto.monitoring_pb2 import Kpi, MonitorKpiRequest, \
     KpiQuery, KpiList, SubsDescriptor, SubscriptionID, SubsList, \
     SubsResponse, AlarmDescriptor, AlarmID, AlarmList, AlarmResponse, AlarmSubscription, RawKpiTable