Loading src/monitoring/service/monitoring_server.py +13 −1 Original line number Diff line number Diff line Loading @@ -66,7 +66,6 @@ class MonitoringServiceServicerImpl(monitoring_pb2_grpc.MonitoringServiceService kpi = get_Kpi(request.kpi_id) monitor_device_request.kpi.kpi_id.kpi_id.uuid = kpi.kpi_id.kpi_id.uuid monitor_device_request.connexion_time_s = request.connexion_time_s monitor_device_request.sample_rate_ms = request.sample_rate_ms Loading @@ -81,12 +80,25 @@ class MonitoringServiceServicerImpl(monitoring_pb2_grpc.MonitoringServiceService # Some code device to perform its actions LOGGER.info('MonitorDeviceKpi') # Notify device about monitoring return context_pb2.Empty() # rpc IncludeKpi(IncludeKpiRequest) returns(context.Empty) {} def IncludeKpi(self, request : monitoring_pb2.IncludeKpiRequest, context) -> context_pb2.Empty: LOGGER.info('IncludeKpi') kpi = get_Kpi(request.kpi_id) time_stamp = request.time_stamp kpi_value = request.kpi_value # Build the structure to be included as point in the influxDB # Send the Kpi point to the influxDB return context_pb2.Empty() Loading src/monitoring/tests/test_monitoring.py +13 −2 Original line number Diff line number Diff line Loading @@ -94,6 +94,17 @@ def monitor_device_kpi_request(): return monitor_device_kpi_request @pytest.fixture(scope='session') def include_kpi_request(): LOGGER.warning('test_include_kpi begin') include_kpi_request = monitoring_pb2.IncludeKpiRequest() include_kpi_request.kpi_id.kpi_id.uuid = 'KPIID0000' include_kpi_request.time_stamp = "2021-10-12T13:14:42Z" include_kpi_request.kpi_value.intVal = 500 return include_kpi_request ########################### # Tests Implementation ########################### Loading Loading @@ -121,10 +132,10 @@ def test_monitor_device_kpi(monitoring_client,monitor_device_kpi_request): assert isinstance(response, context_pb2.Empty) # Test case that makes use of client fixture to test server's IncludeKpi method def test_include_kpi(monitoring_client,kpi_request): def test_include_kpi(monitoring_client,include_kpi_request): # make call to server LOGGER.warning('test_include_kpi requesting') response = monitoring_client.IncludeKpi(kpi_request) response = monitoring_client.IncludeKpi(include_kpi_request) LOGGER.debug(str(response)) assert isinstance(response, context_pb2.Empty) Loading Loading
src/monitoring/service/monitoring_server.py +13 −1 Original line number Diff line number Diff line Loading @@ -66,7 +66,6 @@ class MonitoringServiceServicerImpl(monitoring_pb2_grpc.MonitoringServiceService kpi = get_Kpi(request.kpi_id) monitor_device_request.kpi.kpi_id.kpi_id.uuid = kpi.kpi_id.kpi_id.uuid monitor_device_request.connexion_time_s = request.connexion_time_s monitor_device_request.sample_rate_ms = request.sample_rate_ms Loading @@ -81,12 +80,25 @@ class MonitoringServiceServicerImpl(monitoring_pb2_grpc.MonitoringServiceService # Some code device to perform its actions LOGGER.info('MonitorDeviceKpi') # Notify device about monitoring return context_pb2.Empty() # rpc IncludeKpi(IncludeKpiRequest) returns(context.Empty) {} def IncludeKpi(self, request : monitoring_pb2.IncludeKpiRequest, context) -> context_pb2.Empty: LOGGER.info('IncludeKpi') kpi = get_Kpi(request.kpi_id) time_stamp = request.time_stamp kpi_value = request.kpi_value # Build the structure to be included as point in the influxDB # Send the Kpi point to the influxDB return context_pb2.Empty() Loading
src/monitoring/tests/test_monitoring.py +13 −2 Original line number Diff line number Diff line Loading @@ -94,6 +94,17 @@ def monitor_device_kpi_request(): return monitor_device_kpi_request @pytest.fixture(scope='session') def include_kpi_request(): LOGGER.warning('test_include_kpi begin') include_kpi_request = monitoring_pb2.IncludeKpiRequest() include_kpi_request.kpi_id.kpi_id.uuid = 'KPIID0000' include_kpi_request.time_stamp = "2021-10-12T13:14:42Z" include_kpi_request.kpi_value.intVal = 500 return include_kpi_request ########################### # Tests Implementation ########################### Loading Loading @@ -121,10 +132,10 @@ def test_monitor_device_kpi(monitoring_client,monitor_device_kpi_request): assert isinstance(response, context_pb2.Empty) # Test case that makes use of client fixture to test server's IncludeKpi method def test_include_kpi(monitoring_client,kpi_request): def test_include_kpi(monitoring_client,include_kpi_request): # make call to server LOGGER.warning('test_include_kpi requesting') response = monitoring_client.IncludeKpi(kpi_request) response = monitoring_client.IncludeKpi(include_kpi_request) LOGGER.debug(str(response)) assert isinstance(response, context_pb2.Empty) Loading