Fixing #2003 and #2004 issues

Author: surendrababuravella

plugins/module_utils/data_set.py

@@ -2414,7 +2414,7 @@ def ensure_present(self, replace):
         else:
             if not replace:
                 return changed
-            changed = self.ensure_absent()
+            changed = self.ensure_absent(True)
             gdg = gdgs.create(**arguments)
         if isinstance(gdg, gdgs.GenerationDataGroupView):
             changed = True
@@ -2434,17 +2434,21 @@ def ensure_absent(self, force):
         int
             Indicates if changes were made.
         """
-        # Try to delete
-        rc = datasets.delete(self.name)
-        if rc > 0:
-            if force:
-                if isinstance(self.gdg, gdgs.GenerationDataGroupView):
-                    self.gdg.delete()
+        # Check whether GDG exists or not
+        if gdgs.exists(name=self.name):
+            # Try to delete
+            rc = datasets.delete(self.name)
+            if rc > 0:
+                if force:
+                    if isinstance(self.gdg, gdgs.GenerationDataGroupView):
+                        self.gdg.delete()
+                    else:
+                        gdg_view = gdgs.GenerationDataGroupView(name=self.name)
+                        gdg_view.delete()
                 else:
-                    gdg_view = gdgs.GenerationDataGroupView(name=self.name)
-                    gdg_view.delete()
-            else:
-                raise DatasetDeleteError(self.raw_name, rc)
+                    raise DatasetDeleteError(self.raw_name, rc)
+        else:
+            return False
         return True
 
     def clear(self):

tests/functional/modules/test_zos_data_set_func.py

@@ -1103,3 +1103,33 @@ def test_create_member_special_chars(ansible_zos_module):
     finally:
         hosts.all.zos_data_set(name=data_set_name, state="absent")
 
+
+def test_gdg_create_and_replace(ansible_zos_module):
+    try:
+        hosts = ansible_zos_module
+        data_set_name = get_tmp_ds_name()
+        results = hosts.all.zos_data_set(name=data_set_name, empty=False, force=True, record_format="u", 
+                                         record_length=0, replace=True, space_primary=5, space_secondary=3, 
+                                         space_type="cyl", state="present", type="gdg", limit=3)
+        for result in results.contacted.values():
+            assert result.get("changed") is True
+            assert result.get("module_stderr") is None
+        results = hosts.all.zos_data_set(name=data_set_name, empty=False, force=True, record_format="u", 
+                                         record_length=0, replace=True, space_primary=5, space_secondary=3, 
+                                         space_type="cyl", state="present", type="gdg", limit=3)
+        for result in results.contacted.values():
+            assert result.get("changed") is True
+            assert result.get("module_stderr") is None
+    finally:
+        hosts.all.zos_data_set(name=data_set_name, state="absent", force=True, type="gdg")
+
+
+def test_gdg_deletion_when_absent(ansible_zos_module):
+    hosts = ansible_zos_module
+    data_set_name = get_tmp_ds_name()
+    results = hosts.all.zos_data_set(name=data_set_name, force=False, record_format="fb", replace=False, 
+                                    space_primary=5, space_secondary=3, space_type="m", state="absent", type="gdg")
+    for result in results.contacted.values():
+        assert result.get("changed") is False
+        assert result.get("module_stderr") is None
+        assert result.get("failed") is None

tests/functional/modules/test_zos_unarchive_func.py

@@ -1164,8 +1164,8 @@ def test_gdg_unarchive(ansible_zos_module, dstype, format):
 
         hosts.all.zos_data_set(
             batch=[
-                {"name": f"{data_set_name}(-1)", "state": "absent", "type": "gdg"},
-                {"name": f"{data_set_name}(0)", "state": "absent", "type": "gdg"},
+                {"name": f"{data_set_name}(-1)", "state": "absent"},
+                {"name": f"{data_set_name}(0)", "state": "absent"},
             ]
         )
         unarchive_result = hosts.all.zos_unarchive(