Commit c8d99dcb authored by Waleed Akbar's avatar Waleed Akbar
Browse files

DB_NAME is moved to Generic_Engine class.

parent e30c0353

src/analytics/frontend/service/__main__.py

+1 −4
Original line number Diff line number Diff line
@@ -18,10 +18,7 @@ from common.Settings import get_log_level, get_metrics_port 
from .AnalyticsFrontendService import AnalyticsFrontendService

from analytics.database.AnalyzerModel import Analyzer as Model

from common.tools.database.GenericDatabase import Database

from common.Settings import get_setting





DB_NAME   = get_setting('CRDB_DATABASE', default=None)

terminate = threading.Event()

LOGGER    = None
@@ -42,7 +39,7 @@ def main(): 
    LOGGER.info('Starting...')



    # To create DB 

    kpiDBobj = Database(DB_NAME, Model)

    kpiDBobj = Database(Model)

    kpiDBobj.create_database()

    kpiDBobj.create_tables()

src/common/tools/database/GenericDatabase.py

+2 −3
Original line number Diff line number Diff line
@@ -23,11 +23,10 @@ from common.Settings import get_setting 
from common.method_wrappers.ServiceExceptions import (OperationFailedException, AlreadyExistsException)



LOGGER = logging.getLogger(__name__)

DB_NAME = get_setting('CRDB_DATABASE', default=None)



class Database:

    def __init__(self, model):

        self.db_engine = Engine.get_engine(DB_NAME)

        self.db_engine = Engine.get_engine()

        if self.db_engine is None:

            LOGGER.error('Unable to get SQLAlchemy DB Engine...')

            raise Exception('Failed to initialize the database engine.')
@@ -48,7 +47,7 @@ class Database: 
    def create_tables(self):

        try:

            self.db_model.metadata.create_all(self.db_engine)

            LOGGER.debug("Tables created in the database: {:}".format(self.db_name))

            LOGGER.debug("Tables created in the database: {:}".format(self.db_table))

        except Exception as e:

            LOGGER.debug("Tables cannot be created in the database. {:s}".format(str(e)))

            raise OperationFailedException ("Tables can't be created", extra_details=["unable to create table {:}".format(e)])

src/common/tools/database/GenericEngine.py

+2 −2
Original line number Diff line number Diff line
@@ -20,12 +20,12 @@ CRDB_URI_TEMPLATE = 'cockroachdb://{:s}:{:s}@cockroachdb-public.{:s}.svc.cluster 


class Engine:

    @staticmethod

    def get_engine(db_name) -> sqlalchemy.engine.Engine:

    def get_engine() -> sqlalchemy.engine.Engine:

        crdb_uri = get_setting('CRDB_URI', default=None)

        if crdb_uri is None:

            CRDB_NAMESPACE = get_setting('CRDB_NAMESPACE')

            CRDB_SQL_PORT  = get_setting('CRDB_SQL_PORT')

            CRDB_DATABASE  = db_name

            CRDB_DATABASE  = get_setting('CRDB_DATABASE', default=None)

            CRDB_USERNAME  = get_setting('CRDB_USERNAME')

            CRDB_PASSWORD  = get_setting('CRDB_PASSWORD')

            CRDB_SSLMODE   = get_setting('CRDB_SSLMODE')

src/kpi_manager/service/__main__.py

+1 −4
Original line number Diff line number Diff line
@@ -18,10 +18,7 @@ from .KpiManagerService import KpiManagerService 


from kpi_manager.database.KpiModel import Kpi as Model

from common.tools.database.GenericDatabase import Database

from common.Settings import get_setting





DB_NAME   = get_setting('CRDB_DATABASE', default=None)

terminate = threading.Event()

LOGGER    = None
@@ -42,7 +39,7 @@ def main(): 
    LOGGER.debug('Starting...')



    # To create DB 

    kpiDBobj = Database(DB_NAME, Model)

    kpiDBobj = Database(Model)

    kpiDBobj.create_database()

    kpiDBobj.create_tables()

src/telemetry/frontend/service/__main__.py

+1 −4
Original line number Diff line number Diff line
@@ -18,10 +18,7 @@ from common.Settings import get_log_level, get_metrics_port 
from .TelemetryFrontendService import TelemetryFrontendService

from telemetry.database.TelemetryModel import Collector as Model

from common.tools.database.GenericDatabase import Database

from common.Settings import get_setting





DB_NAME   = get_setting('CRDB_DATABASE', default=None)

terminate = threading.Event()

LOGGER = None
@@ -42,7 +39,7 @@ def main(): 
    LOGGER.info('Starting...')



    # To create DB 

    kpiDBobj = Database(DB_NAME, Model)

    kpiDBobj = Database(Model)

    kpiDBobj.create_database()

    kpiDBobj.create_tables()

src/analytics/database/Analyzer_DB.py

+1 −1

File changed.

Contains only whitespace changes.

src/analytics/frontend/tests/test_frontend.py

+1 −1

File changed.

Contains only whitespace changes.