Commit 81b23fd8 authored by Waleed Akbar's avatar Waleed Akbar
Browse files

Minor changes in Generic DB class.

parent c8d99dcb

src/common/tools/database/GenericDatabase.py

+0 −1
Original line number Diff line number Diff line
@@ -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)

src/common/tools/database/GenericEngine.py

+1 −1
Original line number Diff line number Diff line
@@ -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')

src/telemetry/frontend/service/TelemetryFrontendServiceServicerImpl.py

+0 −1
Original line number Diff line number Diff line
@@ -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

src/telemetry/tests/test_telemetryDB.py

+2 −1
Original line number Diff line number Diff line
@@ -26,3 +26,4 @@ def test_verify_databases_and_tables(): 
    TelemetryDBobj.create_database()

    TelemetryDBobj.create_tables()

    TelemetryDBobj.verify_tables()

    
 No newline at end of file