Minor adjustments after regeneration of proto files.

src/monitoring/service/EventTools.py

@@ -63,7 +63,7 @@ class EventsDeviceCollector:
                             kpi_descriptor = monitoring_pb2.KpiDescriptor()
 
                             kpi_descriptor.kpi_description                      = device.device_type
-                            kpi_descriptor.kpi_sample_type                      = kpi_sample_types_pb2.KpiSampleType.PACKETS_TRANSMITTED
+                            kpi_descriptor.kpi_sample_type                      = kpi_sample_types_pb2.KpiSampleType.KPISAMPLETYPE_PACKETS_TRANSMITTED
                             kpi_descriptor.device_id.CopyFrom(device.device_id)
                             kpi_descriptor.endpoint_id.CopyFrom(end_point.endpoint_id)
                             kpi_descriptor.service_id.service_uuid.uuid         = "SERV"+str(i+1)

src/monitoring/tests/test_unitary.py

@@ -140,7 +140,7 @@ def create_kpi_request():
 
     create_kpi_request                                  = monitoring_pb2.KpiDescriptor()
     create_kpi_request.kpi_description                  = 'KPI Description Test'
-    create_kpi_request.kpi_sample_type                  = kpi_sample_types_pb2.KpiSampleType.PACKETS_TRANSMITTED
+    create_kpi_request.kpi_sample_type                  = kpi_sample_types_pb2.KpiSampleType.KPISAMPLETYPE_PACKETS_TRANSMITTED
     create_kpi_request.device_id.device_uuid.uuid       = 'DEV1'  # pylint: disable=maybe-no-member
     create_kpi_request.service_id.service_uuid.uuid     = "SERV1"
     create_kpi_request.endpoint_id.endpoint_uuid.uuid   = "END1"
@@ -264,7 +264,7 @@ def test_sqlitedb_tools_get_kpis(sql_db):
 def test_sqlitedb_tools_delete_kpi(sql_db, create_kpi_request):
     LOGGER.warning('test_sqlitedb_tools_get_kpi begin')
 
-    response = sql_db.delete_KPI("DEV1",kpi_sample_types_pb2.KpiSampleType.PACKETS_TRANSMITTED)
+    response = sql_db.delete_KPI("DEV1",kpi_sample_types_pb2.KpiSampleType.KPISAMPLETYPE_PACKETS_TRANSMITTED)
 
     if response == False:
         kpi_description = create_kpi_request.kpi_description
@@ -274,7 +274,7 @@ def test_sqlitedb_tools_delete_kpi(sql_db, create_kpi_request):
         kpi_service_id = create_kpi_request.service_id.service_uuid.uuid
 
         sql_db.insert_KPI(kpi_description, kpi_sample_type, kpi_device_id, kpi_endpoint_id, kpi_service_id)
-        response = sql_db.delete_KPI("DEV1", kpi_sample_types_pb2.KpiSampleType.PACKETS_TRANSMITTED)
+        response = sql_db.delete_KPI("DEV1", kpi_sample_types_pb2.KpiSampleType.KPISAMPLETYPE_PACKETS_TRANSMITTED)
 
     assert response == True