remove radius_client.py, move contents to radius_util.py

4 files changed, 6 insertions, 10 deletions

diff --git a/ipa-admintools/ipa-addradiusclient b/ipa-admintools/ipa-addradiusclient
index 8c4015cf..bb5867c3 100644
--- a/ipa-admintools/ipa-addradiusclient
+++ b/ipa-admintools/ipa-addradiusclient
@@ -23,7 +23,6 @@ import os
 from optparse import OptionParser
 import copy
 
-from ipa.radius_client import *
 import ipa.ipaclient as ipaclient
 import ipa.ipautil as ipautil
 import ipa.config
@@ -121,7 +120,7 @@ def main():
                 pass
         c = ipautil.AttributeValueCompleter(radius_attrs, pairs)
         c.open()
-        av = c.get_pairs("Enter: ", interactive_mandatory_attrs, validate)
+        av = c.get_pairs("Enter: ", interactive_mandatory_attrs, radius_util.validate)
         pairs.update(av)
         c.close()
 
@@ -156,7 +155,7 @@ def main():
     # Makse sure each value is valid
     valid = True
     for attr,value in pairs.items():
-        if not validate(attr, value):
+        if not radius_util.validate(attr, value):
             valid = False
     if not valid:
         return 1
@@ -167,7 +166,7 @@ def main():
         for attr,value in pairs.items():
             print "\t%s = %s" % (attr, value)
 
-    radius_client = ipa.radius_client.RadiusClient()
+    radius_client = radius_util.RadiusClient()
     for attr,value in pairs.items():
         radius_client.setValue(radius_util.radius_client_attr_to_ldap_attr[attr], value)
 
diff --git a/ipa-admintools/ipa-delradiusclient b/ipa-admintools/ipa-delradiusclient
index dc1cee60..dd26e8ac 100644
--- a/ipa-admintools/ipa-delradiusclient
+++ b/ipa-admintools/ipa-delradiusclient
@@ -22,7 +22,6 @@ import os
 import sys
 from optparse import OptionParser
 import ipa
-from ipa.radius_client import *
 import ipa.ipaclient as ipaclient
 import ipa.ipavalidate as ipavalidate
 import ipa.config
diff --git a/ipa-admintools/ipa-findradiusclient b/ipa-admintools/ipa-findradiusclient
index fefe77bf..ade4bd39 100644
--- a/ipa-admintools/ipa-findradiusclient
+++ b/ipa-admintools/ipa-findradiusclient
@@ -22,7 +22,6 @@ import os
 import sys
 from optparse import OptionParser
 import ipa
-from ipa.radius_client import *
 from ipa import radius_util
 import ipa.ipaclient as ipaclient
 import ipa.ipavalidate as ipavalidate
diff --git a/ipa-admintools/ipa-radiusclientmod b/ipa-admintools/ipa-radiusclientmod
index 1877ed2e..cb87a40a 100644
--- a/ipa-admintools/ipa-radiusclientmod
+++ b/ipa-admintools/ipa-radiusclientmod
@@ -23,7 +23,6 @@ import os
 from optparse import OptionParser
 import copy
 
-from ipa.radius_client import *
 import ipa.ipaclient as ipaclient
 import ipa.ipautil as ipautil
 import ipa.config
@@ -90,7 +89,7 @@ def main():
     pairs['Client-IP-Address'] = ip_addr
 
     # Verify client previously exists and get current values
-    radius_client = ipa.radius_client.RadiusClient()
+    radius_client = radius_util.RadiusClient()
     ipa_client = ipaclient.IPAClient()
     try:
         radius_client = ipa_client.get_radius_client_by_ip_addr(ip_addr)
@@ -141,7 +140,7 @@ def main():
                 pass
         c = ipautil.AttributeValueCompleter(radius_attrs, pairs)
         c.open()
-        av = c.get_pairs("Enter: ", interactive_mandatory_attrs, validate)
+        av = c.get_pairs("Enter: ", interactive_mandatory_attrs, radius_util.validate)
         pairs.update(av)
         c.close()
 
@@ -176,7 +175,7 @@ def main():
     # Makse sure each value is valid
     valid = True
     for attr,value in pairs.items():
-        if not validate(attr, value):
+        if not radius_util.validate(attr, value):
             valid = False
     if not valid:
         return 1