From 8782daa40324c8dd80824b007cb930df53658807 Mon Sep 17 00:00:00 2001 From: Boden R Date: Thu, 15 Nov 2018 15:26:49 -0700 Subject: [PATCH] stop using _get_collection_query from CommonDbMixin The _get_collection_query of CommonDbMixin is available via the model_query module in neutron-lib. This patch switches over to neutron-lib's implementation rather than using it from neutron's CommonDbMixin Change-Id: Iab35080ac9f1ad49e4d8dabf44980a9c4d32bac2 --- vmware_nsx/db/networkgw_db.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/vmware_nsx/db/networkgw_db.py b/vmware_nsx/db/networkgw_db.py index 78379b04d2..7afc9c5b7b 100644 --- a/vmware_nsx/db/networkgw_db.py +++ b/vmware_nsx/db/networkgw_db.py @@ -422,13 +422,10 @@ class NetworkGatewayMixin(networkgw.NetworkGatewayPluginBase): page_reverse=None): marker_obj = db_utils.get_marker_obj(self, context, 'gateway_device', limit, marker) - return self._get_collection_query(context, - nsx_models.NetworkGatewayDevice, - filters=filters, - sorts=sorts, - limit=limit, - marker_obj=marker_obj, - page_reverse=page_reverse) + return model_query.get_collection_query( + context, nsx_models.NetworkGatewayDevice, + filters=filters, sorts=sorts, limit=limit, + marker_obj=marker_obj, page_reverse=page_reverse) def get_gateway_devices(self, context, filters=None, fields=None, sorts=None, limit=None, marker=None,