From c50b4191ca47093c5d141ba7afb1ae2dff092cb5 Mon Sep 17 00:00:00 2001
From: Waleed Akbar <wakbar@cttc.es>
Date: Thu, 6 Jun 2024 15:36:07 +0000
Subject: [PATCH] Kpidescriptor extracted from db
---
src/kpi_manager/service/KpiValueComposer.py | 6 +++++-
src/kpi_manager/service/database/Kpi_DB.py | 2 +-
src/kpi_manager/tests/test_kpi_composer.py | 10 +++++++---
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/kpi_manager/service/KpiValueComposer.py b/src/kpi_manager/service/KpiValueComposer.py
index 38b5b124a..1bdae0e46 100644
--- a/src/kpi_manager/service/KpiValueComposer.py
+++ b/src/kpi_manager/service/KpiValueComposer.py
@@ -21,6 +21,7 @@ from confluent_kafka import KafkaError
from confluent_kafka import Producer as KafkaProducer
from confluent_kafka import Consumer as KafkaConsumer
from kpi_manager.service.database.Kpi_DB import Kpi_DB
+from kpi_manager.service.database.KpiModel import Kpi as KpiModel
LOGGER = logging.getLogger(__name__)
KAFKA_SERVER_IP = '10.152.183.175:9092'
@@ -89,4 +90,7 @@ class KpiValueComposer:
def request_kpi_descriptor_from_db():
col_name = "kpi_description"
kpi_name = KPIs_TO_SEARCH[0]
- Kpi_DB.search_db_row_by_id()
+ kpiDBobj = Kpi_DB()
+
+ row = kpiDBobj.search_db_row_by_id(KpiModel, col_name, kpi_name)
+ LOGGER.info("Extracted Row: {:}".format(row))
diff --git a/src/kpi_manager/service/database/Kpi_DB.py b/src/kpi_manager/service/database/Kpi_DB.py
index fd5a1c319..06800605b 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)
+ # self.create_database(self.db_engine) # to add database
self.Session = sessionmaker(bind=self.db_engine)
@staticmethod
diff --git a/src/kpi_manager/tests/test_kpi_composer.py b/src/kpi_manager/tests/test_kpi_composer.py
index a4312ea53..5c1f7a265 100644
--- a/src/kpi_manager/tests/test_kpi_composer.py
+++ b/src/kpi_manager/tests/test_kpi_composer.py
@@ -18,6 +18,10 @@ from kpi_manager.service.KpiValueComposer import KpiValueComposer
LOGGER = logging.getLogger(__name__)
-def test_compose_kpi():
- LOGGER.info(' >>> test_compose_kpi START <<< ')
- KpiValueComposer.compose_kpi()
\ No newline at end of file
+# 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()
\ No newline at end of file
--
GitLab