Replace removed DB methods with current ones

Replace removed Binary with LargeBinary import
Remove reflect=True from Alembic MetaData
Replace removed idle_timeout with connection_recycle_time option

- Binary was removed in SQLAlchemy 1.4.x [1]
- SQLAlchemy was updated to 1.4.15 in u-c [2]
- idle_timeout was removed in oslo.db 10.0.0 [3]
- oslo.db was updated to 10.0.0 in u-c [4]
- idle_timeout was already deprecated and renamed as
  connection_recycle_time [5]

[1] https://github.com/sqlalchemy/sqlalchemy/issues/6263#issuecomment-819645247
[2] dc86260b28
[3] a857b83c9c
[4] f322cc13d8
[5] 6634218415

Change-Id: I13ec9c2b53174cfb2e3cb990ec773588cf68007c
This commit is contained in:
Martin Chacon Piza 2021-07-07 15:19:13 +02:00
parent 3d43cbec0f
commit 7466a2f962
3 changed files with 9 additions and 9 deletions

View File

@ -18,7 +18,7 @@
from sqlalchemy import Column
from sqlalchemy.ext import compiler
from sqlalchemy.sql import expression
from sqlalchemy import String, DateTime, Boolean, Integer, Binary, Float
from sqlalchemy import String, DateTime, Boolean, Integer, LargeBinary, Float
from sqlalchemy import MetaData
from sqlalchemy import Table
@ -76,14 +76,14 @@ def create_aa_model(metadata=None):
def create_md_model(metadata=None):
return Table('metric_dimension', metadata,
Column('dimension_set_id', Binary),
Column('dimension_set_id', LargeBinary),
Column('name', String(255)),
Column('value', String(255)))
def create_mde_model(metadata=None):
return Table('metric_definition', metadata,
Column('id', Binary),
Column('id', LargeBinary),
Column('name', String(255)),
Column('tenant_id', String(255)),
Column('region', String(255)))
@ -108,15 +108,15 @@ def create_nmt_model(metadata=None):
def create_mdd_model(metadata=None):
return Table('metric_definition_dimensions', metadata,
Column('id', Binary),
Column('metric_definition_id', Binary),
Column('metric_dimension_set_id', Binary))
Column('id', LargeBinary),
Column('metric_definition_id', LargeBinary),
Column('metric_dimension_set_id', LargeBinary))
def create_am_model(metadata=None):
return Table('alarm_metric', metadata,
Column('alarm_id', String(36)),
Column('metric_definition_dimensions_id', Binary))
Column('metric_definition_dimensions_id', LargeBinary))
def create_ad_model(metadata=None):

View File

@ -33,7 +33,7 @@ def _get_db_conf(conf_group, connection=None):
__autocommit=True,
expire_on_commit=False,
mysql_sql_mode=conf_group.mysql_sql_mode,
idle_timeout=conf_group.idle_timeout,
connection_recycle_time=conf_group.connection_recycle_time,
connection_debug=conf_group.connection_debug,
max_pool_size=conf_group.max_pool_size,
max_overflow=conf_group.max_overflow,

View File

@ -48,7 +48,7 @@ class Fingerprint(object):
@staticmethod
def _get_metadata(engine):
return MetaData(bind=engine, reflect=True)
return MetaData(bind=engine)
@staticmethod
def _get_schema_raw(metadata):