x
/
group-based-policy
Code Issues Proposed changes

Merge "Use paginate_query from oslo_db"

This commit is contained in:
Jenkins 2017-06-15 16:03:29 +00:00 committed by Gerrit Code Review
parent 074ea874bb 552aa81c31
commit ebd8bcce5a
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gbpservice/nfp/orchestrator/db/common_db_mixin.py
View File

@ -13,7 +13,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from neutron.db import sqlalchemyutils from neutron_lib.db import utils as db_utils
from oslo_db.sqlalchemy import utils as sa_utils
import six import six
import weakref import weakref
@ -138,11 +139,15 @@ class CommonDbMixin(object):
page_reverse=False): page_reverse=False):
collection = self._model_query(session, model) collection = self._model_query(session, model)
collection = self._apply_filters_to_query(collection, model, filters) collection = self._apply_filters_to_query(collection, model, filters)
if limit and page_reverse and sorts: if sorts:
sorts = [(s[0], not s[1]) for s in sorts] sort_keys = db_utils.get_and_validate_sort_keys(sorts, model)
collection = sqlalchemyutils.paginate_query( sort_dirs = db_utils.get_sort_dirs(sorts, page_reverse)
collection, model, limit, collection = sa_utils.paginate_query(
sorts, marker_obj=marker_obj) collection, model, limit,
marker=marker_obj,
sort_keys=sort_keys,
sort_dirs=sort_dirs)
return collection return collection
def _get_collection(self, session, model, dict_func, filters=None, def _get_collection(self, session, model, dict_func, filters=None,