Merge pull request ansible-collections#148 from CICS/magic-retries

Make the number of retries a constant

Author: ledina

plugins/module_utils/dataset_utils.py

@@ -12,6 +12,8 @@
 from ansible_collections.ibm.ibm_zos_core.plugins.module_utils.zos_mvs_raw import MVSCmd
 from ansible_collections.ibm.ibm_zos_core.plugins.module_utils.dd_statement import DDStatement
 
+MVS_CMD_RETRY_ATTEMPTS = 10
+
 
 def _dataset_size(unit, primary, secondary):  # type: (str,int,int) -> dict
     return {
@@ -24,7 +26,7 @@ def _dataset_size(unit, primary, secondary):  # type: (str,int,int) -> dict
 def _run_idcams(cmd, name, location, delete=False):  # type: (str, str, str, bool) -> list
     executions = []
 
-    for x in range(10):
+    for x in range(MVS_CMD_RETRY_ATTEMPTS):
         rc, stdout, stderr = idcams(cmd=cmd, authorized=True)
         executions.append(
             _execution(
@@ -125,7 +127,7 @@ def _run_listds(location):  # type: (str) -> [list, _state]
     cmd = " LISTDS '{0}'".format(location)
     executions = []
 
-    for x in range(10):
+    for x in range(MVS_CMD_RETRY_ATTEMPTS):
         rc, stdout, stderr = ikjeft01(cmd=cmd, authorized=True)
         executions.append(
             _execution(
@@ -178,7 +180,7 @@ def _run_iefbr14(ddname, definition):  # type (str, DatasetDefinition) -> List[D
 
     executions = []
 
-    for x in range(10):
+    for x in range(MVS_CMD_RETRY_ATTEMPTS):
         iefbr14_response = MVSCmd.execute(
             pgm="IEFBR14",
             dds=_get_iefbr14_dds(ddname, definition),

plugins/module_utils/global_catalog.py

@@ -11,6 +11,7 @@
 from ansible_collections.ibm.ibm_zos_core.plugins.module_utils.dd_statement import StdoutDefinition, DatasetDefinition, DDStatement, InputDefinition
 from ansible_collections.ibm.ibm_zos_cics.plugins.module_utils.response import _execution
 from ansible_collections.ibm.ibm_zos_cics.plugins.module_utils.data_set import _dataset_constants as ds_constants
+from ansible_collections.ibm.ibm_zos_cics.plugins.module_utils.dataset_utils import MVS_CMD_RETRY_ATTEMPTS
 
 
 def _get_value_from_line(line):  # type: (str) -> str
@@ -74,7 +75,7 @@ def _run_dfhrmutl(location, sdfhload, cmd=""):  # type: (str, str, str) -> (list
 
     executions = []
 
-    for x in range(10):
+    for x in range(MVS_CMD_RETRY_ATTEMPTS):
         dfhrmutl_response = _execute_dfhrmutl(location, sdfhload, cmd)
         executions.append(
             _execution(

plugins/module_utils/icetool.py

@@ -9,6 +9,7 @@
 from ansible_collections.ibm.ibm_zos_core.plugins.module_utils.zos_mvs_raw import MVSCmd, MVSCmdResponse
 from ansible_collections.ibm.ibm_zos_core.plugins.module_utils.dd_statement import StdoutDefinition, DatasetDefinition, DDStatement, InputDefinition
 from ansible_collections.ibm.ibm_zos_cics.plugins.module_utils.response import _execution
+from ansible_collections.ibm.ibm_zos_cics.plugins.module_utils.dataset_utils import MVS_CMD_RETRY_ATTEMPTS
 
 
 def _get_icetool_dds(location):  # type: (str) -> list[DDStatement]
@@ -51,7 +52,7 @@ def _get_record_count(stdout):  # type: (str) -> dict
 def _run_icetool(location):  # type: (str) -> (list(_execution), dict)
     executions = []
 
-    for x in range(10):
+    for x in range(MVS_CMD_RETRY_ATTEMPTS):
         icetool_response = _execute_icetool(location)
 
         executions.append(

plugins/module_utils/local_catalog.py

@@ -9,7 +9,7 @@
 
 from ansible_collections.ibm.ibm_zos_core.plugins.module_utils.dd_statement import StdoutDefinition, DatasetDefinition, DDStatement
 from ansible_collections.ibm.ibm_zos_core.plugins.module_utils.zos_mvs_raw import MVSCmd
-from ansible_collections.ibm.ibm_zos_cics.plugins.module_utils.dataset_utils import _data_set
+from ansible_collections.ibm.ibm_zos_cics.plugins.module_utils.dataset_utils import _data_set, MVS_CMD_RETRY_ATTEMPTS
 from ansible_collections.ibm.ibm_zos_cics.plugins.module_utils.response import _execution
 from ansible_collections.ibm.ibm_zos_cics.plugins.module_utils.data_set import _dataset_constants as ds_constants
 
@@ -29,20 +29,25 @@ def _get_ccmutl_dds(catalog):
 
 def _run_dfhccutl(starting_catalog):  # type: (_data_set) -> [_execution]
     executions = []
-    dfhccutl_response = _execute_dfhccutl(starting_catalog)
-
-    executions.append(_execution(
-        name="DFHCCUTL - Initialise Local Catalog",
-        rc=dfhccutl_response.rc,
-        stdout=dfhccutl_response.stdout,
-        stderr=dfhccutl_response.stderr))
-
-    if dfhccutl_response.rc != 0:
-        raise Exception(
-            "DFHCCUTL failed with RC {0}".format(
-                dfhccutl_response.rc
-            ), executions
-        )
+
+    for x in range(MVS_CMD_RETRY_ATTEMPTS):
+        dfhccutl_response = _execute_dfhccutl(starting_catalog)
+
+        executions.append(_execution(
+            name="DFHCCUTL - Initialise Local Catalog",
+            rc=dfhccutl_response.rc,
+            stdout=dfhccutl_response.stdout,
+            stderr=dfhccutl_response.stderr))
+
+        if dfhccutl_response.rc != 0:
+            raise Exception(
+                "DFHCCUTL failed with RC {0}".format(
+                    dfhccutl_response.rc
+                ), executions
+            )
+        else:
+            break
+
     return executions