openstack/octavia
Code Issues Proposed changes

Merge "[sqlalchemy2] Removal of cascade backrefs"

Browse Source
This commit is contained in:
Zuul 2023-07-07 17:53:52 +00:00 committed by Gerrit Code Review
commit 0952b629ab
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
octavia/db/models.py
View File

@ -353,7 +353,8 @@ class Pool(base_models.BASE, base_models.IdMixin, base_models.ProjectMixin,
"SessionPersistence", uselist=False, cascade="delete", "SessionPersistence", uselist=False, cascade="delete",
back_populates="pool") back_populates="pool")
_default_listeners = orm.relationship("Listener", uselist=True, _default_listeners = orm.relationship("Listener", uselist=True,
back_populates="default_pool") back_populates="default_pool",
cascade_backrefs=False)
l7policies = orm.relationship("L7Policy", uselist=True, l7policies = orm.relationship("L7Policy", uselist=True,
back_populates="redirect_pool") back_populates="redirect_pool")
_tags = orm.relationship( _tags = orm.relationship(
@ -573,7 +574,8 @@ class Listener(base_models.BASE, base_models.IdMixin,
load_balancer = orm.relationship("LoadBalancer", uselist=False, load_balancer = orm.relationship("LoadBalancer", uselist=False,
back_populates="listeners") back_populates="listeners")
default_pool = orm.relationship("Pool", uselist=False, default_pool = orm.relationship("Pool", uselist=False,
back_populates="_default_listeners") back_populates="_default_listeners",
cascade_backrefs=False)
sni_containers = orm.relationship( sni_containers = orm.relationship(
'SNI', cascade='all,delete-orphan', 'SNI', cascade='all,delete-orphan',
uselist=True, backref=orm.backref('listener', uselist=False)) uselist=True, backref=orm.backref('listener', uselist=False))

5
octavia/tests/fixtures.py
View File

@ -44,11 +44,6 @@ class WarningsFixture(fixtures.Fixture):
message='The current statement is being autocommitted ', message='The current statement is being autocommitted ',
category=sqla_exc.SADeprecationWarning) category=sqla_exc.SADeprecationWarning)
warnings.filterwarnings(
'ignore',
message='.* object is being merged into a Session along the ',
category=sqla_exc.SADeprecationWarning)
warnings.filterwarnings( warnings.filterwarnings(
'ignore', 'ignore',
message='The create_engine.convert_unicode parameter and ', message='The create_engine.convert_unicode parameter and ',