Merge "Remove obsolete *page[_marker] methods from LDAP backend."

2 files changed, 0 insertions, 78 deletions

diff --git a/keystone/common/ldap/core.py b/keystone/common/ldap/core.py
index 7760ba25..25f6a8fe 100644
--- a/keystone/common/ldap/core.py
+++ b/keystone/common/ldap/core.py
@@ -272,51 +272,6 @@ class BaseLdap(object):
         return [self._ldap_res_to_model(x)
                 for x in self._ldap_get_all(filter)]
 
-    def get_page(self, marker, limit):
-        return self._get_page(marker, limit, self.get_all())
-
-    def get_page_markers(self, marker, limit):
-        return self._get_page_markers(marker, limit, self.get_all())
-
-    @staticmethod
-    def _get_page(marker, limit, lst, key=lambda x: x.id):
-        lst.sort(key=key)
-        if not marker:
-            return lst[:limit]
-        else:
-            return [x for x in lst if key(x) > marker][:limit]
-
-    @staticmethod
-    def _get_page_markers(marker, limit, lst, key=lambda x: x.id):
-        if len(lst) < limit:
-            return (None, None)
-
-        lst.sort(key=key)
-        if marker is None:
-            if len(lst) <= limit + 1:
-                nxt = None
-            else:
-                nxt = key(lst[limit])
-            return (None, nxt)
-
-        i = 0
-        for i, item in enumerate(lst):
-            k = key(item)
-            if k >= marker:
-                break
-
-        if i <= limit:
-            prv = None
-        else:
-            prv = key(lst[i - limit])
-
-        if i + limit >= len(lst) - 1:
-            nxt = None
-        else:
-            nxt = key(lst[i + limit])
-
-        return (prv, nxt)
-
     def update(self, id, values, old_obj=None):
         if not self.allow_update:
             action = _('LDAP %s update') % self.options_name
diff --git a/keystone/identity/backends/ldap/core.py b/keystone/identity/backends/ldap/core.py
index 53a7d977..078a1deb 100644
--- a/keystone/identity/backends/ldap/core.py
+++ b/keystone/identity/backends/ldap/core.py
@@ -464,22 +464,6 @@ class UserApi(common_ldap.EnabledEmuMixIn, common_ldap.BaseLdap, ApiShimMixin):
         return self.role_api.add_user(values.role_id, values.user_id,
                                       values.tenant_id)
 
-    def users_get_page(self, marker, limit):
-        return self.get_page(marker, limit)
-
-    def users_get_page_markers(self, marker, limit):
-        return self.get_page_markers(marker, limit)
-
-    def users_get_by_project_get_page(self, tenant_id, role_id, marker, limit):
-        return self._get_page(marker,
-                              limit,
-                              self.project_api.get_users(tenant_id, role_id))
-
-    def users_get_by_project_get_page_markers(self, tenant_id, role_id,
-                                              marker, limit):
-        return self._get_page_markers(
-            marker, limit, self.project_api.get_users(tenant_id, role_id))
-
     def check_password(self, user_id, password):
         user = self.get(user_id)
         return utils.check_password(password, user.password)
@@ -553,15 +537,6 @@ class ProjectApi(common_ldap.EnabledEmuMixIn, common_ldap.BaseLdap,
             projects.append(self.get(project_id))
         return projects
 
-    def list_for_user_get_page(self, user, marker, limit):
-        return self._get_page(marker,
-                              limit,
-                              self.get_user_projects(user['id']))
-
-    def list_for_user_get_page_markers(self, user, marker, limit):
-        return self._get_page_markers(
-            marker, limit, self.get_user_projects(user['id']))
-
     def is_empty(self, id):
         tenant = self._ldap_get(id)
         members = tenant[1].get(self.member_attribute, [])
@@ -851,14 +826,6 @@ class RoleApi(common_ldap.BaseLdap, ApiShimMixin):
                     tenant_id=tenant_id))
         return res
 
-    def get_by_service_get_page(self, service_id, marker, limit):
-        all_roles = self.get_by_service(service_id)
-        return self._get_page(marker, limit, all_roles)
-
-    def get_by_service_get_page_markers(self, service_id, marker, limit):
-        all_roles = self.get_by_service(service_id)
-        return self._get_page_markers(marker, limit, all_roles)
-
     def roles_delete_subtree_by_project(self, tenant_id):
         conn = self.get_connection()
         query = '(objectClass=%s)' % self.object_class