@@ -158,7 +158,12 @@ public void testDomainOnPVUsingWLST() throws Exception {
158
158
if (VOYAGER ) {
159
159
Map <String , Object > wlstDomainMap = TestUtils .loadYaml (domainonpvwlstFile );
160
160
wlstDomainMap .put ("loadBalancer" , "VOYAGER" );
161
- logger .info ("domain1onpvwlst loadBalancer is set to: " + wlstDomainMap .get ("loadBalancer" ));
161
+ wlstDomainMap .put ("loadBalancerWebPort" , new Integer ("30305" ));
162
+ logger .info (
163
+ "domainonpvwlst loadBalancer is set to: "
164
+ + wlstDomainMap .get ("loadBalancer" )
165
+ + " with loadBalancerWebPort:"
166
+ + wlstDomainMap .get ("loadBalancerWebPort" ));
162
167
domain = TestUtils .createDomain (wlstDomainMap );
163
168
} else {
164
169
domain = TestUtils .createDomain (domainonpvwlstFile );
@@ -206,8 +211,12 @@ public void testDomainOnPVUsingWDT() throws Exception {
206
211
if (VOYAGER ) {
207
212
Map <String , Object > wdtDomainMap = TestUtils .loadYaml (domainonpvwdtFile );
208
213
wdtDomainMap .put ("loadBalancer" , "VOYAGER" );
214
+ wdtDomainMap .put ("loadBalancerWebPort" , new Integer ("30306" ));
209
215
logger .info (
210
- "domainonpvwdtFile loadBalancer is set to: " + wdtDomainMap .get ("loadBalancer" ));
216
+ "domainonpvwdt loadBalancer is set to: "
217
+ + wdtDomainMap .get ("loadBalancer" )
218
+ + " with loadBalancerWebPort:"
219
+ + wdtDomainMap .get ("loadBalancerWebPort" ));
211
220
domain = TestUtils .createDomain (wdtDomainMap );
212
221
} else {
213
222
domain = TestUtils .createDomain (domainonpvwdtFile );
@@ -263,7 +272,12 @@ public void testTwoDomainsManagedByTwoOperators() throws Exception {
263
272
wlstDomainMap .put ("t3ChannelPort" , new Integer ("30031" ));
264
273
if (VOYAGER ) {
265
274
wlstDomainMap .put ("loadBalancer" , "VOYAGER" );
266
- logger .info ("domain1onpvwlst loadBalancer is set to: " + wlstDomainMap .get ("loadBalancer" ));
275
+ wlstDomainMap .put ("loadBalancerWebPort" , new Integer ("30307" ));
276
+ logger .info (
277
+ "domain1onpvwlst loadBalancer is set to: "
278
+ + wlstDomainMap .get ("loadBalancer" )
279
+ + " with loadBalancerWebPort:"
280
+ + wlstDomainMap .get ("loadBalancerWebPort" ));
267
281
}
268
282
if (!INGRESSPERDOMAIN ) {
269
283
wlstDomainMap .put ("ingressPerDomain" , new Boolean ("false" ));
@@ -288,7 +302,7 @@ public void testTwoDomainsManagedByTwoOperators() throws Exception {
288
302
// wdtDomainMap.put("clusterType", "Configured");
289
303
if (VOYAGER ) {
290
304
wdtDomainMap .put ("loadBalancer" , "VOYAGER" );
291
- wdtDomainMap .put ("loadBalancerWebPort" , new Integer ("30306 " ));
305
+ wdtDomainMap .put ("loadBalancerWebPort" , new Integer ("30308 " ));
292
306
logger .info (
293
307
"domain2onpvwdt loadBalancer is set to: "
294
308
+ wdtDomainMap .get ("loadBalancer" )
@@ -363,7 +377,12 @@ public void testCreateDomainWithStartPolicyAdminOnly() throws Exception {
363
377
if (VOYAGER ) {
364
378
Map <String , Object > domainMap = TestUtils .loadYaml (domainadminonlyFile );
365
379
domainMap .put ("loadBalancer" , "VOYAGER" );
366
- logger .info ("domainadminonlyFile loadBalancer is set to: " + domainMap .get ("loadBalancer" ));
380
+ domainMap .put ("loadBalancerWebPort" , new Integer ("30309" ));
381
+ logger .info (
382
+ "domainadminonly loadBalancer is set to: "
383
+ + domainMap .get ("loadBalancer" )
384
+ + " with loadBalancerWebPort:"
385
+ + domainMap .get ("loadBalancerWebPort" ));
367
386
domain = TestUtils .createDomain (domainMap );
368
387
} else {
369
388
domain = TestUtils .createDomain (domainadminonlyFile );
@@ -405,8 +424,12 @@ public void testCreateDomainPVReclaimPolicyRecycle() throws Exception {
405
424
if (VOYAGER ) {
406
425
Map <String , Object > domainMap = TestUtils .loadYaml (domainrecyclepolicyFile );
407
426
domainMap .put ("loadBalancer" , "VOYAGER" );
427
+ domainMap .put ("loadBalancerWebPort" , new Integer ("30310" ));
408
428
logger .info (
409
- "domainrecyclepolicyFile loadBalancer is set to: " + domainMap .get ("loadBalancer" ));
429
+ "domainrecyclepolicy loadBalancer is set to: "
430
+ + domainMap .get ("loadBalancer" )
431
+ + " with loadBalancerWebPort:"
432
+ + domainMap .get ("loadBalancerWebPort" ));
410
433
domain = TestUtils .createDomain (domainMap );
411
434
} else {
412
435
domain = TestUtils .createDomain (domainrecyclepolicyFile );
@@ -447,8 +470,12 @@ public void testCreateDomainWithDefaultValuesInSampleInputs() throws Exception {
447
470
if (VOYAGER ) {
448
471
Map <String , Object > domainMap = TestUtils .loadYaml (domainsampledefaultsFile );
449
472
domainMap .put ("loadBalancer" , "VOYAGER" );
473
+ domainMap .put ("loadBalancerWebPort" , new Integer ("30311" ));
450
474
logger .info (
451
- "domainsampledefaultsFile loadBalancer is set to: " + domainMap .get ("loadBalancer" ));
475
+ "domainsampledefaultsFile loadBalancer is set to: "
476
+ + domainMap .get ("loadBalancer" )
477
+ + " with loadBalancerWebPort:"
478
+ + domainMap .get ("loadBalancerWebPort" ));
452
479
domain = TestUtils .createDomain (domainMap );
453
480
} else {
454
481
domain = TestUtils .createDomain (domainsampledefaultsFile );
@@ -499,9 +526,12 @@ public void testAutoAndCustomSitConfigOverrides() throws Exception {
499
526
domainMap .put ("t3ChannelPort" , new Integer ("30051" ));
500
527
if (VOYAGER ) {
501
528
domainMap .put ("loadBalancer" , "VOYAGER" );
529
+ domainMap .put ("loadBalancerWebPort" , new Integer ("30312" ));
502
530
logger .info (
503
- "testAutoAndCustomSitConfigOverrides loadBalancer is set to: "
504
- + domainMap .get ("loadBalancer" ));
531
+ " AutoAndCustomSitConfigOverrides loadBalancer is set to: "
532
+ + domainMap .get ("loadBalancer" )
533
+ + " with loadBalancerWebPort:"
534
+ + domainMap .get ("loadBalancerWebPort" ));
505
535
}
506
536
// use NFS for this domain on Jenkins, defaultis HOST_PATH
507
537
if (System .getenv ("JENKINS" ) != null && System .getenv ("JENKINS" ).equalsIgnoreCase ("true" )) {
0 commit comments