From accc7a2a223bc48b460099f4c0a466e494b04cfc Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Tue, 27 Aug 2024 16:45:08 +0200 Subject: [PATCH] Replace deprecated LegacyEngineFacade LegacyEngineFacade was deprecated in oslo.db 1.12.0 which was released in 2015. Change-Id: I5570698262617eae3f48cf29aacf2e23ad541e5f (cherry picked from commit 5c627a3aa366b1ac10d904cf994a52f0c1e3ec0e) (cherry picked from commit 8b0f1dbf6689790ed9305eaf513893ddfb743d8a) --- watcher/db/sqlalchemy/api.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/watcher/db/sqlalchemy/api.py b/watcher/db/sqlalchemy/api.py index 4bc30bdae..a03756ee5 100644 --- a/watcher/db/sqlalchemy/api.py +++ b/watcher/db/sqlalchemy/api.py @@ -22,7 +22,7 @@ import operator from oslo_config import cfg from oslo_db import exception as db_exc -from oslo_db.sqlalchemy import session as db_session +from oslo_db.sqlalchemy import enginefacade from oslo_db.sqlalchemy import utils as db_utils from oslo_utils import timeutils from sqlalchemy.inspection import inspect @@ -44,7 +44,8 @@ _FACADE = None def _create_facade_lazily(): global _FACADE if _FACADE is None: - _FACADE = db_session.EngineFacade.from_config(CONF) + ctx = enginefacade.transaction_context() + _FACADE = ctx.writer return _FACADE @@ -55,7 +56,8 @@ def get_engine(): def get_session(**kwargs): facade = _create_facade_lazily() - return facade.get_session(**kwargs) + sessionmaker = facade.get_sessionmaker() + return sessionmaker(**kwargs) def get_backend():