Merge final changes for 1.3.0 into release branch (#137)

* Update Catalog Define Directory Testcase

* Catalog Directory TestCase Update

* Update ims_gen_utils.py

type() not supported in python3.12, resolving sanity error - replaced by isinstance()

* Update release_notes.rst (#134)

* Update release_notes.rst

* Update README.md

* Update changelog.yaml

* Update yamllint.yaml

added new line

* Update galaxy.yml

spaces reduced from 4 to 2

* Update execution-environment.yml

added new line at the end of the file

* Update runtime.yml

added new line at the end of the file

* Update test_config.yml

deleted additional spaces after the colon

* Update release_notes.rst

* Update README.md

* Update release_notes.rst

* Update release_notes.rst

* Update changelog.yaml

* Update changelog.yaml

deleted duplicate fragment

* Update execution-environment.yml

added new line as per the scan results from AAP

* Update execution-environment.yml

only one new line char added

* validate-modules:doc-choices-do-not-match-spec wasn't permitted ignore - undid the acbgen compression doc updates

Signed-off-by: Dipti <[email protected]>

* deleteing repeated entry for validate-modules:doc-choices-do-not-match-spec

Signed-off-by: Dipti <[email protected]>

---------

Signed-off-by: Dipti <[email protected]>
Co-authored-by: trevinop36 <[email protected]>

Author: ddgandhi

README.md

@@ -40,7 +40,7 @@ and ansible-doc to automate tasks on IMS.
 Ansible version compatibility
 ==============================
 
-This collection has been tested against the following Ansible versions: >=2.14.0,<2.16.0.
+This collection has been tested against the following Ansible versions: >=2.14.0,<2.17.0.
 
 
 Copyright

changelogs/changelog.yaml

@@ -69,7 +69,6 @@ releases:
         \n"
     fragments:
     - v1.2.0_summary.yml
-    - v1.2.0_summary.yml
     release_date: '2023-03-31'
   1.2.0-beta.1:
     changes:
@@ -93,3 +92,33 @@ releases:
     fragments:
     - v1.2.0-beta2_summary.yml
     release_date: '2022-12-22'
+  1.3.0:
+    changes:
+      release_summary: "Release Date: '2024-04-10'\nThis changelog describes all changes
+        made to the modules and plugins included\nin this collection.\nFor additional
+        details such as required dependencies and availability review\nthe collections
+        `release notes <https://github.com/ansible-collections/ibm_zos_ims/blob/dev/docs/source/release_notes.rst>`__
+        \n"
+    fragments:
+    - v1.3.0_summary.yml
+    release_date: '2024-04-10'     
+  1.3.0-beta.1:
+    changes:
+      major_changes:
+      - Added new module 'ims_ddl'
+      - Added new member dfsdf_member in the ims_catalog_populate and ims_catalog_purge modules.
+        The DFSDFxxx member is in the IMS.PROCLIB data set where the CATALOG section is defined.
+      - Documentation update, minor updates to compression parameter in the ims_acbgen module where
+        PRECOMP,POSTCOMP, in any combination, cause the required in-place compression.
+        The choices are not mutually exclusive -- PRECOMP or POSTCOMP or PRECOMP,POSTCOMP can be used.
+      - Improved test and ansible-sanity coverage.
+      - Subset of the test cases were updated to support for Ansible 2.15.
+      - Additional support for test cases in ims_catalog_populate and ims_catalog_purge modules to 
+        support dfsdf_member parameter.
+      - This update also has updated prerequisites for Ansible 2.14 or newer and ZOAU 1.2.2 or newer 
+        but prior to version 1.3.
+    fragments:
+    - v1.3.0-beta1_summary.yml
+    release_date: '2023-12-15'
+  
+    

docs/source/release_notes.rst

@@ -6,6 +6,44 @@
 Releases
 ========
 
+
+Version 1.3.0
+====================
+
+Notes
+-----
+
+* Update recommended
+
+  * type() was replaced by isinstance() in the code for gen utilities since ansible-core 2.16 supports Python 3.12 and that version deprecated type() function. 
+  * No other changes from version 1.3.0-beta.1 release. Collection promoted to certified content with version 1.3.0.
+
+Availability
+------------
+
+* `Automation Hub`_
+* `Galaxy`_
+* `GitHub`_
+
+Reference
+---------
+
+* Supported by IBM z/OS core collection v1.5.0 or later
+* Supported by IBM Z Open Enterprise Python for z/OS 3.9 - 3.12
+* Supported by IBM Z Open Automation Utilities 1.2.2 or later (but prior to 1.3)
+* Supported by z/OS V2R4
+* The z/OS® shell
+
+.. _centralized content:
+   https://ibm.github.io/z_ansible_collections_doc/index.html
+
+.. _GitHub:
+   https://github.com/ansible-collections/ibm_zos_ims
+
+.. _Galaxy:
+   https://galaxy.ansible.com/ibm/ibm_zos_ims
+
+
 Version 1.3.0-beta.1
 ====================
 

galaxy.yml

@@ -33,7 +33,7 @@ tags: [ibm, z, zos, z_os, core, zos_core, data_set, jcl, uss, mvs, ims, zos_ims,
 
 # Collections that this collection requires to be installed for it to be usable.
 dependencies:
-    "ibm.ibm_zos_core": ">=1.5.0"
+  "ibm.ibm_zos_core": ">=1.5.0"
 
 # The URL of the originating SCM repository
 repository: https://github.com/ansible-collections/ibm_zos_ims

meta/execution-environment.yml

@@ -7,4 +7,4 @@
 ################################################################################
 dependencies:
   python: requirements-zos-ims.txt
-version: 1
+version: 1

meta/runtime.yml

@@ -1,2 +1,2 @@
 ---
-requires_ansible: '>=2.14.0'
+requires_ansible: '>=2.14.0'

plugins/module_utils/ims_gen_utils.py

@@ -328,7 +328,7 @@ def execute_gen_command(source, dest, syslib_list, run_command, module, result):
                         return src, return_code, return_text, failed
 
                     for item in source['member_list']:
-                        if type(item) == str:
+                        if isinstance(item, str):
                             # set target name same as src
                             src_member = item
                             target_name = item

plugins/modules/ims_acb_gen.py

@@ -36,13 +36,16 @@
   compression:
     description:
       - PRECOMP,POSTCOMP, in any combination, cause the required in-place compression.
-      - The choices are not mutually exclusive -- PRECOMP or POSTCOMP or PRECOMP,POSTCOMP can be used
       - The default is none.
     type: str
     required: false
     choices:
+      - precomp
+      - postcomp
+      - precomp,postcomp
       - PRECOMP
       - POSTCOMP
+      - PRECOMP,POSTCOMP
   psb_name:
     description:
       - The name of the PSB(s). Specifies that blocks are built or deleted for all PSBs that are named on this control statement.

tests/functional/module_utils/ims_test_catalog_utils.py

@@ -129,13 +129,11 @@ class CatalogInputParameters():
     DIR_BATCH = [
         {
             'name': DIR1,
-            'state': 'absent',
-            'volumes': '222222'
+            'state': 'absent'
         },
         {
             'name': DIR2,
-            'state': 'absent',
-            'volumes': '222222'
+            'state': 'absent'
         }
     ]
     RETENTION = [

tests/functional/modules/ims_catalog/test_catalog_managed_acbs.py

@@ -112,7 +112,7 @@ def test_catalog_define_bootstrap(ansible_zos_module):
     for result in response.contacted.values():
         assert result['message'] == ''
         if result['changed'] is False:
-            response = hosts.all.zos_data_set(name=cp.BSDS, state="absent", volume="SCR03")
+            response = hosts.all.zos_data_set(name=cp.BSDS, state="absent", volume="222222")
 
     # Load catalog while defining the bootstrap dataset
     load_catalog(hosts,
@@ -178,7 +178,7 @@ def test_catalog_define_staging(ansible_zos_module):
     for result in response.contacted.values():
         assert result['message'] == ''
         if result['changed'] is False:
-            response = hosts.all.zos_data_set(name=cp.STAGE, state="absent", volume="SCR03")
+            response = hosts.all.zos_data_set(name=cp.STAGE, state="absent", volume="222222")
 
     # Load catalog while defining the staging dataset
     load_catalog(hosts,
@@ -241,11 +241,18 @@ def test_catalog_define_directory(ansible_zos_module):
     hosts = ansible_zos_module
 
     # Delete the directory datasets first
-    response = hosts.all.zos_data_set(batch=cp.DIR_BATCH)
-    for result in response.contacted.values():
+    # response = hosts.all.zos_data_set(batch=cp.DIR_BATCH) 
+    response1 = hosts.all.zos_data_set(name=cp.DIR1, state="absent") 
+    for result in response1.contacted.values():
+        assert result['message'] == ''
+        if result['changed'] is False:
+            response1 = hosts.all.zos_data_set(name=cp.DIR1, state="uncataloged")
+
+    response2 = hosts.all.zos_data_set(name=cp.DIR2, state="absent") 
+    for result in response2.contacted.values():
         assert result['message'] == ''
         if result['changed'] is False:
-            response = hosts.all.zos_data_set(name=cp.DIR_BATCH, state="absent", volume="SCR03")
+            response2 = hosts.all.zos_data_set(name=cp.DIR2, state="uncataloged")
 
     # Load catalog while defining the directory datasets
     load_catalog(hosts,
@@ -313,8 +320,14 @@ def test_catalog_define_directory(ansible_zos_module):
                   managed_acbs=True)
 
     # Finally delete the directory datasets again
-    response = hosts.all.zos_data_set(batch=cp.DIR_BATCH)
-    for result in response.contacted.values():
+    # response = hosts.all.zos_data_set(batch=cp.DIR_BATCH)
+    response3 = hosts.all.zos_data_set(name=cp.DIR1, state="absent", volumes="222222") 
+    for result in response3.contacted.values():
+        assert result['changed'] is True
+        assert result['message'] == ''
+
+    response4 = hosts.all.zos_data_set(name=cp.DIR2, state="absent", volumes="222222") 
+    for result in response4.contacted.values():
         assert result['changed'] is True
         assert result['message'] == ''