[Freeipa-devel] [PATCH] timelimit parameters
Kevin McCarthy
kmccarth at redhat.com
Thu Sep 27 22:46:19 UTC 2007
Make timelimit a parameter in the find methods.
-Kevin
-------------- next part --------------
# HG changeset patch
# User Kevin McCarthy <kmccarth at redhat.com>
# Date 1190933486 25200
# Node ID 11d7ba255e520dfc3fec3c705bab8e735a9e0863
# Parent a716a9835fd763d700d4f697f9ea20328344c64b
Make timelimit a parameter to the find methods.
diff -r a716a9835fd7 -r 11d7ba255e52 ipa-python/ipaclient.py
--- a/ipa-python/ipaclient.py Thu Sep 27 14:51:35 2007 -0700
+++ b/ipa-python/ipaclient.py Thu Sep 27 15:51:26 2007 -0700
@@ -108,11 +108,11 @@ class IPAClient:
result = self.transport.get_add_schema()
return result
- def find_users(self, criteria, sattrs=None, searchlimit=0):
+ def find_users(self, criteria, sattrs=None, searchlimit=0, timelimit=-1):
"""Return a list: counter followed by a User object for each user that
matches the criteria. If the results are truncated, counter will
be set to -1"""
- result = self.transport.find_users(criteria, sattrs, searchlimit)
+ result = self.transport.find_users(criteria, sattrs, searchlimit, timelimit)
counter = result[0]
users = [counter]
@@ -192,10 +192,10 @@ class IPAClient:
result = self.transport.add_group(group_dict, group_container)
return result
- def find_groups(self, criteria, sattrs=None, searchlimit=0):
+ def find_groups(self, criteria, sattrs=None, searchlimit=0, timelimit=-1):
"""Find groups whose cn matches the criteria. Wildcards are
acceptable. Returns a list of Group objects."""
- result = self.transport.find_groups(criteria, sattrs, searchlimit)
+ result = self.transport.find_groups(criteria, sattrs, searchlimit, timelimit)
counter = result[0]
groups = [counter]
diff -r a716a9835fd7 -r 11d7ba255e52 ipa-python/rpcclient.py
--- a/ipa-python/rpcclient.py Thu Sep 27 14:51:35 2007 -0700
+++ b/ipa-python/rpcclient.py Thu Sep 27 15:51:26 2007 -0700
@@ -167,7 +167,7 @@ class RPCClient:
return ipautil.unwrap_binary_data(result)
- def find_users (self, criteria, sattrs=None, searchlimit=0):
+ def find_users (self, criteria, sattrs=None, searchlimit=0, timelimit=-1):
"""Return a list: counter followed by a User object for each user that
matches the criteria. If the results are truncated, counter will
be set to -1"""
@@ -177,7 +177,7 @@ class RPCClient:
# None values are not allowed in XML-RPC
if sattrs is None:
sattrs = "__NONE__"
- result = server.find_users(criteria, sattrs, searchlimit)
+ result = server.find_users(criteria, sattrs, searchlimit, timelimit)
except xmlrpclib.Fault, fault:
raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
except socket.error, (value, msg):
@@ -309,7 +309,7 @@ class RPCClient:
except socket.error, (value, msg):
raise xmlrpclib.Fault(value, msg)
- def find_groups (self, criteria, sattrs=None, searchlimit=0):
+ def find_groups (self, criteria, sattrs=None, searchlimit=0, timelimit=-1):
"""Return a list containing a Group object for each group that matches
the criteria."""
@@ -318,7 +318,7 @@ class RPCClient:
# None values are not allowed in XML-RPC
if sattrs is None:
sattrs = "__NONE__"
- result = server.find_groups(criteria, sattrs, searchlimit)
+ result = server.find_groups(criteria, sattrs, searchlimit, timelimit)
except xmlrpclib.Fault, fault:
raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
except socket.error, (value, msg):
diff -r a716a9835fd7 -r 11d7ba255e52 ipa-server/ipa-gui/ipagui/controllers.py
--- a/ipa-server/ipa-gui/ipagui/controllers.py Thu Sep 27 14:51:35 2007 -0700
+++ b/ipa-server/ipa-gui/ipagui/controllers.py Thu Sep 27 15:51:26 2007 -0700
@@ -212,7 +212,7 @@ class Root(controllers.RootController):
uid = kw.get('uid')
if uid != None and len(uid) > 0:
try:
- users = client.find_users(uid.encode('utf-8'))
+ users = client.find_users(uid.encode('utf-8'), None, 0, 2)
counter = users[0]
users = users[1:]
if counter == -1:
@@ -612,7 +612,7 @@ class Root(controllers.RootController):
criteria = kw.get('criteria')
if criteria != None and len(criteria) > 0:
try:
- groups = client.find_groups(criteria.encode('utf-8'))
+ groups = client.find_groups(criteria.encode('utf-8'), None, 0, 2)
counter = groups[0]
groups = groups[1:]
if counter == -1:
diff -r a716a9835fd7 -r 11d7ba255e52 ipa-server/xmlrpc-server/funcs.py
--- a/ipa-server/xmlrpc-server/funcs.py Thu Sep 27 14:51:35 2007 -0700
+++ b/ipa-server/xmlrpc-server/funcs.py Thu Sep 27 15:51:26 2007 -0700
@@ -448,12 +448,10 @@ class IPAServer:
return users
- def find_users (self, criteria, sattrs=None, searchlimit=0, opts=None):
+ def find_users (self, criteria, sattrs=None, searchlimit=0, timelimit=-1,
+ opts=None):
"""Returns a list: counter followed by the results.
If the results are truncated, counter will be set to -1."""
-
- # TODO - retrieve from config
- timelimit = 2
# Assume the list of fields to search will come from a central
# configuration repository. A good format for that would be
@@ -664,13 +662,11 @@ class IPAServer:
finally:
self.releaseConnection(conn)
- def find_groups (self, criteria, sattrs=None, searchlimit=0, opts=None):
+ def find_groups (self, criteria, sattrs=None, searchlimit=0, timelimit=-1,
+ opts=None):
"""Return a list containing a User object for each
existing group that matches the criteria.
"""
-
- # TODO - retrieve from config
- timelimit = 2
# Assume the list of fields to search will come from a central
# configuration repository. A good format for that would be
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/x-pkcs7-signature
Size: 4054 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/freeipa-devel/attachments/20070927/45e60e52/attachment.bin>
More information about the Freeipa-devel
mailing list