From b17cb7f852c032bae109a97e02d5ea1a78364b63 Mon Sep 17 00:00:00 2001
From: Waleed Akbar <wakbar@cttc.es>
Date: Tue, 9 Jul 2024 09:37:43 +0000
Subject: [PATCH] some changes required to do the tests.
---
src/kpi_manager/service/database/Kpi_DB.py | 2 +-
.../{service => tests}/KPI_configs.json | 0
src/kpi_manager/tests/test_kpi_composer.py | 8 ++--
src/kpi_manager/tests/test_kpi_manager.py | 42 +++++++++----------
.../service/TelemetryBackendService.py | 2 +-
.../backend/tests/testTelemetryBackend.py | 18 ++++----
6 files changed, 36 insertions(+), 36 deletions(-)
rename src/kpi_manager/{service => tests}/KPI_configs.json (100%)
diff --git a/src/kpi_manager/service/database/Kpi_DB.py b/src/kpi_manager/service/database/Kpi_DB.py
index df03deba4..eafa38aad 100644
--- a/src/kpi_manager/service/database/Kpi_DB.py
+++ b/src/kpi_manager/service/database/Kpi_DB.py
@@ -31,7 +31,7 @@ class Kpi_DB:
return False
self.db_name = DB_NAME
# self.drop_database(self.db_engine) # added to test
- self.create_database(self.db_engine) # to add database
+ # self.create_database(self.db_engine) # to add database
self.Session = sessionmaker(bind=self.db_engine)
@staticmethod
diff --git a/src/kpi_manager/service/KPI_configs.json b/src/kpi_manager/tests/KPI_configs.json
similarity index 100%
rename from src/kpi_manager/service/KPI_configs.json
rename to src/kpi_manager/tests/KPI_configs.json
diff --git a/src/kpi_manager/tests/test_kpi_composer.py b/src/kpi_manager/tests/test_kpi_composer.py
index 6b96f4fc2..787ca6676 100644
--- a/src/kpi_manager/tests/test_kpi_composer.py
+++ b/src/kpi_manager/tests/test_kpi_composer.py
@@ -22,10 +22,10 @@ def test_compose_kpi():
LOGGER.info(' >>> test_compose_kpi START <<< ')
KpiValueComposer.compose_kpi()
-def test_request_kpi_descriptor_from_db():
- LOGGER.info(' >>> test_request_kpi_descriptor_from_db START <<< ')
- KpiValueComposer.request_kpi_descriptor_from_db()
+# def test_request_kpi_descriptor_from_db():
+# LOGGER.info(' >>> test_request_kpi_descriptor_from_db START <<< ')
+# KpiValueComposer.request_kpi_descriptor_from_db()
# def test_delete_kpi_by_id():
-# LOGGER.info(' >>> test_request_kpi_descriptor_from_db START <<< ')
+# LOGGER.info(' >>> test_test_delete_kpi_by_id START <<< ')
# KpiValueComposer.delete_kpi_by_id()
\ No newline at end of file
diff --git a/src/kpi_manager/tests/test_kpi_manager.py b/src/kpi_manager/tests/test_kpi_manager.py
index 977c85fb8..680847005 100755
--- a/src/kpi_manager/tests/test_kpi_manager.py
+++ b/src/kpi_manager/tests/test_kpi_manager.py
@@ -213,7 +213,7 @@ def kpi_manager_client(kpi_manager_service : KpiManagerService): # pylint: disab
# ---------- 2nd Iteration Tests -----------------
def test_SetKpiDescriptor(kpi_manager_client):
LOGGER.info(" >>> test_SetKpiDescriptor: START <<< ")
- with open("kpi_manager/service/KPI_configs.json", 'r') as file:
+ with open("kpi_manager/tests/KPI_configs.json", 'r') as file:
data = json.load(file)
_descriptors = data.get('KPIs', [])
for _descritor_name in _descriptors:
@@ -221,26 +221,26 @@ def test_SetKpiDescriptor(kpi_manager_client):
LOGGER.info("Response gRPC message object: {:}".format(response))
assert isinstance(response, KpiId)
-def test_GetKpiDescriptor(kpi_manager_client):
- LOGGER.info(" >>> test_GetKpiDescriptor: START <<< ")
- response = kpi_manager_client.GetKpiDescriptor(create_kpi_id_request())
- LOGGER.info("Response gRPC message object: {:}".format(response))
- assert isinstance(response, KpiDescriptor)
-
-def test_DeleteKpiDescriptor(kpi_manager_client):
- LOGGER.info(" >>> test_DeleteKpiDescriptor: START <<< ")
- response = kpi_manager_client.SetKpiDescriptor(create_kpi_descriptor_request())
- del_response = kpi_manager_client.DeleteKpiDescriptor(response)
- kpi_manager_client.GetKpiDescriptor(response)
- LOGGER.info("Response of delete method gRPC message object: {:}".format(del_response))
- assert isinstance(del_response, Empty)
-
-def test_SelectKpiDescriptor(kpi_manager_client):
- LOGGER.info(" >>> test_SelectKpiDescriptor: START <<< ")
- kpi_manager_client.SetKpiDescriptor(create_kpi_descriptor_request_a())
- response = kpi_manager_client.SelectKpiDescriptor(create_kpi_filter_request_a())
- LOGGER.info("Response gRPC message object: {:}".format(response))
- assert isinstance(response, KpiDescriptorList)
+# def test_GetKpiDescriptor(kpi_manager_client):
+# LOGGER.info(" >>> test_GetKpiDescriptor: START <<< ")
+# response = kpi_manager_client.GetKpiDescriptor(create_kpi_id_request())
+# LOGGER.info("Response gRPC message object: {:}".format(response))
+# assert isinstance(response, KpiDescriptor)
+
+# def test_DeleteKpiDescriptor(kpi_manager_client):
+# LOGGER.info(" >>> test_DeleteKpiDescriptor: START <<< ")
+# response = kpi_manager_client.SetKpiDescriptor(create_kpi_descriptor_request())
+# del_response = kpi_manager_client.DeleteKpiDescriptor(response)
+# kpi_manager_client.GetKpiDescriptor(response)
+# LOGGER.info("Response of delete method gRPC message object: {:}".format(del_response))
+# assert isinstance(del_response, Empty)
+
+# def test_SelectKpiDescriptor(kpi_manager_client):
+# LOGGER.info(" >>> test_SelectKpiDescriptor: START <<< ")
+# kpi_manager_client.SetKpiDescriptor(create_kpi_descriptor_request_a())
+# response = kpi_manager_client.SelectKpiDescriptor(create_kpi_filter_request_a())
+# LOGGER.info("Response gRPC message object: {:}".format(response))
+# assert isinstance(response, KpiDescriptorList)
# ------------- INITIAL TESTs ----------------
# Test case that makes use of client fixture to test server's CreateKpi method
diff --git a/src/telemetry/backend/service/TelemetryBackendService.py b/src/telemetry/backend/service/TelemetryBackendService.py
index ad0132e47..ef57ea8e8 100755
--- a/src/telemetry/backend/service/TelemetryBackendService.py
+++ b/src/telemetry/backend/service/TelemetryBackendService.py
@@ -152,7 +152,7 @@ class TelemetryBackendService:
if topic not in topic_metadata.topics:
# If the topic does not exist, create a new topic
print(f"Topic '{topic}' does not exist. Creating...")
- LOGGER.info("Topic {:} does not exist. Creating...")
+ LOGGER.warning("Topic {:} does not exist. Creating...".format(topic))
new_topic = NewTopic(topic, num_partitions=1, replication_factor=1)
ADMIN_KAFKA_CLIENT.create_topics([new_topic])
except KafkaException as e:
diff --git a/src/telemetry/backend/tests/testTelemetryBackend.py b/src/telemetry/backend/tests/testTelemetryBackend.py
index f8abc08cf..5f0697b72 100644
--- a/src/telemetry/backend/tests/testTelemetryBackend.py
+++ b/src/telemetry/backend/tests/testTelemetryBackend.py
@@ -36,18 +36,18 @@ def test_verify_kafka_topics():
LOGGER.debug(str(response))
assert isinstance(response, bool)
-def test_run_kafka_listener():
- LOGGER.info('test_receive_kafka_request requesting')
- TelemetryBackendServiceObj = TelemetryBackendService()
- response = TelemetryBackendServiceObj.run_kafka_listener()
- LOGGER.debug(str(response))
- assert isinstance(response, bool)
+# def test_run_kafka_listener():
+# LOGGER.info('test_receive_kafka_request requesting')
+# TelemetryBackendServiceObj = TelemetryBackendService()
+# response = TelemetryBackendServiceObj.run_kafka_listener()
+# LOGGER.debug(str(response))
+# assert isinstance(response, bool)
# def test_fetch_node_exporter_metrics():
# LOGGER.info(' >>> test_fetch_node_exporter_metrics START <<< ')
# TelemetryBackendService.fetch_single_node_exporter_metric()
-# def test_stream_node_export_metrics_to_raw_topic():
-# LOGGER.info(' >>> test_stream_node_export_metrics_to_raw_topic START <<< ')
-# threading.Thread(target=TelemetryBackendService.stream_node_export_metrics_to_raw_topic, args=()).start()
+def test_stream_node_export_metrics_to_raw_topic():
+ LOGGER.info(' >>> test_stream_node_export_metrics_to_raw_topic START <<< ')
+ threading.Thread(target=TelemetryBackendService.stream_node_export_metrics_to_raw_topic, args=()).start()
--
GitLab