From 910574a5cc3653226901b8c7e96d0827d5e52f9b Mon Sep 17 00:00:00 2001 From: Rodolfo Alonso Hernandez Date: Wed, 25 Jan 2023 03:45:26 +0100 Subject: [PATCH] Use SLQAlchemy ORM "relationship" instead of "relation" "relation" was deprecated in SQLAlchemy 1.4 [1]. [1]https://docs.sqlalchemy.org/en/14/orm/relationship_api.html#sqlalchemy.orm.relation Closes-Bug: #2004258 Change-Id: Ia37a178532860d52b2ed836f66b0f4ca73f8343c --- neutron/db/models/l3agent.py | 2 +- neutron/db/network_dhcp_agent_binding/models.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/neutron/db/models/l3agent.py b/neutron/db/models/l3agent.py index 8ca12b3786d..25510665262 100644 --- a/neutron/db/models/l3agent.py +++ b/neutron/db/models/l3agent.py @@ -33,7 +33,7 @@ class RouterL3AgentBinding(model_base.BASEV2): router_id = sa.Column(sa.String(36), sa.ForeignKey("routers.id", ondelete='CASCADE'), primary_key=True) - l3_agent = orm.relation(agent_model.Agent) + l3_agent = orm.relationship(agent_model.Agent) l3_agent_id = sa.Column(sa.String(36), sa.ForeignKey("agents.id", ondelete='CASCADE'), primary_key=True) diff --git a/neutron/db/network_dhcp_agent_binding/models.py b/neutron/db/network_dhcp_agent_binding/models.py index d3147df53fd..dfefc9904bd 100644 --- a/neutron/db/network_dhcp_agent_binding/models.py +++ b/neutron/db/network_dhcp_agent_binding/models.py @@ -33,7 +33,7 @@ class NetworkDhcpAgentBinding(model_base.BASEV2): network_id = sa.Column(sa.String(36), sa.ForeignKey("networks.id", ondelete='CASCADE'), primary_key=True) - dhcp_agent = orm.relation(agent_model.Agent, lazy='subquery') + dhcp_agent = orm.relationship(agent_model.Agent, lazy='subquery') dhcp_agent_id = sa.Column(sa.String(36), sa.ForeignKey("agents.id", ondelete='CASCADE'),