Added the maximum timeout for checking the execution of task id and execution id

plugins/module_utils/dnac.py

@@ -68,6 +68,7 @@ def __init__(self, module):
                                         'parsed': self.verify_diff_parsed
                                         }
         self.dnac_log = dnac_params.get("dnac_log")
+        self.max_timeout = self.params.get('dnac_api_task_timeout')
 
         if self.dnac_log and not DnacBase.__is_log_init:
             self.dnac_log_level = dnac_params.get("dnac_log_level") or 'WARNING'
@@ -331,7 +332,14 @@ def check_task_response_status(self, response, validation_string, data=False):
             return self
 
         task_id = response.get("taskId")
+        start_time = time.time()
         while True:
+            end_time = time.time()
+            if (end_time - start_time) >= self.max_timeout:
+                self.log("Max timeout of {0} sec has reached for the execution id '{1}'. Exiting the loop due to unexpected API status."
+                         .format(self.max_timeout, task_id), "WARNING")
+                break
+
             task_details = self.get_task_details(task_id)
             self.log('Getting task details from task ID {0}: {1}'.format(task_id, task_details), "DEBUG")
 
@@ -350,7 +358,7 @@ def check_task_response_status(self, response, validation_string, data=False):
                 self.status = "success"
                 break
 
-            self.log("progress set to {0} for taskid: {1}".format(task_details.get('progress'), task_id), "DEBUG")
+            self.log("Progress is {0} for task ID: {1}".format(task_details.get('progress'), task_id), "DEBUG")
 
         return self
 
@@ -401,9 +409,16 @@ def check_execution_response_status(self, response):
             self.status = "failed"
             return self
 
-        executionid = response.get("executionId")
+        execution_id = response.get("executionId")
+        start_time = time.time()
         while True:
-            execution_details = self.get_execution_details(executionid)
+            end_time = time.time()
+            if (end_time - start_time) >= self.max_timeout:
+                self.log("Max timeout of {0} sec has reached for the execution id '{1}'. Exiting the loop due to unexpected API status."
+                         .format(self.max_timeout, execution_id), "WARNING")
+                break
+
+            execution_details = self.get_execution_details(execution_id)
             if execution_details.get("status") == "SUCCESS":
                 self.result['changed'] = True
                 self.msg = "Successfully executed"
@@ -529,15 +544,14 @@ def check_status_api_events(self, status_execution_id):
             response from the API. If the timeout is reached first, the method logs a warning and returns None.
         """
 
-        max_timeout = self.params.get('dnac_api_task_timeout')
         events_response = None
         start_time = time.time()
 
         while True:
             end_time = time.time()
-            if (end_time - start_time) >= max_timeout:
+            if (end_time - start_time) >= self.max_timeout:
                 self.log("""Max timeout of {0} sec has reached for the execution id '{1}' for the event and unexpected
-                        api status so moving out of the loop.""".format(max_timeout, status_execution_id), "WARNING")
+                        api status so moving out of the loop.""".format(self.max_timeout, status_execution_id), "WARNING")
                 break
             # Now we check the status of API Events for configuring destination and notifications
             response = self.dnac._exec(

plugins/modules/network_settings_workflow_manager.py

@@ -1540,7 +1540,7 @@ def get_have_network(self, network_details):
 
         site_id = self.get_site_id(site_name)
         if site_id is None:
-            self.msg = "Failed to get site id from {0}".format(site_name)
+            self.msg = "The site with the name '{0}' is not available in the Catalyst Center".format(site_name)
             self.status = "failed"
             return self