privilege: Use IPAAnsibleModule class

ipaadmin_variables are handled by IPAAnsibleModule,
ansible_module.params_get is used to get the parameters and
ansible_module.ipa_connect is used to simplify the module.

plugins/modules/ipaprivilege.py

@@ -34,13 +34,9 @@ DOCUMENTATION = """
 module: ipaprivilege
 short description: Manage FreeIPA privilege
 description: Manage FreeIPA privilege and privilege members
+extends_documentation_fragment:
+  - ipamodule_base_docs
 options:
-  ipaadmin_principal:
-    description: The admin principal.
-    default: admin
-  ipaadmin_password:
-    description: The admin password.
-    required: false
   name:
     description: The list of privilege name strings.
     required: true
@@ -111,10 +107,8 @@ RETURN = """
 """
 
 
-from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.ansible_freeipa_module import \
-    temp_kinit, temp_kdestroy, valid_creds, api_connect, api_command, \
+    IPAAnsibleModule, compare_args_ipa, gen_add_del_lists
-    compare_args_ipa, module_params_get, gen_add_del_lists
 import six
 
 if six.PY3:
@@ -124,7 +118,7 @@ if six.PY3:
 def find_privilege(module, name):
     """Find if a privilege with the given name already exist."""
     try:
-        _result = api_command(module, "privilege_show", name, {"all": True})
+        _result = module.ipa_command("privilege_show", name, {"all": True})
     except Exception:  # pylint: disable=broad-except
         # An exception is raised if privilege name is not found.
         return None
@@ -133,12 +127,9 @@ def find_privilege(module, name):
 
 
 def main():
-    ansible_module = AnsibleModule(
+    ansible_module = IPAAnsibleModule(
         argument_spec=dict(
             # general
-            ipaadmin_principal=dict(type="str", default="admin"),
-            ipaadmin_password=dict(type="str", required=False, no_log=True),
-
             name=dict(type="list", aliases=["cn"],
                       default=None, required=True),
             # present
@@ -160,19 +151,16 @@ def main():
     # Get parameters
 
     # general
-    ipaadmin_principal = module_params_get(ansible_module,
+    names = ansible_module.params_get("name")
-                                           "ipaadmin_principal")
-    ipaadmin_password = module_params_get(ansible_module, "ipaadmin_password")
-    names = module_params_get(ansible_module, "name")
 
     # present
-    description = module_params_get(ansible_module, "description")
+    description = ansible_module.params_get("description")
-    permission = module_params_get(ansible_module, "permission")
+    permission = ansible_module.params_get("permission")
-    rename = module_params_get(ansible_module, "rename")
+    rename = ansible_module.params_get("rename")
-    action = module_params_get(ansible_module, "action")
+    action = ansible_module.params_get("action")
 
     # state
-    state = module_params_get(ansible_module, "state")
+    state = ansible_module.params_get("state")
 
     # Check parameters
     invalid = []
@@ -211,13 +199,9 @@ def main():
 
     changed = False
     exit_args = {}
-    ccache_dir = None
+
-    ccache_name = None
+    # Connect to IPA API
-    try:
+    with ansible_module.ipa_connect():
-        if not valid_creds(ansible_module, ipaadmin_principal):
-            ccache_dir, ccache_name = temp_kinit(ipaadmin_principal,
-                                                 ipaadmin_password)
-        api_connect()
 
         commands = []
         for name in names:
@@ -328,8 +312,7 @@ def main():
 
         for name, command, args in commands:
             try:
-                result = api_command(ansible_module, command, name,
+                result = ansible_module.ipa_command(command, name, args)
-                                     args)
                 if "completed" in result:
                     if result["completed"] > 0:
                         changed = True
@@ -354,12 +337,6 @@ def main():
             if len(errors) > 0:
                 ansible_module.fail_json(msg=", ".join(errors))
 
-    except Exception as e:
-        ansible_module.fail_json(msg=str(e))
-
-    finally:
-        temp_kdestroy(ccache_dir, ccache_name)
-
     # Done
 
     ansible_module.exit_json(changed=changed, **exit_args)