stop using _apply_filters_to_query

The common_db_mixin will module eventually be removed from neutron as
its functionality is available via neutron-lib. This patch switches
uses of  _apply_filters_to_query() over to apply_filters() from
neutron-lib's model_query module.

Change-Id: Ia8f69dcb0896f6383bae87164f8b165fb98772d1
This commit is contained in:
Boden R 2018-11-14 15:00:01 -07:00
parent 22acff71d0
commit ddb130736a

View File

@ -21,6 +21,7 @@ from neutron.db import models_v2
from neutron_lib.api import validators
from neutron_lib import constants
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 oslo_log import log as logging
@ -547,7 +548,7 @@ class RouterSharedDriver(router_driver.RouterBaseDriver):
gw_ports_filter = {'network_id': conflict_ext_net_ids,
'device_owner': [l3_db.DEVICE_OWNER_ROUTER_GW]}
ports_qry = context.session.query(models_v2.Port)
gw_ports = self.plugin._apply_filters_to_query(
gw_ports = model_query.apply_filters(
ports_qry, models_v2.Port, gw_ports_filter).all()
return list(set([gw_port['device_id'] for gw_port in gw_ports]))