Imports of Kpi, KpiList and KpiDescriptor is changed to kpi_manager_pb2 file.

src/monitoring/service/MonitoringServiceServicerImpl.py

@@ -20,8 +20,8 @@ from common.proto.context_pb2 import Empty
 from common.proto.device_pb2 import MonitoringSettings
 from common.proto.kpi_sample_types_pb2 import KpiSampleType
 from common.proto.monitoring_pb2_grpc import MonitoringServiceServicer
-from common.proto.monitoring_pb2 import AlarmResponse, AlarmDescriptor, AlarmList, SubsList, KpiId, \
-    KpiDescriptor, KpiList, KpiQuery, SubsDescriptor, SubscriptionID, AlarmID, KpiDescriptorList, \
+from common.proto.monitoring_pb2 import AlarmResponse, AlarmDescriptor, AlarmList, SubsList,  \
+    KpiQuery, SubsDescriptor, SubscriptionID, AlarmID, KpiList,\
     MonitorKpiRequest, Kpi, AlarmSubscription, SubsResponse, RawKpiTable, RawKpi, RawKpiList
 from common.tools.timestamp.Converters import timestamp_string_to_float, timestamp_utcnow_to_float
 from device.client.DeviceClient import DeviceClient
@@ -30,6 +30,8 @@ from monitoring.service.AlarmManager import AlarmManager
 from monitoring.service.NameMapping import NameMapping
 from monitoring.service.SubscriptionManager import SubscriptionManager
 
+from common.proto.kpi_manager_pb2 import KpiId, KpiDescriptor, KpiDescriptorList
+
 LOGGER = logging.getLogger(__name__)
 
 METRICSDB_HOSTNAME = os.environ.get("METRICSDB_HOSTNAME")