diff --git a/lower-constraints.txt b/lower-constraints.txt index 7eb982743..68c989976 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -52,7 +52,7 @@ msgpack-python==0.4.0 munch==2.1.0 netaddr==0.7.18 netifaces==0.10.4 -neutron-lib==1.18.0 +neutron-lib==1.20.0 neutron==12.0.0 openstackdocstheme==1.18.1 openstacksdk==0.11.2 diff --git a/neutron_lbaas/db/loadbalancer/loadbalancer_dbv2.py b/neutron_lbaas/db/loadbalancer/loadbalancer_dbv2.py index 244af4f5e..5cd090996 100644 --- a/neutron_lbaas/db/loadbalancer/loadbalancer_dbv2.py +++ b/neutron_lbaas/db/loadbalancer/loadbalancer_dbv2.py @@ -23,6 +23,7 @@ from neutron_lib.callbacks import registry from neutron_lib.callbacks import resources from neutron_lib import constants as n_const from neutron_lib.db import api as db_api +from neutron_lib.db import model_query from neutron_lib import exceptions as n_exc from neutron_lib.plugins import constants as pg_const from neutron_lib.plugins import directory @@ -68,7 +69,7 @@ class LoadBalancerPluginDbv2(base_db.CommonDbMixin, # To lock the instance for update, return a single # instance, instead of an instance with LEFT OUTER # JOINs that do not work in PostgreSQL - query = self._model_query(context, model).options( + query = model_query.query_with_hooks(context, model).options( lazyload('*') ).filter( model.id == id).with_lockmode('update') @@ -252,7 +253,7 @@ class LoadBalancerPluginDbv2(base_db.CommonDbMixin, with context.session.begin(subtransactions=True): if issubclass(model, models.LoadBalancer): try: - model_db = (self._model_query(context, model). + model_db = (model_query.query_with_hooks(context, model). filter(model.id == id). options(orm.noload('vip_port')). one()) diff --git a/requirements.txt b/requirements.txt index 32131a8c0..12fbab9cf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0 eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT requests>=2.14.2 # Apache-2.0 netaddr>=0.7.18 # BSD -neutron-lib>=1.18.0 # Apache-2.0 +neutron-lib>=1.20.0 # Apache-2.0 neutron>=12.0.0 # Apache-2.0 SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT alembic>=0.8.10 # MIT