ldap: add nocache parameter to LdapClient.get_objects method
Some checks failed
Run tests / tests (push) Failing after 1m32s
Some checks failed
Run tests / tests (push) Failing after 1m32s
This commit is contained in:
parent
9e3faee819
commit
384e8a441d
1 changed files with 8 additions and 7 deletions
|
@ -575,6 +575,7 @@ class LdapClient:
|
||||||
warn=True,
|
warn=True,
|
||||||
paged_search=False,
|
paged_search=False,
|
||||||
pagesize=None,
|
pagesize=None,
|
||||||
|
nocache=False,
|
||||||
):
|
):
|
||||||
"""
|
"""
|
||||||
Retrieve objects from LDAP
|
Retrieve objects from LDAP
|
||||||
|
@ -592,9 +593,11 @@ class LdapClient:
|
||||||
(optional, default: False)
|
(optional, default: False)
|
||||||
:param pagesize: When using paged search, the page size
|
:param pagesize: When using paged search, the page size
|
||||||
(optional, default: see LdapServer.paged_search)
|
(optional, default: see LdapServer.paged_search)
|
||||||
|
:param nocache: If True, disable using cache
|
||||||
"""
|
"""
|
||||||
if name in self._cached_objects:
|
if name in self._cached_objects and not nocache:
|
||||||
log.debug("Retrieved %s objects from cache", name)
|
log.debug("Retrieved %s objects from cache", name)
|
||||||
|
objects = self._cached_objects[name]
|
||||||
else:
|
else:
|
||||||
assert self._conn or self.initialize()
|
assert self._conn or self.initialize()
|
||||||
log.debug(
|
log.debug(
|
||||||
|
@ -624,13 +627,11 @@ class LdapClient:
|
||||||
if not obj_dn or not isinstance(obj_attrs, dict):
|
if not obj_dn or not isinstance(obj_attrs, dict):
|
||||||
continue
|
continue
|
||||||
objects[obj_dn] = self._get_obj(obj_dn, obj_attrs)
|
objects[obj_dn] = self._get_obj(obj_dn, obj_attrs)
|
||||||
self._cached_objects[name] = objects
|
if not nocache:
|
||||||
|
self._cached_objects[name] = objects
|
||||||
if not key_attr or key_attr == "dn":
|
if not key_attr or key_attr == "dn":
|
||||||
return self._cached_objects[name]
|
return objects
|
||||||
return {
|
return {self.get_attr(objects[dn], key_attr): objects[dn] for dn in objects}
|
||||||
self.get_attr(self._cached_objects[name][dn], key_attr): self._cached_objects[name][dn]
|
|
||||||
for dn in self._cached_objects[name]
|
|
||||||
}
|
|
||||||
|
|
||||||
def get_object(self, type_name, object_name, filterstr, basedn, attrs, warn=True):
|
def get_object(self, type_name, object_name, filterstr, basedn, attrs, warn=True):
|
||||||
"""
|
"""
|
||||||
|
|
Loading…
Reference in a new issue