db: Replace use of 'autoload' parameter
Resolve the following RemovedIn20Warning warnings: The autoload parameter is deprecated and will be removed in version 2.0. Please use the autoload_with parameter, passing an engine or connection. Signed-off-by: Stephen Finucane <stephenfin@redhat.com> Change-Id: I2a626bd60ecc824d9328d08e582d78d5cb568f5a
This commit is contained in:
parent
15f5e3f08a
commit
60e86b721e
|
@ -1409,8 +1409,9 @@ def purge_deleted(age, granularity='days', project_id=None, batch_size=20):
|
||||||
meta = sqlalchemy.MetaData()
|
meta = sqlalchemy.MetaData()
|
||||||
meta.bind = engine
|
meta.bind = engine
|
||||||
|
|
||||||
stack = sqlalchemy.Table('stack', meta, autoload=True)
|
with engine.connect() as conn, conn.begin():
|
||||||
service = sqlalchemy.Table('service', meta, autoload=True)
|
stack = sqlalchemy.Table('stack', meta, autoload_with=conn)
|
||||||
|
service = sqlalchemy.Table('service', meta, autoload_with=conn)
|
||||||
|
|
||||||
# Purge deleted services
|
# Purge deleted services
|
||||||
srvc_del = service.delete().where(service.c.deleted_at < time_line)
|
srvc_del = service.delete().where(service.c.deleted_at < time_line)
|
||||||
|
@ -1453,19 +1454,22 @@ def _purge_stacks(stack_infos, engine, meta):
|
||||||
action, status, name], ...]
|
action, status, name], ...]
|
||||||
"""
|
"""
|
||||||
|
|
||||||
stack = sqlalchemy.Table('stack', meta, autoload=True)
|
with engine.connect() as conn, conn.begin():
|
||||||
stack_lock = sqlalchemy.Table('stack_lock', meta, autoload=True)
|
stack = sqlalchemy.Table('stack', meta, autoload_with=conn)
|
||||||
stack_tag = sqlalchemy.Table('stack_tag', meta, autoload=True)
|
stack_lock = sqlalchemy.Table('stack_lock', meta, autoload_with=conn)
|
||||||
resource = sqlalchemy.Table('resource', meta, autoload=True)
|
stack_tag = sqlalchemy.Table('stack_tag', meta, autoload_with=conn)
|
||||||
resource_data = sqlalchemy.Table('resource_data', meta, autoload=True)
|
resource = sqlalchemy.Table('resource', meta, autoload_with=conn)
|
||||||
resource_properties_data = sqlalchemy.Table(
|
resource_data = sqlalchemy.Table(
|
||||||
'resource_properties_data', meta, autoload=True)
|
'resource_data', meta, autoload_with=conn)
|
||||||
event = sqlalchemy.Table('event', meta, autoload=True)
|
resource_properties_data = sqlalchemy.Table(
|
||||||
raw_template = sqlalchemy.Table('raw_template', meta, autoload=True)
|
'resource_properties_data', meta, autoload_with=conn)
|
||||||
raw_template_files = sqlalchemy.Table('raw_template_files', meta,
|
event = sqlalchemy.Table('event', meta, autoload_with=conn)
|
||||||
autoload=True)
|
raw_template = sqlalchemy.Table(
|
||||||
user_creds = sqlalchemy.Table('user_creds', meta, autoload=True)
|
'raw_template', meta, autoload_with=conn)
|
||||||
syncpoint = sqlalchemy.Table('sync_point', meta, autoload=True)
|
raw_template_files = sqlalchemy.Table(
|
||||||
|
'raw_template_files', meta, autoload_with=conn)
|
||||||
|
user_creds = sqlalchemy.Table('user_creds', meta, autoload_with=conn)
|
||||||
|
syncpoint = sqlalchemy.Table('sync_point', meta, autoload_with=conn)
|
||||||
|
|
||||||
stack_info_str = ','.join([str(i) for i in stack_infos])
|
stack_info_str = ','.join([str(i) for i in stack_infos])
|
||||||
LOG.info("Purging stacks %s", stack_info_str)
|
LOG.info("Purging stacks %s", stack_info_str)
|
||||||
|
|
|
@ -296,13 +296,6 @@ class WarningsFixture(fixtures.Fixture):
|
||||||
category=sqla_exc.SADeprecationWarning,
|
category=sqla_exc.SADeprecationWarning,
|
||||||
)
|
)
|
||||||
|
|
||||||
warnings.filterwarnings(
|
|
||||||
'ignore',
|
|
||||||
module='heat',
|
|
||||||
message='The autoload parameter is deprecated ',
|
|
||||||
category=sqla_exc.SADeprecationWarning,
|
|
||||||
)
|
|
||||||
|
|
||||||
warnings.filterwarnings(
|
warnings.filterwarnings(
|
||||||
'ignore',
|
'ignore',
|
||||||
module='heat',
|
module='heat',
|
||||||
|
|
Loading…
Reference in New Issue