diff --git a/plugins/modules/ipaautomountmap.py b/plugins/modules/ipaautomountmap.py
index bf0c438e360eab2915d26e4d1537b0bdc203697b..ca3c33d8d75c0691992944746f8bec99fb8015a3 100644
--- a/plugins/modules/ipaautomountmap.py
+++ b/plugins/modules/ipaautomountmap.py
@@ -106,7 +106,7 @@ RETURN = '''
'''
from ansible.module_utils.ansible_freeipa_module import (
- IPAAnsibleModule, compare_args_ipa
+ IPAAnsibleModule, compare_args_ipa, ipalib_errors
)
@@ -124,7 +124,7 @@ class AutomountMap(IPAAnsibleModule):
location,
{"automountmapname": name, "all": True}
)
- except Exception: # pylint: disable=broad-except
+ except ipalib_errors.NotFound:
return None
return response["result"]
@@ -132,7 +132,7 @@ class AutomountMap(IPAAnsibleModule):
"""Check if 'name' is an indirect map for 'parentmap'."""
try:
maps = self.ipa_command("automountmap_find", location, {})
- except Exception: # pylint: disable=broad-except
+ except ipalib_errors.NotFound:
return []
result = []
diff --git a/plugins/modules/ipaconfig.py b/plugins/modules/ipaconfig.py
index da57e7cc385413870b54d3d79a76f2996fb15dc0..c80da429372b5cd737babaafb324544b3eb6ff37 100644
--- a/plugins/modules/ipaconfig.py
+++ b/plugins/modules/ipaconfig.py
@@ -356,7 +356,7 @@ def config_show(module):
def get_netbios_name(module):
try:
_result = module.ipa_command_no_name("trustconfig_show", {"all": True})
- except Exception: # pylint: disable=broad-except
+ except ipalib_errors.NotFound:
return None
return _result["result"]["ipantflatname"][0]
diff --git a/plugins/modules/ipadelegation.py b/plugins/modules/ipadelegation.py
index 7dba924ab9fb27bef78ee91dafe3085837427676..2e1409815d50d4011ccf990ce4151c6fabf6e42a 100644
--- a/plugins/modules/ipadelegation.py
+++ b/plugins/modules/ipadelegation.py
@@ -124,14 +124,14 @@ RETURN = """
from ansible.module_utils.ansible_freeipa_module import \
- IPAAnsibleModule, compare_args_ipa
+ IPAAnsibleModule, compare_args_ipa, ipalib_errors
def find_delegation(module, name):
"""Find if a delegation with the given name already exist."""
try:
_result = module.ipa_command("delegation_show", name, {"all": True})
- except Exception: # pylint: disable=broad-except
+ except ipalib_errors.NotFound:
# An exception is raised if delegation name is not found.
return None
return _result["result"]
diff --git a/plugins/modules/ipaidoverridegroup.py b/plugins/modules/ipaidoverridegroup.py
index 4432596c64fb61305dcf36ea43ac0ab52527b4ef..b3e5e4d470330f1ee075b976d1d0128e8fb62bb6 100644
--- a/plugins/modules/ipaidoverridegroup.py
+++ b/plugins/modules/ipaidoverridegroup.py
@@ -155,7 +155,7 @@ RETURN = """
from ansible.module_utils.ansible_freeipa_module import \
- IPAAnsibleModule, compare_args_ipa
+ IPAAnsibleModule, compare_args_ipa, ipalib_errors
from ansible.module_utils import six
if six.PY3:
@@ -168,7 +168,7 @@ def find_idoverridegroup(module, idview, anchor):
_result = module.ipa_command("idoverridegroup_show", idview,
{"ipaanchoruuid": anchor,
"all": True})
- except Exception: # pylint: disable=broad-except
+ except ipalib_errors.NotFound:
# An exception is raised if idoverridegroup anchor is not found.
return None
return _result["result"]
diff --git a/plugins/modules/ipaidoverrideuser.py b/plugins/modules/ipaidoverrideuser.py
index 9bae4c93128d2ca86c514ac9ebe8a2ba5c24f06a..3d44d39b6bf14f4c8d727df7acf8cd6c28be7464 100644
--- a/plugins/modules/ipaidoverrideuser.py
+++ b/plugins/modules/ipaidoverrideuser.py
@@ -315,7 +315,8 @@ RETURN = """
from ansible.module_utils.ansible_freeipa_module import \
IPAAnsibleModule, compare_args_ipa, gen_add_del_lists, gen_add_list, \
- gen_intersection_list, encode_certificate, convert_input_certificates
+ gen_intersection_list, encode_certificate, convert_input_certificates, \
+ ipalib_errors
from ansible.module_utils import six
if six.PY3:
@@ -328,7 +329,7 @@ def find_idoverrideuser(module, idview, anchor):
_result = module.ipa_command("idoverrideuser_show", idview,
{"ipaanchoruuid": anchor,
"all": True})
- except Exception: # pylint: disable=broad-except
+ except ipalib_errors.NotFound:
# An exception is raised if idoverrideuser anchor is not found.
return None
diff --git a/plugins/modules/ipaidp.py b/plugins/modules/ipaidp.py
index b30d60aabf4479a486f581c36ea847bdb6bae2af..d9034eb2b6836e09f6ec16906cc7d7105255b130 100644
--- a/plugins/modules/ipaidp.py
+++ b/plugins/modules/ipaidp.py
@@ -184,7 +184,8 @@ RETURN = """
from ansible.module_utils.ansible_freeipa_module import \
- IPAAnsibleModule, compare_args_ipa, template_str, urlparse
+ IPAAnsibleModule, compare_args_ipa, template_str, urlparse, \
+ ipalib_errors
from ansible.module_utils import six
from copy import deepcopy
import string
@@ -269,7 +270,7 @@ def find_idp(module, name):
"""Find if a idp with the given name already exist."""
try:
_result = module.ipa_command("idp_show", name, {"all": True})
- except Exception: # pylint: disable=broad-except
+ except ipalib_errors.NotFound:
# An exception is raised if idp name is not found.
return None
diff --git a/plugins/modules/ipaidrange.py b/plugins/modules/ipaidrange.py
index 5d70adbcf8995bcf36452c73e1a5762dc0c67091..60a2fdc78ecfbe0bed2af4c620c1a1716b05228e 100644
--- a/plugins/modules/ipaidrange.py
+++ b/plugins/modules/ipaidrange.py
@@ -143,7 +143,8 @@ RETURN = """
from ansible.module_utils.ansible_freeipa_module import \
- IPAAnsibleModule, compare_args_ipa, get_trusted_domain_sid_from_name
+ IPAAnsibleModule, compare_args_ipa, get_trusted_domain_sid_from_name, \
+ ipalib_errors
from ansible.module_utils import six
if six.PY3:
@@ -154,7 +155,7 @@ def find_idrange(module, name):
"""Find if a idrange with the given name already exist."""
try:
_result = module.ipa_command("idrange_show", name, {"all": True})
- except Exception: # pylint: disable=broad-except
+ except ipalib_errors.NotFound:
# An exception is raised if idrange name is not found.
return None
return _result["result"]
diff --git a/plugins/modules/ipaidview.py b/plugins/modules/ipaidview.py
index 9a10eef9aa8aa3246798ad6228593af170871cef..c26291d3e5c1f316dab12358fc3a83a337ced5c3 100644
--- a/plugins/modules/ipaidview.py
+++ b/plugins/modules/ipaidview.py
@@ -138,7 +138,7 @@ def find_idview(module, name):
"""Find if a idview with the given name already exist."""
try:
_result = module.ipa_command("idview_show", name, {"all": True})
- except Exception: # pylint: disable=broad-except
+ except ipalib_errors.NotFound:
# An exception is raised if idview name is not found.
return None
return _result["result"]
diff --git a/plugins/modules/ipalocation.py b/plugins/modules/ipalocation.py
index 667e77b280730a5fcbddb3539010c93758ff7b6d..cb5b43906245ff931eadcab88a59b5e4adb7bdf1 100644
--- a/plugins/modules/ipalocation.py
+++ b/plugins/modules/ipalocation.py
@@ -76,14 +76,14 @@ RETURN = """
from ansible.module_utils.ansible_freeipa_module import \
- IPAAnsibleModule, compare_args_ipa
+ IPAAnsibleModule, compare_args_ipa, ipalib_errors
def find_location(module, name):
"""Find if a location with the given name already exist."""
try:
_result = module.ipa_command("location_show", name, {"all": True})
- except Exception: # pylint: disable=broad-except
+ except ipalib_errors.NotFound:
# An exception is raised if location name is not found.
return None
return _result["result"]
diff --git a/plugins/modules/ipapermission.py b/plugins/modules/ipapermission.py
index 9d3d122d3084dd646943dc87f0e7fbccebbeb511..0c929451d79b3eb97ef0d32a5f4d5857938931c8 100644
--- a/plugins/modules/ipapermission.py
+++ b/plugins/modules/ipapermission.py
@@ -154,14 +154,14 @@ RETURN = """
from ansible.module_utils.ansible_freeipa_module import \
- IPAAnsibleModule, compare_args_ipa, to_text
+ IPAAnsibleModule, compare_args_ipa, to_text, ipalib_errors
def find_permission(module, name):
"""Find if a permission with the given name already exist."""
try:
_result = module.ipa_command("permission_show", name, {"all": True})
- except Exception: # pylint: disable=broad-except
+ except ipalib_errors.NotFound:
# An exception is raised if permission name is not found.
return None
_res = _result["result"]
diff --git a/plugins/modules/ipaprivilege.py b/plugins/modules/ipaprivilege.py
index 60033bd99e597f33dcebff5f8d1961d018399300..46df9136641c21e7c88802f3352e875024357077 100644
--- a/plugins/modules/ipaprivilege.py
+++ b/plugins/modules/ipaprivilege.py
@@ -124,7 +124,7 @@ RETURN = """
from ansible.module_utils.ansible_freeipa_module import \
IPAAnsibleModule, compare_args_ipa, gen_add_del_lists, gen_add_list, \
- gen_intersection_list
+ gen_intersection_list, ipalib_errors
from ansible.module_utils import six
if six.PY3:
@@ -135,7 +135,7 @@ def find_privilege(module, name):
"""Find if a privilege with the given name already exist."""
try:
_result = module.ipa_command("privilege_show", name, {"all": True})
- except Exception: # pylint: disable=broad-except
+ except ipalib_errors.NotFound:
# An exception is raised if privilege name is not found.
return None
return _result["result"]
diff --git a/plugins/modules/iparole.py b/plugins/modules/iparole.py
index ba77db9ac66a0d27b07285f1d788176e3b81ef2d..bf449839709d0d555e6a859a8619ef47069094f1 100644
--- a/plugins/modules/iparole.py
+++ b/plugins/modules/iparole.py
@@ -129,7 +129,7 @@ EXAMPLES = """
from ansible.module_utils._text import to_text
from ansible.module_utils.ansible_freeipa_module import \
IPAAnsibleModule, gen_add_del_lists, compare_args_ipa, \
- gen_intersection_list, ensure_fqdn
+ gen_intersection_list, ensure_fqdn, ipalib_errors
from ansible.module_utils import six
if six.PY3:
@@ -140,7 +140,7 @@ def find_role(module, name):
"""Find if a role with the given name already exist."""
try:
_result = module.ipa_command("role_show", name, {"all": True})
- except Exception: # pylint: disable=broad-except
+ except ipalib_errors.NotFound:
# An exception is raised if role name is not found.
return None
return _result["result"]
diff --git a/plugins/modules/ipaselfservice.py b/plugins/modules/ipaselfservice.py
index a7480ad6734932b843781ee556372852acb5f0d6..0a12d3e9083d4e2273e56865878e9328e21be21d 100644
--- a/plugins/modules/ipaselfservice.py
+++ b/plugins/modules/ipaselfservice.py
@@ -113,14 +113,14 @@ RETURN = """
from ansible.module_utils.ansible_freeipa_module import \
- IPAAnsibleModule, compare_args_ipa
+ IPAAnsibleModule, compare_args_ipa, ipalib_errors
def find_selfservice(module, name):
"""Find if a selfservice with the given name already exist."""
try:
_result = module.ipa_command("selfservice_show", name, {"all": True})
- except Exception: # pylint: disable=broad-except
+ except ipalib_errors.NotFound:
# An exception is raised if selfservice name is not found.
return None
return _result["result"]
diff --git a/plugins/modules/ipaserver.py b/plugins/modules/ipaserver.py
index 35755ae1355c4e62e9a1491452ef91ebfa3f9963..5b76d8a6a235d0850d6dae7d479de56268344be5 100644
--- a/plugins/modules/ipaserver.py
+++ b/plugins/modules/ipaserver.py
@@ -192,14 +192,14 @@ RETURN = """
from ansible.module_utils.ansible_freeipa_module import \
- IPAAnsibleModule, compare_args_ipa, DNSName
+ IPAAnsibleModule, compare_args_ipa, DNSName, ipalib_errors
def find_server(module, name):
"""Find if a server with the given name already exist."""
try:
_result = module.ipa_command("server_show", name, {"all": True})
- except Exception: # pylint: disable=broad-except
+ except ipalib_errors.NotFound:
# An exception is raised if server name is not found.
return None
return _result["result"]
@@ -214,7 +214,7 @@ def server_role_status(module, name):
"include_master": True,
"raw": True,
"all": True})
- except Exception: # pylint: disable=broad-except
+ except ipalib_errors.NotFound:
# An exception is raised if server name is not found.
return None
return _result["result"][0]
diff --git a/plugins/modules/ipaservicedelegationrule.py b/plugins/modules/ipaservicedelegationrule.py
index 4b9e3435bb170a2fb1779e1a24035a22cc82186d..8e7f9585e999ee5eed22bcc7c420a388228e9e05 100644
--- a/plugins/modules/ipaservicedelegationrule.py
+++ b/plugins/modules/ipaservicedelegationrule.py
@@ -142,7 +142,7 @@ def find_servicedelegationrule(module, name):
try:
_result = module.ipa_command("servicedelegationrule_show", name,
{"all": True})
- except Exception: # pylint: disable=broad-except
+ except ipalib_errors.NotFound:
# An exception is raised if servicedelegationrule name is not found.
return None
return _result["result"]
diff --git a/plugins/modules/ipaservicedelegationtarget.py b/plugins/modules/ipaservicedelegationtarget.py
index 857083145f323a4e80f62b1a26ba5948aa5d99d2..34556a727f7388283fceaa42f83079c98c92dbf8 100644
--- a/plugins/modules/ipaservicedelegationtarget.py
+++ b/plugins/modules/ipaservicedelegationtarget.py
@@ -106,7 +106,7 @@ RETURN = """
from ansible.module_utils.ansible_freeipa_module import \
IPAAnsibleModule, gen_add_del_lists, gen_add_list, gen_intersection_list, \
- servicedelegation_normalize_principals
+ servicedelegation_normalize_principals, ipalib_errors
from ansible.module_utils import six
if six.PY3:
@@ -118,7 +118,7 @@ def find_servicedelegationtarget(module, name):
try:
_result = module.ipa_command("servicedelegationtarget_show", name,
{"all": True})
- except Exception: # pylint: disable=broad-except
+ except ipalib_errors.NotFound:
# An exception is raised if servicedelegationtarget name is not found.
return None
return _result["result"]
diff --git a/utils/templates/ipamodule+member.py.in b/utils/templates/ipamodule+member.py.in
index daa7fdd49b3d8a51658ed129a49df236c8b16781..714c0d7eb11ec6ebb42e30bf09ae1017ae0ae5c7 100644
--- a/utils/templates/ipamodule+member.py.in
+++ b/utils/templates/ipamodule+member.py.in
@@ -113,7 +113,7 @@ RETURN = """
from ansible.module_utils.ansible_freeipa_module import \
IPAAnsibleModule, compare_args_ipa, gen_add_del_lists, gen_add_list, \
- gen_intersection_list
+ gen_intersection_list, ipalib_errors
from ansible.module_utils import six
if six.PY3:
@@ -124,7 +124,7 @@ def find_$name(module, name):
"""Find if a $name with the given name already exist."""
try:
_result = module.ipa_command("$name_show", name, {"all": True})
- except Exception: # pylint: disable=broad-except
+ except ipalib_errors.NotFound:
# An exception is raised if $name name is not found.
return None
return _result["result"]
diff --git a/utils/templates/ipamodule.py.in b/utils/templates/ipamodule.py.in
index 0dc282dd6baf66fde262844d25b37b029c11e278..afb119a8a8cf553c576664090230fcee8abb145e 100644
--- a/utils/templates/ipamodule.py.in
+++ b/utils/templates/ipamodule.py.in
@@ -89,7 +89,7 @@ RETURN = """
from ansible.module_utils.ansible_freeipa_module import \
- IPAAnsibleModule, compare_args_ipa
+ IPAAnsibleModule, compare_args_ipa, ipalib_errors
from ansible.module_utils import six
if six.PY3:
@@ -100,7 +100,7 @@ def find_$name(module, name):
"""Find if a $name with the given name already exist."""
try:
_result = module.ipa_command("$name_show", name, {"all": True})
- except Exception: # pylint: disable=broad-except
+ except ipalib_errors.NotFound:
# An exception is raised if $name name is not found.
return None
return _result["result"]