Merge pull request #50 from pcoop/branch1

csd/res group optional

Author: matthewpwilson

__tests__/api/BundleDeploy/BundleDeployer.test.ts

@@ -156,6 +156,13 @@ describe("BundleDeployer01", () => {
 
         await runUndeployTest();
     });
+    it("should generate deploy JCL with neither csdgroup nor resgroup", async () => {
+
+        let parms: IHandlerParameters;
+        parms = DEFAULT_PARAMTERS;
+        setCommonParmsForDeployTests(parms);
+        await testDeployJCL(parms);
+    });
     it("should generate deploy JCL for csdgroup", async () => {
 
         let parms: IHandlerParameters;
@@ -309,6 +316,13 @@ describe("BundleDeployer01", () => {
     });
 
     // ** UNDEPLOY TESTS **
+    it("should generate undeploy JCL with neither csdgroup nor resgroup", async () => {
+
+        let parms: IHandlerParameters;
+        parms = DEFAULT_PARAMTERS;
+        setCommonParmsForUndeployTests(parms);
+        await testUndeployJCL(parms);
+    });
     it("should generate undeploy JCL for csdgroup", async () => {
 
         let parms: IHandlerParameters;

__tests__/api/BundleDeploy/__snapshots__/BundleDeployer.test.ts.snap

@@ -184,6 +184,24 @@ DEPLOY BUNDLE(12345678)
 "
 `;
 
+exports[`BundleDeployer01 should generate deploy JCL with neither csdgroup nor resgroup 1`] = `
+"//DFHDPLOY JOB DFHDPLOY,CLASS=A,MSGCLASS=X,TIME=NOLIMIT
+//DFHDPLOY EXEC PGM=DFHDPLOY,REGION=100M
+//STEPLIB  DD DISP=SHR,DSN=12345678901234567890123456789012345.SDFHLOAD
+//         DD DISP=SHR,DSN=abcde12345abcde12345abcde12345abcde.SEYUAUTH
+//SYSTSPRT DD SYSOUT=*
+//SYSIN    DD *
+*
+SET CICSPLEX(12345678);
+*
+DEPLOY BUNDLE(12345678)
+       BUNDLEDIR(1234567890)
+       SCOPE(12345678)
+       STATE(ENABLED)
+/*
+"
+`;
+
 exports[`BundleDeployer01 should generate undeploy JCL for DISABLED 1`] = `
 "//DFHDPLOY JOB DFHDPLOY,CLASS=A,MSGCLASS=X,TIME=NOLIMIT
 //DFHDPLOY EXEC PGM=DFHDPLOY,REGION=100M
@@ -330,6 +348,23 @@ UNDEPLOY BUNDLE(12345678)
 "
 `;
 
+exports[`BundleDeployer01 should generate undeploy JCL with neither csdgroup nor resgroup 1`] = `
+"//DFHDPLOY JOB DFHDPLOY,CLASS=A,MSGCLASS=X,TIME=NOLIMIT
+//DFHDPLOY EXEC PGM=DFHDPLOY,REGION=100M
+//STEPLIB  DD DISP=SHR,DSN=12345678901234567890123456789012345.SDFHLOAD
+//         DD DISP=SHR,DSN=abcde12345abcde12345abcde12345abcde.SEYUAUTH
+//SYSTSPRT DD SYSOUT=*
+//SYSIN    DD *
+*
+SET CICSPLEX(12345678);
+*
+UNDEPLOY BUNDLE(12345678)
+       SCOPE(12345678)
+       STATE(DISCARDED)
+/*
+"
+`;
+
 exports[`BundleDeployer01 should handle failure during submitjobs processing 1`] = `"Failure occurred submitting DFHDPLOY JCL: 'Cannot read property 'hostname' of undefined'. Most recent status update: 'Submitting DFHDPLOY JCL'."`;
 
 exports[`BundleDeployer01 should support long bundledir 1`] = `

__tests__/cli/deploy/bundle/DeployBundle.handler.test.ts

@@ -194,9 +194,6 @@ describe("bundle Handler", () => {
     it("should complain with empty scope parameter", async () => {
         await testScopeError("", "--scope parameter is empty");
     });
-    it("should complain with missing csdgroup/resgroup", async () => {
-        await testCsdgroupError(undefined, "--scope parameter requires either --csdgroup or --resgroup to be set");
-    });
     it("should complain with invalid type for csdgroup parameter", async () => {
 
         const params = Object.assign({}, ...[DEFAULT_PARAMETERS]);

docs/README.md

@@ -115,7 +115,7 @@ If you have not already done so, start by creating a zosmf profile in Zowe CLI.
 
   `zowe profiles create zosmf-profile --help`
 
-Now create a cics-deploy profile. This profile will identify the target CICS environment for deployment; you will need to know the CICSplex name and Scope, together with the High Level Qualifier (HLQ) for the CICS data sets. You will also have to identify either a target CSD group (typically used for single region configurations) or a BAS resource group (used for multi-region configurations) into which the Bundle will be defined. You may optionally configure a JCL jobcard if your site requires a customised JCL configuration for DFHDPLOY. For further assistance on creating a cics-deploy profile issue the following command:
+Now create a cics-deploy profile. This profile will identify the target CICS environment for deployment; you will need to know the CICSplex name and Scope, together with the High Level Qualifier (HLQ) for the CICS data sets. You can optionally identify either a target CSD group (typically used for single region configurations) or a BAS resource group (used for multi-region configurations) into which the Bundle will be defined. You can optionally configure a JCL jobcard if your site requires a customised JCL configuration for DFHDPLOY. For further assistance on creating a cics-deploy profile issue the following command:
 
   `zowe profiles create cics-deploy-profile --help`