diff --git a/lower-constraints.txt b/lower-constraints.txt index 31c08e8..71831b5 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -53,7 +53,7 @@ msgpack==0.5.6 munch==2.2.0 netaddr==0.7.19 netifaces==0.10.6 -neutron-lib==1.18.0 +neutron-lib==1.20.0 openstacksdk==0.12.0 os-client-config==1.29.0 os-service-types==1.2.0 diff --git a/neutron_taas/db/taas_db.py b/neutron_taas/db/taas_db.py index 3309ed6..3c7d6a6 100644 --- a/neutron_taas/db/taas_db.py +++ b/neutron_taas/db/taas_db.py @@ -21,6 +21,7 @@ from sqlalchemy.orm import exc from neutron.db import common_db_mixin as base_db from neutron_lib import constants from neutron_lib.db import model_base +from neutron_lib.db import model_query from neutron_lib.plugins import directory from neutron_taas.extensions import taas from oslo_config import cfg @@ -91,7 +92,7 @@ class Taas_db_Mixin(taas.TaasPluginBase, base_db.CommonDbMixin): def _get_tap_id_association(self, context, tap_service_id): try: - query = self._model_query(context, TapIdAssociation) + query = model_query.query_with_hooks(context, TapIdAssociation) return query.filter(TapIdAssociation.tap_service_id == tap_service_id).one() except exc.NoResultFound: diff --git a/requirements.txt b/requirements.txt index f58dcce..7f1a451 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0 Babel!=2.4.0,>=2.3.4 # BSD neutron>=12.0.0 # Apache-2.0 -neutron-lib>=1.18.0 # Apache-2.0 +neutron-lib>=1.20.0 # Apache-2.0 # Opt-in for neutron-lib consumption patches # http://lists.openstack.org/pipermail/openstack-dev/2018-September/135063.html