New members

Signed-off-by: Martin Zeithaml <[email protected]>
zowe · Feb 12, 2025 · 7d5b55d · 7d5b55d
1 parent d03f341
commit 7d5b55d
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 16 deletions.
diff --git a/INSTALLATION.md b/INSTALLATION.md
@@ -111,7 +111,7 @@ When the JCL is prepared, the following jobs can be submitted to perform the fol
 
 |Task|Description|Sample JCL|
 |---|---|---|
-|Create Instance Datasets|**Purpose:** Create datasets for Zowe's PARMLIB content and non-ZFS extension content for a given Zowe Instance<br><br>**Action:**<br>1) Allocate PDSE FB80 dataset with at least 15 tracks named from Zowe parameter `zowe.setup.dataset.parmlib`<br>2) Allocate PDSE FB80 dataset with at least 30 tracks named from Zowe parameter `zowe.setup.dataset.authPluginLib`<br>3) Copy ZWESIP00 member from `zowe.setup.dataset.prefix`.SZWESAMP into `zowe.setup.dataset.parmlib`|[ZWEIMVS](https://github.com/zowe/zowe-install-packaging/tree/feature/v3/jcl/files/SZWESAMP/ZWEIMVS)|
+|Create Instance Datasets|**Purpose:** Create datasets for Zowe's PARMLIB content and non-ZFS extension content for a given Zowe Instance<br><br>**Action:**<br>1) Allocate PDSE FB80 dataset with at least 15 tracks named from Zowe parameter `zowe.setup.dataset.parmlib`<br>2) Allocate PDSE FB80 dataset with at least 30 tracks named from Zowe parameter `zowe.setup.dataset.authPluginLib`<br>3) Copy ZWESIP00 member from `zowe.setup.dataset.prefix`.SZWESAMP into `zowe.setup.dataset.parmlib`|[ZWEIMVSP](https://github.com/zowe/zowe-install-packaging/tree/feature/v3/jcl/files/SZWESAMP/ZWEIMVSP)<br/><br/>[ZWEIMVSZ](https://github.com/zowe/zowe-install-packaging/tree/feature/v3/jcl/files/SZWESAMP/ZWEIMVSZ)|
 |APF Authorize privileged content|**Purpose:** Zowe contains one privileged component, ZIS, which enables the security model by which the majority of Zowe is unprivileged and in key 8. The load library for the ZIS component and its extension library must be set APF authorized and run in key 4 to use ZIS and components that depend upon it.<br><br>**Action:**<br>1) APF authorize the datasets defined at `zowe.setup.dataset.authLoadlib` and `zowe.setup.dataset.authPluginLib`.<br>2) Define PPT entries for the members ZWESIS01 and ZWESAUX as Key 4, NOSWAP in the SCHEDxx member of the system PARMLIB.|[ZWEIAPF](https://github.com/zowe/zowe-install-packaging/tree/feature/v3/jcl/files/SZWESAMP/ZWEIAPF)|
 |Grant SAF permissions|The STC accounts for Zowe need permissions for operating servers, and users need permissions for interacting with the servers.<br><br>**Action:** [Set SAF permissions for accounts](https://docs.zowe.org/stable/user-guide/assign-security-permissions-to-users#security-permissions-reference-table)|RACF: [ZWEIRAC](https://github.com/zowe/zowe-install-packaging/tree/feature/v3/jcl/files/SZWESAMP/ZWEIRAC)<br><br>TSS: [ZWEITSS](https://github.com/zowe/zowe-install-packaging/tree/feature/v3/jcl/files/SZWESAMP/ZWEITSS)<br><br>ACF2: [ZWEIACF](https://github.com/zowe/zowe-install-packaging/tree/feature/v3/jcl/files/SZWESAMP/SZWIACF)|
 |Copy STC JCL to PROCLIB|**Purpose**: ZWESLSTC is the job for running Zowe's webservers, and ZWESISTC is for running the APF authorized cross-memory server. The ZWESASTC job is started by ZWESISTC on an as-needed basis.<br><br>**Action**: Copy the members ZWESLSTC, ZWESISTC, and ZWESASTC into your desired PROCLIB. If the job names are customized, also modify the YAML values of them in `zowe.setup.security.stcs`|[ZWEISTC](https://github.com/zowe/zowe-install-packaging/tree/feature/v3/jcl/files/SZWESAMP/ZWEISTC)|
@@ -157,7 +157,8 @@ zowe:
 JCL samples for removing Zowe configuration also exist.
 |Action|Sample JCL|
 |---|---|
-|Remove Instance Datasets|[ZWERMVS](https://github.com/zowe/zowe-install-packaging/tree/feature/v3/jcl/files/SZWESAMP/ZWERMVS)|
+|Remove Instance Parmlib Dataset|[ZWERMVSP](https://github.com/zowe/zowe-install-packaging/tree/feature/v3/jcl/files/SZWESAMP/ZWERMVSP)|
+|Remove Instance ZIS Plugins Dataset|[ZWERMVSZ](https://github.com/zowe/zowe-install-packaging/tree/feature/v3/jcl/files/SZWESAMP/ZWERMVSZ)|
 |Remove SAF Permissions|[ZWENOSEC](https://github.com/zowe/zowe-install-packaging/tree/feature/v3/jcl/files/SZWESAMP/ZWENOSEC)|
 |Remove Keyring|[ZWENOKR](https://github.com/zowe/zowe-install-packaging/tree/feature/v3/jcl/files/SZWESAMP/ZWENOKR)|
 |Remove Caching Service VSAM Dataset|[ZWECSRVS](https://github.com/zowe/zowe-install-packaging/tree/feature/v3/jcl/files/SZWESAMP/ZWECSRVS)|

diff --git a/bin/commands/init/.help b/bin/commands/init/.help
@@ -19,10 +19,10 @@ review what Zowe would do before doing it.
 The following are the JCL submitted by each command as needed
 
 - `zwe init mvs`
-    - ZWEIMVS
-    - (If `--allow-overwrite` specified and old datasets exist) ZWERMVS
-    - (If `zowe.setup.dataset.authLoadLib` is not named prefix + ZWELOAD) ZWEIMVS2
-    - (If above is true, and the dataset exists, and `--allow-overwrite` is set) ZWERMVS2
+    - ZWEIMVSA, ZWEIMVSP, ZWEIMVSZ
+    - (If `--allow-overwrite` specified and old datasets exist) ZWERMVSP, ZWERMVSZ
+    - (If `zowe.setup.dataset.authLoadLib` is not named prefix + ZWELOAD) ZWEIMVSA
+    - (If above is true, and the dataset exists, and `--allow-overwrite` is set) ZWERMVSA
 - `zwe init vsam`
     - ZWECSVSM
     - (If `--allow-overwrite` specified and old datasets exist) ZWECSRVS

diff --git a/bin/commands/init/generate/.help b/bin/commands/init/generate/.help
@@ -14,10 +14,12 @@ For example, if you run `zwe init generate --dry-run`, a dry run of the operatio
 The following JCL will be created into the jcllib, using the content of the same name from within the SZWESAMP dataset:
 
 Instance dataset creation:
-- ZWEIMVS: Creates Zowe instance datasets
-- ZWERMVS: Removes these datasets
-- ZWEIMVS2: Creates the `zowe.setup.dataset.authLoadLib` dataset if you have customized its name. This is not recommended, it is best to leave it as default.
-- ZWERMVS2: Removes the above customized dataset.
+- ZWEIMVSP: Creates Zowe instance Parmlib dataset
+- ZWERMVSP: Removes this dataset
+- ZWEIMVSZ: Creates Zowe instance ZIS Plugins dataset
+- ZWERMVSZ: Removes this dataset
+- ZWEIMVSA: Creates the `zowe.setup.dataset.authLoadLib` dataset if you have customized its name. This is not recommended, it is best to leave it as default.
+- ZWERMVSA: Removes the above customized dataset.
 
 VSAM for caching service creation:
 - ZWECSVSM: Creates a VSAM for the caching service

diff --git a/bin/libs/zos.ts b/bin/libs/zos.ts
@@ -79,8 +79,8 @@ export function verifyGeneratedJcl(config:any): string | undefined {
   if (!jcllib) {
     return undefined;
   }
-  const expectedMember = jcllib+'(ZWEIMVS)';
-  // read JCL library and validate using expected member ZWEIMVS (init mvs command)
+  const expectedMember = jcllib+'(ZWEIMVSA)';
+  // read JCL library and validate using expected member ZWEIMVSA (init mvs command)
   let doesJclExist: boolean = zosDataset.isDatasetExists(expectedMember);
   if (!doesJclExist) {
     initGenerate.execute();

diff --git a/playbooks/roles/configure/tasks/show_logs.yml b/playbooks/roles/configure/tasks/show_logs.yml
@@ -38,7 +38,8 @@
     show_jobs_name: "{{ job_name_to_show }}"
   loop:
   - ZWEGENER
-  - ZWEIMVS
+  - ZWEIMVSP
+  - ZWEIMVSZ
   - ZWEIAPF2
   - ZWEIACF
   - ZWEIRAC

diff --git a/smpe/bld/SMPMCS.txt b/smpe/bld/SMPMCS.txt
@@ -50,7 +50,9 @@
 ++SAMP(ZWEIKRT1)     SYSLIB(SZWESAMP) DISTLIB(AZWESAMP) RELFILE(2) .
 ++SAMP(ZWEIKRT2)     SYSLIB(SZWESAMP) DISTLIB(AZWESAMP) RELFILE(2) .
 ++SAMP(ZWEIKRT3)     SYSLIB(SZWESAMP) DISTLIB(AZWESAMP) RELFILE(2) .
-++SAMP(ZWEIMVS)      SYSLIB(SZWESAMP) DISTLIB(AZWESAMP) RELFILE(2) .
+++SAMP(ZWEIMVSA)     SYSLIB(SZWESAMP) DISTLIB(AZWESAMP) RELFILE(2) .
+++SAMP(ZWEIMVSP)     SYSLIB(SZWESAMP) DISTLIB(AZWESAMP) RELFILE(2) .
+++SAMP(ZWEIMVSZ)     SYSLIB(SZWESAMP) DISTLIB(AZWESAMP) RELFILE(2) .
 ++SAMP(ZWEIMVS2)     SYSLIB(SZWESAMP) DISTLIB(AZWESAMP) RELFILE(2) .
 ++SAMP(ZWEINSTL)     SYSLIB(SZWESAMP) DISTLIB(AZWESAMP) RELFILE(2) .
 ++SAMP(ZWEIRAC)      SYSLIB(SZWESAMP) DISTLIB(AZWESAMP) RELFILE(2) .
@@ -62,8 +64,9 @@
 ++SAMP(ZWENOKRR)     SYSLIB(SZWESAMP) DISTLIB(AZWESAMP) RELFILE(2) .
 ++SAMP(ZWENOKRT)     SYSLIB(SZWESAMP) DISTLIB(AZWESAMP) RELFILE(2) .
 ++SAMP(ZWENOSEC)     SYSLIB(SZWESAMP) DISTLIB(AZWESAMP) RELFILE(2) .
-++SAMP(ZWERMVS)      SYSLIB(SZWESAMP) DISTLIB(AZWESAMP) RELFILE(2) .
-++SAMP(ZWERMVS2)     SYSLIB(SZWESAMP) DISTLIB(AZWESAMP) RELFILE(2) .
+++SAMP(ZWERMVSA)     SYSLIB(SZWESAMP) DISTLIB(AZWESAMP) RELFILE(2) .
+++SAMP(ZWERMVSP)     SYSLIB(SZWESAMP) DISTLIB(AZWESAMP) RELFILE(2) .
+++SAMP(ZWERMVSZ)     SYSLIB(SZWESAMP) DISTLIB(AZWESAMP) RELFILE(2) .
 ++SAMP(ZWERSTC)      SYSLIB(SZWESAMP) DISTLIB(AZWESAMP) RELFILE(2) .
 ++SAMP(ZWESECKG)     SYSLIB(SZWESAMP) DISTLIB(AZWESAMP) RELFILE(2) .
 ++SAMP(ZWESECUR)     SYSLIB(SZWESAMP) DISTLIB(AZWESAMP) RELFILE(2) .