Skip to content

Commit ac9232c

Browse files
matthewpwilsonmatthewpwilson
authored
Merge branch 'dev' into dev
2 parents 6554b89 + 5ad3c62 commit ac9232c

File tree

2 files changed

+19
-14
lines changed

2 files changed

+19
-14
lines changed

‎__tests__/api/BundlePush/BundlePusher.test.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1242,7 +1242,7 @@ describe("BundlePusher01", () => {
12421242
return { response: {
12431243
records: {
12441244
cicsregion: {
1245-
applid: "ABCDEFG", jobid: "JOB12345", jobname: "MYCICS"
1245+
applid: "ABCDEFG", jobid: "JOB12345", jobname: "MYCICS", mvssysname: "ABCD"
12461246
}
12471247
}
12481248
}
@@ -1256,7 +1256,7 @@ describe("BundlePusher01", () => {
12561256
await runPushTest("__tests__/__resources__/ExampleBundle01", false, "PUSH operation completed");
12571257

12581258
expect(consoleText).toContain("Regions in scope '12345678' of CICSplex '12345678':");
1259-
expect(consoleText).toContain("Applid: ABCDEFG jobname: MYCICS jobid: JOB12345");
1259+
expect(consoleText).toContain("Applid: ABCDEFG jobname: MYCICS jobid: JOB12345 sysname: ABCD");
12601260
expect(consoleText).not.toContain("NODEJSAPP");
12611261
expect(zosMFSpy).toHaveBeenCalledTimes(1);
12621262
expect(sshSpy).toHaveBeenCalledTimes(1);
@@ -1315,7 +1315,7 @@ describe("BundlePusher01", () => {
13151315
return { response: {
13161316
records: {
13171317
cicsregion: {
1318-
applid: "ABCDEFG", jobid: "JOB12345", jobname: "MYCICS"
1318+
applid: "ABCDEFG", jobid: "JOB12345", jobname: "MYCICS", mvssysname: "ABCD"
13191319
}
13201320
}
13211321
}
@@ -1341,7 +1341,7 @@ describe("BundlePusher01", () => {
13411341
expect(consoleText).toContain("Gathering scope information");
13421342
expect(consoleText).toContain("Querying regions in scope over CMCI");
13431343
expect(consoleText).toContain("Regions in scope '12345678' of CICSplex '12345678':");
1344-
expect(consoleText).toContain("Applid: ABCDEFG jobname: MYCICS jobid: JOB12345");
1344+
expect(consoleText).toContain("Applid: ABCDEFG jobname: MYCICS jobid: JOB12345 sysname: ABCD");
13451345
expect(consoleText).toContain("Querying NODEJSAPP resources over CMCI");
13461346
expect(consoleText).toContain("zowe cics get resource CICSNodejsapp --region-name 12345678 --criteria \"BUNDLE=12345678\" --cics-plex 12345678");
13471347
expect(zosMFSpy).toHaveBeenCalledTimes(1);
@@ -1396,7 +1396,7 @@ describe("BundlePusher01", () => {
13961396
return { response: {
13971397
records: {
13981398
cicsregion: {
1399-
applid: "ABCDEFG", jobid: "JOB12345", jobname: "MYCICS"
1399+
applid: "ABCDEFG", jobid: "JOB12345", jobname: "MYCICS", mvssysname: "ABCD"
14001400
}
14011401
}
14021402
}
@@ -1441,7 +1441,7 @@ describe("BundlePusher01", () => {
14411441
return { response: {
14421442
records: {
14431443
cicsregion: {
1444-
applid: "ABCDEFG", jobid: "JOB12345", jobname: "MYCICS"
1444+
applid: "ABCDEFG", jobid: "JOB12345", jobname: "MYCICS", mvssysname: "ABCD"
14451445
}
14461446
}
14471447
}
@@ -1493,7 +1493,7 @@ describe("BundlePusher01", () => {
14931493
return { response: {
14941494
records: {
14951495
cicsregion: {
1496-
applid: "ABCDEFG", jobid: "JOB12345", jobname: "MYCICS"
1496+
applid: "ABCDEFG", jobid: "JOB12345", jobname: "MYCICS", mvssysname: "ABCD"
14971497
}
14981498
}
14991499
}
@@ -1550,7 +1550,7 @@ describe("BundlePusher01", () => {
15501550
return { response: {
15511551
records: {
15521552
cicsregion: {
1553-
applid: "ABCD", jobid: "JOB12345", jobname: "MYCICS"
1553+
applid: "ABCD", jobid: "JOB12345", jobname: "MYCICS", mvssysname: "ABCD"
15541554
}
15551555
}
15561556
}
@@ -1564,7 +1564,7 @@ describe("BundlePusher01", () => {
15641564
await runPushTest("__tests__/__resources__/ExampleBundle01", false, "PUSH operation completed");
15651565

15661566
expect(consoleText).toContain("Regions in scope '12345678' of CICSplex '12345678':");
1567-
expect(consoleText).toContain("Applid: ABCD jobname: MYCICS jobid: JOB12345");
1567+
expect(consoleText).toContain("Applid: ABCD jobname: MYCICS jobid: JOB12345 sysname: ABCD");
15681568
expect(consoleText).toContain("NODEJSAPP resources for bundle '12345678' in scope '12345678':");
15691569
expect(consoleText).toContain("NODEJSAPP resource 'name' is in 'DISABLED' state in region '1' with process id '0'.");
15701570
expect(consoleText).toContain("stdout: <not available>");
@@ -1614,10 +1614,10 @@ describe("BundlePusher01", () => {
16141614
records: {
16151615
cicsregion: [
16161616
{
1617-
applid: "ABCD", jobid: "JOB12345", jobname: "MYCICS"
1617+
applid: "ABCD", jobid: "JOB12345", jobname: "MYCICS", mvssysname: "ABCD"
16181618
},
16191619
{
1620-
applid: "EFGHIHJK", jobid: "JOB54321", jobname: "MYCICS2"
1620+
applid: "EFGHIHJK", jobid: "JOB54321", jobname: "MYCICS2", mvssysname: "EFGH"
16211621
},
16221622
]
16231623
}
@@ -1632,8 +1632,8 @@ describe("BundlePusher01", () => {
16321632
await runPushTest("__tests__/__resources__/ExampleBundle01", false, "PUSH operation completed");
16331633

16341634
expect(consoleText).toContain("Regions in scope '12345678' of CICSplex '12345678':");
1635-
expect(consoleText).toContain("Applid: ABCD jobname: MYCICS jobid: JOB12345");
1636-
expect(consoleText).toContain("Applid: EFGHIHJK jobname: MYCICS2 jobid: JOB54321");
1635+
expect(consoleText).toContain("Applid: ABCD jobname: MYCICS jobid: JOB12345 sysname: ABCD");
1636+
expect(consoleText).toContain("Applid: EFGHIHJK jobname: MYCICS2 jobid: JOB54321 sysname: EFGH");
16371637
expect(consoleText).toContain("NODEJSAPP resources for bundle '12345678' in scope '12345678':");
16381638
expect(consoleText).toContain("NODEJSAPP resource 'name' is in 'ENABLED' state in region '1' with process id '22'.");
16391639
expect(consoleText).toContain("stdout: /tmp/stdout");
@@ -1670,7 +1670,7 @@ describe("BundlePusher01", () => {
16701670
return { response: {
16711671
records: {
16721672
cicsregion: {
1673-
applid: "ABCDEFG", jobid: "JOB12345", jobname: "MYCICS"
1673+
applid: "ABCDEFG", jobid: "JOB12345", jobname: "MYCICS", mvssysname: "ABCD"
16741674
}
16751675
}
16761676
}

‎src/api/BundlePush/BundlePusher.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -684,6 +684,11 @@ export class BundlePusher {
684684

685685
private async generateNodejsSpecificDiagnostics(cicsSession: AbstractSession): Promise<string> {
686686
let msgBuffer = "";
687+
688+
if (cicsSession === undefined) {
689+
return msgBuffer;
690+
}
691+
687692
try {
688693
// Attempt to gather additional Node.js specific information from CICS
689694
this.updateStatus("Gathering Node.js diagnostics");

0 commit comments

Comments
 (0)