clean up attribute names

clean up command line args in ipa-delradiusclient

1 files changed, 12 insertions, 12 deletions

diff --git a/ipa-admintools/ipa-radiusclientmod b/ipa-admintools/ipa-radiusclientmod
index 3032a888..5f0eff94 100644
--- a/ipa-admintools/ipa-radiusclientmod
+++ b/ipa-admintools/ipa-radiusclientmod
@@ -36,8 +36,8 @@ import ldap
 
 #------------------------------------------------------------------------------
 
-attrs = radius_util.client_name_to_ldap_attr.keys()
-mandatory_attrs = ['Client-IP-Address']
+radius_attrs = radius_util.radius_client_attr_to_ldap_attr.keys()
+mandatory_radius_attrs = ['Client-IP-Address']
 
 #------------------------------------------------------------------------------
 
@@ -45,10 +45,10 @@ def help_option_callback(option, opt_str, value, parser, *args, **kwargs):
     parser.print_help()
     print
     print "Valid interative attributes are:"
-    print ipautil.format_list(attrs, quote='"')
+    print ipautil.format_list(radius_attrs, quote='"')
     print
     print "Required attributes are:"
-    print ipautil.format_list(mandatory_attrs, quote='"')
+    print ipautil.format_list(mandatory_radius_attrs, quote='"')
     sys.exit(0)
 
 def main():
@@ -105,8 +105,8 @@ def main():
 
     # Populate the pair list with pre-existing values
     prev_attrs = radius_client.attrList()
-    for attr in attrs:
-        pairs[attr] = radius_client.getValues(radius_util.client_name_to_ldap_attr[attr])
+    for attr in radius_attrs:
+        pairs[attr] = radius_client.getValues(radius_util.radius_client_attr_to_ldap_attr[attr])
 
     # Get pairs from a file or stdin
     if options.pair_file:
@@ -132,13 +132,13 @@ def main():
     # Get pairs interactively
     if options.interactive:
         # Remove any mandatory attriubtes which have been previously specified
-        interactive_mandatory_attrs = copy.copy(mandatory_attrs)
+        interactive_mandatory_attrs = copy.copy(mandatory_radius_attrs)
         for attr in pairs.keys():
             try:
                 interactive_mandatory_attrs.remove(attr)
             except ValueError:
                 pass
-        c = ipautil.AttributeValueCompleter(attrs, pairs)
+        c = ipautil.AttributeValueCompleter(radius_attrs, pairs)
         c.open()
         av = c.get_pairs("Enter: ", interactive_mandatory_attrs, validate)
         pairs.update(av)
@@ -154,7 +154,7 @@ def main():
         return 1
 
     valid = True
-    for attr in mandatory_attrs:
+    for attr in mandatory_radius_attrs:
         if not pairs.has_key(attr):
             valid = False
             print "ERROR, %s is mandatory, but has not been specified" % (attr)
@@ -164,12 +164,12 @@ def main():
     # Make sure each attribute is a member of the set of valid attributes
     valid = True
     for attr,value in pairs.items():
-        if attr not in attrs:
+        if attr not in radius_attrs:
             valid = False
             print "ERROR, %s is not a valid attribute" % (attr)
     if not valid:
         print "Valid attributes are:"
-        print ipautil.format_list(attrs, quote='"')
+        print ipautil.format_list(radius_attrs, quote='"')
         return 1
 
     # Makse sure each value is valid
@@ -188,7 +188,7 @@ def main():
 
     radius_client = ipa.radius_client.RadiusClient()
     for attr,value in pairs.items():
-        radius_client.setValue(radius_util.client_name_to_ldap_attr[attr], value)
+        radius_client.setValue(radius_util.radius_client_attr_to_ldap_attr[attr], value)
 
     try:
         ipa_client.update_radius_client(radius_client)