From 022b407784ca199150833bdb5f94dca35d5591ac Mon Sep 17 00:00:00 2001 From: Gregory Thiemonge Date: Fri, 7 Oct 2022 20:48:51 +0200 Subject: [PATCH] [sqlalchemy2] Removal of cascade backrefs [0] https://docs.sqlalchemy.org/en/14/errors.html#\ object-is-being-merged-into-a-session-along-the-backref-cascade Change-Id: I4507d79bd49a325dae825088db22f49a93ddd6f3 --- octavia/db/models.py | 6 ++++-- octavia/tests/fixtures.py | 5 ----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/octavia/db/models.py b/octavia/db/models.py index 8057965c2a..731d18349b 100644 --- a/octavia/db/models.py +++ b/octavia/db/models.py @@ -353,7 +353,8 @@ class Pool(base_models.BASE, base_models.IdMixin, base_models.ProjectMixin, "SessionPersistence", uselist=False, cascade="delete", back_populates="pool") _default_listeners = orm.relationship("Listener", uselist=True, - back_populates="default_pool") + back_populates="default_pool", + cascade_backrefs=False) l7policies = orm.relationship("L7Policy", uselist=True, back_populates="redirect_pool") _tags = orm.relationship( @@ -573,7 +574,8 @@ class Listener(base_models.BASE, base_models.IdMixin, load_balancer = orm.relationship("LoadBalancer", uselist=False, back_populates="listeners") default_pool = orm.relationship("Pool", uselist=False, - back_populates="_default_listeners") + back_populates="_default_listeners", + cascade_backrefs=False) sni_containers = orm.relationship( 'SNI', cascade='all,delete-orphan', uselist=True, backref=orm.backref('listener', uselist=False)) diff --git a/octavia/tests/fixtures.py b/octavia/tests/fixtures.py index 1f86a9a871..bf5f9f3175 100644 --- a/octavia/tests/fixtures.py +++ b/octavia/tests/fixtures.py @@ -44,11 +44,6 @@ class WarningsFixture(fixtures.Fixture): message='The current statement is being autocommitted ', category=sqla_exc.SADeprecationWarning) - warnings.filterwarnings( - 'ignore', - message='.* object is being merged into a Session along the ', - category=sqla_exc.SADeprecationWarning) - warnings.filterwarnings( 'ignore', message='The create_engine.convert_unicode parameter and ',