[zos_mvs_raw] Find VSAM cluster when DISP=OLD and find data and index resource types (#1822)

* Added fix for zos_find

* Added tests for fix

* Updated changelog

Author: fernandofloresg

changelogs/fragments/1822-zos_find-vsam-disp-old.yml

@@ -0,0 +1,5 @@
+bugfixes:
+  - zos_find - Module would not find a VSAM cluster resource type if it was in use with DISP=OLD. Fix now finds the VSAM cluster.
+    (https://github.com/ansible-collections/ibm_zos_core/pull/1822).
+  - zos_find - Module would not find VSAM data and index resource types. Fix now finds the data and index resource types.
+    (https://github.com/ansible-collections/ibm_zos_core/pull/1822).

plugins/modules/zos_find.py

@@ -503,7 +503,8 @@ def vsam_filter(module, patterns, resource_type, age=None):
     filtered_data_sets = set()
     now = time.time()
     for pattern in patterns:
-        rc, out, err = _vls_wrapper(pattern, details=True)
+        request_details = age is not None
+        rc, out, err = _vls_wrapper(pattern, details=request_details)
         if rc > 4:
             module.fail_json(
                 msg="Non-zero return code received while executing ZOAU shell command 'vls'",
@@ -1069,7 +1070,6 @@ def run_module(module):
             size = int(m.group(1)) * bytes_per_unit.get(m.group(2), 1)
         else:
             module.fail_json(size=size, msg="failed to process size")
-
     if resource_type == "NONVSAM":
         if contains:
             init_filtered_data_sets = content_filter(
@@ -1104,7 +1104,7 @@ def run_module(module):
 
         res_args['examined'] = init_filtered_data_sets.get("searched")
 
-    elif resource_type == "CLUSTER":
+    elif resource_type in ["CLUSTER", "DATA", "INDEX"]:
         filtered_data_sets = vsam_filter(module, patterns, resource_type, age=age)
         res_args['examined'] = len(filtered_data_sets)
     elif resource_type == "GDG":

tests/functional/modules/test_zos_find_func.py

@@ -42,6 +42,13 @@
 
 DATASET_TYPES = ['seq', 'pds', 'pdse']
 
+LOCK_VSAM_JCL = """//SLEEP    JOB (T043JM,JM00,1,0,0,0),'SLEEP - JRM',CLASS=R,
+//             MSGCLASS=X,MSGLEVEL=1,NOTIFY=S0JM
+//STEP1     EXEC PGM=BPXBATCH,PARM='SH sleep 60'
+//VSAM1   DD DISP=OLD,DSN={0}
+//STDOUT    DD SYSOUT=*
+//STDERR    DD SYSOUT=*
+"""
 
 def create_vsam_ksds(ds_name, ansible_zos_module, volume):
     hosts = ansible_zos_module
@@ -391,7 +398,6 @@ def test_find_data_sets_in_volume(ansible_zos_module, volumes_on_systems):
         hosts.all.zos_data_set(name=data_set_name, state="absent")
 
 
-
 def test_find_vsam_pattern(ansible_zos_module, volumes_on_systems):
     hosts = ansible_zos_module
     try:
@@ -401,13 +407,34 @@ def test_find_vsam_pattern(ansible_zos_module, volumes_on_systems):
             volume = volumes.get_available_vol()
             create_vsam_ksds(vsam, hosts, volume)
 
+        # A KSDS VSAM has 3 different components, cluster, data and index
+        # This test should find all three
         find_res = hosts.all.zos_find(
             patterns=[f'{TEST_SUITE_HLQ}.FIND.VSAM.FUNCTEST.*'],
             resource_type='cluster'
         )
         for val in find_res.contacted.values():
             assert len(val.get('data_sets')) == 1
             assert val.get('matched') == len(val.get('data_sets'))
+            assert val.get('data_sets')[0].get("name", None) == VSAM_NAMES[0]
+
+        find_res = hosts.all.zos_find(
+            patterns=[f'{TEST_SUITE_HLQ}.FIND.VSAM.FUNCTEST.*'],
+            resource_type='data'
+        )
+        for val in find_res.contacted.values():
+            assert len(val.get('data_sets')) == 1
+            assert val.get('matched') == len(val.get('data_sets'))
+            assert val.get('data_sets')[0].get("name", None) == f"{VSAM_NAMES[0]}.DATA"
+
+        find_res = hosts.all.zos_find(
+            patterns=[f'{TEST_SUITE_HLQ}.FIND.VSAM.FUNCTEST.*'],
+            resource_type='index'
+        )
+        for val in find_res.contacted.values():
+            assert len(val.get('data_sets')) == 1
+            assert val.get('matched') == len(val.get('data_sets'))
+            assert val.get('data_sets')[0].get("name", None) == f"{VSAM_NAMES[0]}.INDEX"
     finally:
         hosts.all.zos_data_set(
             batch=[
@@ -419,6 +446,38 @@ def test_find_vsam_pattern(ansible_zos_module, volumes_on_systems):
         )
 
 
+def test_find_vsam_pattern_disp_old(ansible_zos_module, volumes_on_systems):
+    """
+    Creates a VSAM cluster and runs a JCL to lock the data set with DISP=OLD.
+    Then make sure that we can query the VSAM. Currently, if using age + cluster
+    resource_type the module will not find the vsam.
+    """
+    hosts = ansible_zos_module
+    try:
+        volumes = Volume_Handler(volumes_on_systems)
+        jcl_ds = get_tmp_ds_name()
+        for vsam in VSAM_NAMES:
+            volume = volumes.get_available_vol()
+            create_vsam_ksds(vsam, hosts, volume)
+
+        hosts.all.shell(cmd=f"decho \"{LOCK_VSAM_JCL.format(VSAM_NAMES[0])}\" '{jcl_ds}'; jsub '{jcl_ds}'")
+        find_res = hosts.all.zos_find(
+            patterns=[f'{TEST_SUITE_HLQ}.FIND.VSAM.FUNCTEST.*'],
+            resource_type='cluster'
+        )
+        for val in find_res.contacted.values():
+            assert len(val.get('data_sets')) == 1
+            assert val.get('matched') == len(val.get('data_sets'))
+    finally:
+        hosts.all.zos_data_set(
+            batch=[
+                {
+                    "name":i,
+                    "state":'absent'
+                } for i in VSAM_NAMES
+            ]
+        )
+
 def test_find_vsam_in_volume(ansible_zos_module, volumes_on_systems):
     hosts = ansible_zos_module
     volumes = Volume_Handler(volumes_on_systems)