add ipa-findradiusclient search

2 files changed, 25 insertions, 0 deletions

diff --git a/ipa-python/ipaclient.py b/ipa-python/ipaclient.py
index 2d9b7a46..f487bec2 100644
--- a/ipa-python/ipaclient.py
+++ b/ipa-python/ipaclient.py
@@ -355,3 +355,14 @@ class IPAClient:
     def delete_radius_client(self,ip_addr):
         return self.transport.delete_radius_client(ip_addr)
 
+    def find_radius_clients(self, criteria, sattrs=None, searchlimit=0, timelimit=-1):
+        result = self.transport.find_radius_clients(criteria, sattrs, searchlimit, timelimit)
+        counter = result[0]
+
+        users = [counter]
+        for attrs in result[1:]:
+            if attrs is not None:
+                users.append(user.User(attrs))
+
+        return users
+
diff --git a/ipa-python/rpcclient.py b/ipa-python/rpcclient.py
index bf3f1bd9..e756058a 100644
--- a/ipa-python/rpcclient.py
+++ b/ipa-python/rpcclient.py
@@ -645,3 +645,17 @@ class RPCClient:
 
         return ipautil.unwrap_binary_data(result)
 
+    def find_radius_clients(self, criteria, sattrs=None, searchlimit=0, timelimit=-1):
+        server = self.setup_server()
+        try:
+            # None values are not allowed in XML-RPC
+            if sattrs is None:
+                sattrs = "__NONE__"
+            result = server.find_radius_clients(criteria, sattrs, searchlimit, timelimit)
+        except xmlrpclib.Fault, fault:
+            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
+        except socket.error, (value, msg):
+            raise xmlrpclib.Fault(value, msg)
+    
+        return ipautil.unwrap_binary_data(result)
+