From d58a10362fb009527b44c7b6289f812561eaad4b Mon Sep 17 00:00:00 2001 From: Gary Kotton Date: Wed, 26 Apr 2017 22:59:51 -0700 Subject: [PATCH] Update changes for _get_marker_obj Part of the common db mixin refactor. Change-Id: I54d96cd7eaae20da40f33f7f3787435e807fcd4c Depends-On: I1e2da0687310cc2da767dc2a6d13500307bba1ee --- vmware_nsx/db/networkgw_db.py | 4 ++-- vmware_nsx/db/qos_db.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/vmware_nsx/db/networkgw_db.py b/vmware_nsx/db/networkgw_db.py index eae45318cd..5ed3130ec3 100644 --- a/vmware_nsx/db/networkgw_db.py +++ b/vmware_nsx/db/networkgw_db.py @@ -265,7 +265,7 @@ class NetworkGatewayMixin(networkgw.NetworkGatewayPluginBase): def get_network_gateways(self, context, filters=None, fields=None, sorts=None, limit=None, marker=None, page_reverse=False): - marker_obj = self._get_marker_obj( + marker_obj = db_utils.get_marker_obj(self, context, 'network_gateway', limit, marker) return model_query.get_collection(context, nsx_models.NetworkGateway, self._make_network_gateway_dict, @@ -420,7 +420,7 @@ class NetworkGatewayMixin(networkgw.NetworkGatewayPluginBase): filters=None, sorts=None, limit=None, marker=None, page_reverse=None): - marker_obj = self._get_marker_obj( + marker_obj = db_utils.get_marker_obj(self, context, 'gateway_device', limit, marker) return self._get_collection_query(context, nsx_models.NetworkGatewayDevice, diff --git a/vmware_nsx/db/qos_db.py b/vmware_nsx/db/qos_db.py index 7d12e5a34d..302b6bee76 100644 --- a/vmware_nsx/db/qos_db.py +++ b/vmware_nsx/db/qos_db.py @@ -63,7 +63,8 @@ class QoSDbMixin(qos.QueuePluginBase): def get_qos_queues(self, context, filters=None, fields=None, sorts=None, limit=None, marker=None, page_reverse=False): - marker_obj = self._get_marker_obj(context, 'qos_queue', limit, marker) + marker_obj = db_utils.get_marker_obj(self, context, 'qos_queue', + limit, marker) return model_query.get_collection(context, nsx_models.QoSQueue, self._make_qos_queue_dict, filters=filters, fields=fields,