Merging upstream version 9.4.0+dfsg.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 6 insertions, 4 deletions

diff --git a/ansible_collections/cisco/ise/plugins/plugin_utils/ise.py b/ansible_collections/cisco/ise/plugins/plugin_utils/ise.py
index 2a2dce924..fbb0843c2 100644
--- a/ansible_collections/cisco/ise/plugins/plugin_utils/ise.py
+++ b/ansible_collections/cisco/ise/plugins/plugin_utils/ise.py
@@ -13,7 +13,7 @@ except ImportError:
     ISE_SDK_IS_INSTALLED = False
 else:
     ISE_SDK_IS_INSTALLED = True
-from ansible.module_utils.basic import AnsibleModule, env_fallback
+from ansible.module_utils.basic import env_fallback
 
 try:
     from ansible.errors import AnsibleActionFail
@@ -133,11 +133,12 @@ def ise_argument_spec():
         ise_username=dict(type="str", fallback=(env_fallback, ['ISE_USERNAME']), required=True),
         ise_password=dict(type="str", fallback=(env_fallback, ['ISE_PASSWORD']), required=True, no_log=True),
         ise_verify=dict(type="bool", default=True, fallback=(env_fallback, ['ISE_VERIFY'])),
-        ise_version=dict(type="str", default="3.1_Patch_1", fallback=(env_fallback, ['ISE_VERSION'])),
+        ise_version=dict(type="str", default="3.2_beta", fallback=(env_fallback, ['ISE_VERSION'])),
         ise_wait_on_rate_limit=dict(type="bool", default=True, fallback=(env_fallback, ['ISE_WAIT_ON_RATE_LIMIT'])),
         ise_uses_api_gateway=dict(type="bool", default=True, fallback=(env_fallback, ['ISE_USES_API_GATEWAY'])),
         ise_uses_csrf_token=dict(type="bool", default=False, fallback=(env_fallback, ['ISE_USES_CSRF_TOKEN'])),
         ise_debug=dict(type="bool", default=False, fallback=(env_fallback, ['ISE_DEBUG'])),
+        ise_single_request_timeout=dict(type="int", default=60, fallback=(env_fallback, ['ISE_SINGLE_REQUEST_TIMEOUT'])),
     )
     return argument_spec
 
@@ -172,6 +173,7 @@ class ISESDK(object):
                 ers_base_url=ers_base_url,
                 mnt_base_url=mnt_base_url,
                 px_grid_base_url=px_grid_base_url,
+                single_request_timeout=params.get("ise_single_request_timeout"),
                 verify=params.get("ise_verify"),
                 version=params.get("ise_version"),
                 wait_on_rate_limit=params.get("ise_wait_on_rate_limit"),
diff --git a/ansible_collections/cisco/ise/plugins/plugin_utils/personas_utils.py b/ansible_collections/cisco/ise/plugins/plugin_utils/personas_utils.py
index 1f30a10c7..6fb4e2744 100644
--- a/ansible_collections/cisco/ise/plugins/plugin_utils/personas_utils.py
+++ b/ansible_collections/cisco/ise/plugins/plugin_utils/personas_utils.py
@@ -144,7 +144,7 @@ class Node(object):
         try:
             response = requests.post(url=url, timeout=15, data=data, headers=headers, auth=(self.username, self.password), verify=False)
         except Exception as e:
-            AnsibleActionFail(e)
+            raise AnsibleActionFail(e)
 
         if not response.status_code == 200:
             raise AnsibleActionFail("Received status code {status_code} when exporting certificate.".format(status_code=str(response.status_code)))
@@ -175,7 +175,7 @@ class Node(object):
                                      )
             return_message = json.loads(response.text)["response"]["message"]
         except Exception as e:
-            AnsibleActionFail(e)
+            raise AnsibleActionFail(e)
 
         if not response.status_code == 200:
             if not (return_message == 'Trust certificate was added successfully' or