From 81b23fd8a52f49e2d5ca7ea7896564cdaa5221e7 Mon Sep 17 00:00:00 2001
From: Waleed Akbar <wakbar@cttc.es>
Date: Mon, 30 Sep 2024 17:18:52 +0000
Subject: [PATCH] Minor changes in Generic DB class.
---
src/common/tools/database/GenericDatabase.py | 1 -
src/common/tools/database/GenericEngine.py | 2 +-
.../frontend/service/TelemetryFrontendServiceServicerImpl.py | 1 -
src/telemetry/tests/test_telemetryDB.py | 3 ++-
4 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/common/tools/database/GenericDatabase.py b/src/common/tools/database/GenericDatabase.py
index bc73581e3..0cd41b9ef 100644
--- a/src/common/tools/database/GenericDatabase.py
+++ b/src/common/tools/database/GenericDatabase.py
@@ -30,7 +30,6 @@ class Database:
if self.db_engine is None:
LOGGER.error('Unable to get SQLAlchemy DB Engine...')
raise Exception('Failed to initialize the database engine.')
- self.db_name = DB_NAME
self.db_model = model
self.db_table = model.__name__
self.Session = sessionmaker(bind=self.db_engine)
diff --git a/src/common/tools/database/GenericEngine.py b/src/common/tools/database/GenericEngine.py
index 8c458285d..18bb15360 100644
--- a/src/common/tools/database/GenericEngine.py
+++ b/src/common/tools/database/GenericEngine.py
@@ -25,7 +25,7 @@ class Engine:
if crdb_uri is None:
CRDB_NAMESPACE = get_setting('CRDB_NAMESPACE')
CRDB_SQL_PORT = get_setting('CRDB_SQL_PORT')
- CRDB_DATABASE = get_setting('CRDB_DATABASE', default=None)
+ CRDB_DATABASE = get_setting('CRDB_DATABASE')
CRDB_USERNAME = get_setting('CRDB_USERNAME')
CRDB_PASSWORD = get_setting('CRDB_PASSWORD')
CRDB_SSLMODE = get_setting('CRDB_SSLMODE')
diff --git a/src/telemetry/frontend/service/TelemetryFrontendServiceServicerImpl.py b/src/telemetry/frontend/service/TelemetryFrontendServiceServicerImpl.py
index 61446fcf8..c72e66bdd 100644
--- a/src/telemetry/frontend/service/TelemetryFrontendServiceServicerImpl.py
+++ b/src/telemetry/frontend/service/TelemetryFrontendServiceServicerImpl.py
@@ -25,7 +25,6 @@ from common.proto.telemetry_frontend_pb2 import CollectorId, Collector, Collecto
from common.proto.telemetry_frontend_pb2_grpc import TelemetryFrontendServiceServicer
from telemetry.database.TelemetryModel import Collector as CollectorModel
-# from telemetry.database.Telemetry_DB import TelemetryDB
from telemetry.database.Telemetry_DB import TelemetryDB
from confluent_kafka import Consumer as KafkaConsumer
diff --git a/src/telemetry/tests/test_telemetryDB.py b/src/telemetry/tests/test_telemetryDB.py
index 0d5bd0584..6fc02f5e1 100644
--- a/src/telemetry/tests/test_telemetryDB.py
+++ b/src/telemetry/tests/test_telemetryDB.py
@@ -25,4 +25,5 @@ def test_verify_databases_and_tables():
# TelemetryDBobj.verify_tables()
TelemetryDBobj.create_database()
TelemetryDBobj.create_tables()
- TelemetryDBobj.verify_tables()
\ No newline at end of file
+ TelemetryDBobj.verify_tables()
+
\ No newline at end of file
--
GitLab