From 3ca856bb6da82bfffdc589a15dcfc6b037b06c23 Mon Sep 17 00:00:00 2001
From: Javier Moreno <francisco.moreno.external@atos.net>
Date: Mon, 19 Sep 2022 18:36:47 +0200
Subject: [PATCH] Updated last commit
---
src/monitoring/tests/Messages.py | 5 +++++
src/monitoring/tests/test_unitary.py | 14 +++++++++++---
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/monitoring/tests/Messages.py b/src/monitoring/tests/Messages.py
index 450f6accc..b463d900b 100644
--- a/src/monitoring/tests/Messages.py
+++ b/src/monitoring/tests/Messages.py
@@ -64,6 +64,11 @@ def include_kpi_request(kpi_id):
_include_kpi_request.kpi_value.int32Val = 500 # pylint: disable=maybe-no-member
return _include_kpi_request
+def kpi_descriptor_list():
+ _kpi_descriptor_list = monitoring_pb2.KpiDescriptorList()
+
+ return _kpi_descriptor_list
+
def kpi_query():
_kpi_query = monitoring_pb2.KpiQuery()
diff --git a/src/monitoring/tests/test_unitary.py b/src/monitoring/tests/test_unitary.py
index 50d58c98d..5dc94db31 100644
--- a/src/monitoring/tests/test_unitary.py
+++ b/src/monitoring/tests/test_unitary.py
@@ -28,7 +28,7 @@ from common.message_broker.Factory import get_messagebroker_backend, BackendEnum
from common.message_broker.MessageBroker import MessageBroker
from common.proto import monitoring_pb2
from common.proto.monitoring_pb2 import KpiId, KpiDescriptor, KpiList, SubsDescriptor, SubsIDList, AlarmID, \
- AlarmDescriptor, AlarmIDList, Kpi
+ AlarmDescriptor, AlarmIDList, Kpi, KpiDescriptorList
from context.client.ContextClient import ContextClient
from context.service.grpc_server.ContextService import ContextService
@@ -46,7 +46,8 @@ from monitoring.service import SqliteTools, MetricsDBTools
from monitoring.service.MonitoringService import MonitoringService
from monitoring.service.EventTools import EventsDeviceCollector
from monitoring.tests.Messages import create_kpi_request, include_kpi_request, monitor_kpi_request, \
- create_kpi_request_b, create_kpi_request_c, kpi_query, subs_descriptor, subs_id, alarm_descriptor, alarm_id, kpi_id
+ create_kpi_request_b, create_kpi_request_c, kpi_query, subs_descriptor, subs_id, alarm_descriptor, alarm_id, kpi_id, \
+ kpi_descriptor_list
from monitoring.tests.Objects import DEVICE_DEV1, DEVICE_DEV1_CONNECT_RULES, DEVICE_DEV1_UUID
from monitoring.service.MonitoringServiceServicerImpl import LOGGER
@@ -189,7 +190,7 @@ def test_delete_kpi(monitoring_client): # pylint: disable=redefined-outer-name
LOGGER.debug(str(response))
assert isinstance(response, Empty)
-# Test case that makes use of client fixture to test server's GetInstantKpi method
+# Test case that makes use of client fixture to test server's GetKpiDescriptor method
def test_get_kpidescritor(monitoring_client): # pylint: disable=redefined-outer-name
LOGGER.warning('test_getkpidescritor_kpi begin')
response = monitoring_client.SetKpi(create_kpi_request_c())
@@ -198,6 +199,13 @@ def test_get_kpidescritor(monitoring_client): # pylint: disable=redefined-outer-
# LOGGER.debug(str(response))
assert isinstance(response, KpiDescriptor)
+# Test case that makes use of client fixture to test server's GetKpiDescriptor method
+def test_get_kpi_descriptor_list(monitoring_client): # pylint: disable=redefined-outer-name
+ LOGGER.warning('test_getkpidescritor_kpi begin')
+ response = monitoring_client.GetKpiDescriptorList(kpi_descriptor_list())
+ # LOGGER.debug(str(response))
+ assert isinstance(response, KpiDescriptorList)
+
# Test case that makes use of client fixture to test server's IncludeKpi method
def test_include_kpi(monitoring_client): # pylint: disable=redefined-outer-name
--
GitLab