Skip to content

Commit 8064036

Browse files
pcooppcoop
committed
change default cmci port to 1490
Signed-off-by: Paul Cooper <[email protected]>
1 parent 355006d commit 8064036

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ describe("BundlePusher01", () => {
304304
expect(sshSpy).toHaveBeenCalledTimes(1);
305305
});
306306
it("should implement --cics-* overrides" , async () => {
307-
cicsProfile = { host: "wibble", port: 443, user: "user", password: "thisIsntReal",
307+
cicsProfile = { host: "wibble", port: 1490, user: "user", password: "thisIsntReal",
308308
rejectUnauthorized: true, protocol: "http" };
309309
const parms = getCommonParmsForPushTests();
310310
parms.arguments.ch = "overrideHost";
@@ -336,19 +336,19 @@ describe("BundlePusher01", () => {
336336
expect(consoleText).toContain("PROTOCOL: https");
337337
});
338338
it("should complain if cics configured and cics-host notset" , async () => {
339-
cicsProfile = { user: "user", port: 443, password: "thisIsntReal" };
339+
cicsProfile = { user: "user", port: 1490, password: "thisIsntReal" };
340340

341341
await runPushTestWithError("__tests__/__resources__/ExampleBundle01", false,
342342
"Partial cics plug-in configuration encountered, --cics-host is not set.");
343343
});
344344
it("should complain if cics configured and cics-user notset" , async () => {
345-
cicsProfile = { host: "wibble", port: 443, password: "thisIsntReal" };
345+
cicsProfile = { host: "wibble", port: 1490, password: "thisIsntReal" };
346346

347347
await runPushTestWithError("__tests__/__resources__/ExampleBundle01", false,
348348
"Partial cics plug-in configuration encountered, --cics-user is not set.");
349349
});
350350
it("should complain if cics configured and cics-password notset" , async () => {
351-
cicsProfile = { host: "wibble", port: 443, user: "user" };
351+
cicsProfile = { host: "wibble", port: 1490, user: "user" };
352352

353353
await runPushTestWithError("__tests__/__resources__/ExampleBundle01", false,
354354
"Partial cics plug-in configuration encountered, --cics-password is not set.");
@@ -371,7 +371,7 @@ describe("BundlePusher01", () => {
371371
expect(cmciSpy).toHaveBeenCalledTimes(1);
372372
expect(consoleText).toContain("PROTOCOL: http\n");
373373
expect(consoleText).toContain("REJECT: true");
374-
expect(consoleText).toContain("PORT: 443");
374+
expect(consoleText).toContain("PORT: 1490");
375375
});
376376
it("should complain with mismatching zOSMF and SSH profile host names", async () => {
377377
const parms = getCommonParmsForPushTests();
@@ -392,14 +392,14 @@ describe("BundlePusher01", () => {
392392
expect(consoleText).not.toContain("WARNING: --ssh-host");
393393
});
394394
it("should complain with mismatching zOSMF and CICS profile host names", async () => {
395-
cicsProfile = { host: "different", port: 443, user: "user", password: "thisIsntReal" };
395+
cicsProfile = { host: "different", port: 1490, user: "user", password: "thisIsntReal" };
396396

397397
await runPushTest("__tests__/__resources__/ExampleBundle01", true,
398398
"PUSH operation completed");
399399
expect(consoleText).toContain("WARNING: --cics-host value 'different' does not match --zosmf-host value 'wibble'.");
400400
});
401401
it("should not complain with matching zOSMF and CICS profile host names", async () => {
402-
cicsProfile = { host: "wibble", port: 443, user: "user", password: "thisIsntReal" };
402+
cicsProfile = { host: "wibble", port: 1490, user: "user", password: "thisIsntReal" };
403403

404404
await runPushTest("__tests__/__resources__/ExampleBundle01", true,
405405
"PUSH operation completed");
@@ -433,7 +433,7 @@ describe("BundlePusher01", () => {
433433
expect(consoleText).not.toContain("WARNING: --ssh-user");
434434
});
435435
it("should complain with mismatching zOSMF and CICS profile user names", async () => {
436-
cicsProfile = { host: "wibble", port: 443, user: "joe", password: "fakePassword" };
436+
cicsProfile = { host: "wibble", port: 1490, user: "joe", password: "fakePassword" };
437437

438438
await runPushTest("__tests__/__resources__/ExampleBundle01", true,
439439
"PUSH operation completed");
@@ -460,7 +460,7 @@ describe("BundlePusher01", () => {
460460
expect(consoleText).not.toContain("fakeSshKey");
461461
});
462462
it("should complain with mismatching zOSMF and cics profile passwords", async () => {
463-
cicsProfile = { host: "wibble", port: 443, user: "user", password: "fakePassword2" };
463+
cicsProfile = { host: "wibble", port: 1490, user: "user", password: "fakePassword2" };
464464

465465
await runPushTestWithError("__tests__/__resources__/ExampleBundle01", false,
466466
"Different passwords are specified for the same user ID in the zosmf and cics configurations.");
@@ -1210,7 +1210,7 @@ describe("BundlePusher01", () => {
12101210
expect(cmciSpy).toHaveBeenCalledTimes(0);
12111211
});
12121212
it("should cope with a NODEJSAPP in the bundle with a CICS profile specified", async () => {
1213-
cicsProfile = { host: "wibble", port: 443, user: "user", password: "thisIsntReal" };
1213+
cicsProfile = { host: "wibble", port: 1490, user: "user", password: "thisIsntReal" };
12141214
submitSpy = jest.spyOn(SubmitJobs, "submitJclString").mockImplementation(() =>
12151215
[{ddName: "SYSTSPRT", stepName: "DFHDPLOY", data: "DFHRL2012I http://www.ibm.com/xmlns/prod/cics/bundle/NODEJSAPP"}] );
12161216

@@ -1229,7 +1229,7 @@ describe("BundlePusher01", () => {
12291229
expect(cmciSpy).toHaveBeenCalledTimes(1);
12301230
});
12311231
it("should query scope even with no NODEJSAPPs", async () => {
1232-
cicsProfile = { host: "wibble", port: 443, user: "user", password: "thisIsntReal" };
1232+
cicsProfile = { host: "wibble", port: 1490, user: "user", password: "thisIsntReal" };
12331233
readSpy = jest.spyOn(fs, "readFileSync").mockImplementation((data: string) => {
12341234
if (data.indexOf("cics.xml") > -1) {
12351235
return "<manifest xmlns=\"http://www.ibm.com/xmlns/prod/cics/bundle\">" +
@@ -1271,7 +1271,7 @@ describe("BundlePusher01", () => {
12711271
expect(cmciSpy).toHaveBeenCalledTimes(1);
12721272
});
12731273
it("should cope with a NODEJSAPP in the bundle with a CICS profile specified and --verbose", async () => {
1274-
cicsProfile = { host: "wibble", port: 443, user: "user", password: "thisIsntReal" };
1274+
cicsProfile = { host: "wibble", port: 1490, user: "user", password: "thisIsntReal" };
12751275
submitSpy = jest.spyOn(SubmitJobs, "submitJclString").mockImplementation(() =>
12761276
[{ddName: "SYSTSPRT", stepName: "DFHDPLOY", data: "DFHRL2012I http://www.ibm.com/xmlns/prod/cics/bundle/NODEJSAPP"}] );
12771277
const parms = getCommonParmsForPushTests();
@@ -1300,7 +1300,7 @@ describe("BundlePusher01", () => {
13001300
expect(cmciSpy).toHaveBeenCalledTimes(1);
13011301
});
13021302
it("should generate diagnostics even if deploy fails", async () => {
1303-
cicsProfile = { host: "wibble", port: 443, user: "user", password: "thisIsntReal" };
1303+
cicsProfile = { host: "wibble", port: 1490, user: "user", password: "thisIsntReal" };
13041304
submitSpy = jest.spyOn(SubmitJobs, "submitJclString").mockImplementation(() =>
13051305
[{ddName: "SYSTSPRT", stepName: "DFHDPLOY", data: "DFHRL2055I DFHRL2067W"}] );
13061306
readSpy = jest.spyOn(fs, "readFileSync").mockImplementation((data: string) => {
@@ -1357,7 +1357,7 @@ describe("BundlePusher01", () => {
13571357
expect(cmciSpy).toHaveBeenCalledTimes(2);
13581358
});
13591359
it("should tolerate a Node.js diagnostics generation failure - region", async () => {
1360-
cicsProfile = { host: "wibble", port: 443, user: "user", password: "thisIsntReal" };
1360+
cicsProfile = { host: "wibble", port: 1490, user: "user", password: "thisIsntReal" };
13611361
submitSpy = jest.spyOn(SubmitJobs, "submitJclString").mockImplementation(() =>
13621362
[{ddName: "SYSTSPRT", stepName: "DFHDPLOY", data: "DFHRL2012I http://www.ibm.com/xmlns/prod/cics/bundle/NODEJSAPP"}] );
13631363
cmciSpy.mockImplementationOnce(() => { throw new Error("Injected CMCI GET error"); });
@@ -1378,7 +1378,7 @@ describe("BundlePusher01", () => {
13781378
expect(cmciSpy).toHaveBeenCalledTimes(1);
13791379
});
13801380
it("should tolerate a Node.js diagnostics generation failure - nodejsapp", async () => {
1381-
cicsProfile = { host: "wibble", port: 443, user: "user", password: "thisIsntReal" };
1381+
cicsProfile = { host: "wibble", port: 1490, user: "user", password: "thisIsntReal" };
13821382
submitSpy = jest.spyOn(SubmitJobs, "submitJclString").mockImplementation(() =>
13831383
[{ddName: "SYSTSPRT", stepName: "DFHDPLOY", data: "DFHRL2012I"}] );
13841384
readSpy = jest.spyOn(fs, "readFileSync").mockImplementation((data: string) => {
@@ -1423,7 +1423,7 @@ describe("BundlePusher01", () => {
14231423
expect(cmciSpy).toHaveBeenCalledTimes(2);
14241424
});
14251425
it("should tolerate a Node.js diagnostics generation failure - nodejsapp empty", async () => {
1426-
cicsProfile = { host: "wibble", port: 443, user: "user", password: "thisIsntReal" };
1426+
cicsProfile = { host: "wibble", port: 1490, user: "user", password: "thisIsntReal" };
14271427
submitSpy = jest.spyOn(SubmitJobs, "submitJclString").mockImplementation(() =>
14281428
[{ddName: "SYSTSPRT", stepName: "DFHDPLOY", data: "DFHRL2012I"}] );
14291429
readSpy = jest.spyOn(fs, "readFileSync").mockImplementation((data: string) => {
@@ -1468,7 +1468,7 @@ describe("BundlePusher01", () => {
14681468
expect(cmciSpy).toHaveBeenCalledTimes(2);
14691469
});
14701470
it("should generate Node.js diagnostics for 1 enabled NODEJSAPP", async () => {
1471-
cicsProfile = { host: "wibble", port: 443, user: "user", password: "thisIsntReal" };
1471+
cicsProfile = { host: "wibble", port: 1490, user: "user", password: "thisIsntReal" };
14721472
submitSpy = jest.spyOn(SubmitJobs, "submitJclString").mockImplementation(() =>
14731473
[{ddName: "SYSTSPRT", stepName: "DFHDPLOY", data: "DFHRL2012I"}] );
14741474
readSpy = jest.spyOn(fs, "readFileSync").mockImplementation((data: string) => {
@@ -1525,7 +1525,7 @@ describe("BundlePusher01", () => {
15251525
expect(cmciSpy).toHaveBeenCalledTimes(2);
15261526
});
15271527
it("should generate Node.js diagnostics for 1 disabled NODEJSAPP", async () => {
1528-
cicsProfile = { host: "wibble", port: 443, user: "user", password: "thisIsntReal" };
1528+
cicsProfile = { host: "wibble", port: 1490, user: "user", password: "thisIsntReal" };
15291529
submitSpy = jest.spyOn(SubmitJobs, "submitJclString").mockImplementation(() =>
15301530
[{ddName: "SYSTSPRT", stepName: "DFHDPLOY", data: "DFHRL2012I"}] );
15311531
readSpy = jest.spyOn(fs, "readFileSync").mockImplementation((data: string) => {
@@ -1584,7 +1584,7 @@ describe("BundlePusher01", () => {
15841584
it("should generate Node.js diagnostics for 2 NODEJSAPPs", async () => {
15851585
submitSpy = jest.spyOn(SubmitJobs, "submitJclString").mockImplementation(() =>
15861586
[{ddName: "SYSTSPRT", stepName: "DFHDPLOY", data: "DFHRL2012I"}] );
1587-
cicsProfile = { host: "wibble", port: 443, user: "user", password: "thisIsntReal" };
1587+
cicsProfile = { host: "wibble", port: 1490, user: "user", password: "thisIsntReal" };
15881588
readSpy = jest.spyOn(fs, "readFileSync").mockImplementation((data: string) => {
15891589
if (data.indexOf("cics.xml") > -1) {
15901590
return "<manifest xmlns=\"http://www.ibm.com/xmlns/prod/cics/bundle\">" +

‎src/api/BundlePush/CmciConfig.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ export class CmciConfig {
6464
}
6565
}
6666

67-
private static DEFAULT_CMCI_PORT = 443;
67+
private static DEFAULT_CMCI_PORT = 1490;
6868
private static validateRequired(cmciProfile: IProfile) {
6969
this.checkValueFound(cmciProfile.host, "cics-host");
7070
this.checkValueFound(cmciProfile.user, "cics-user");

0 commit comments

Comments
 (0)