Skip to content

Commit ed9192f

Browse files
committed
fix lbWebPort issue
1 parent e805adc commit ed9192f

File tree

1 file changed

+39
-9
lines changed

1 file changed

+39
-9
lines changed

integration-tests/src/test/java/oracle/kubernetes/operator/ITOperator.java

Lines changed: 39 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,12 @@ public void testDomainOnPVUsingWLST() throws Exception {
158158
if (VOYAGER) {
159159
Map<String, Object> wlstDomainMap = TestUtils.loadYaml(domainonpvwlstFile);
160160
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"));
162167
domain = TestUtils.createDomain(wlstDomainMap);
163168
} else {
164169
domain = TestUtils.createDomain(domainonpvwlstFile);
@@ -206,8 +211,12 @@ public void testDomainOnPVUsingWDT() throws Exception {
206211
if (VOYAGER) {
207212
Map<String, Object> wdtDomainMap = TestUtils.loadYaml(domainonpvwdtFile);
208213
wdtDomainMap.put("loadBalancer", "VOYAGER");
214+
wdtDomainMap.put("loadBalancerWebPort", new Integer("30306"));
209215
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"));
211220
domain = TestUtils.createDomain(wdtDomainMap);
212221
} else {
213222
domain = TestUtils.createDomain(domainonpvwdtFile);
@@ -263,7 +272,12 @@ public void testTwoDomainsManagedByTwoOperators() throws Exception {
263272
wlstDomainMap.put("t3ChannelPort", new Integer("30031"));
264273
if (VOYAGER) {
265274
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"));
267281
}
268282
if (!INGRESSPERDOMAIN) {
269283
wlstDomainMap.put("ingressPerDomain", new Boolean("false"));
@@ -288,7 +302,7 @@ public void testTwoDomainsManagedByTwoOperators() throws Exception {
288302
// wdtDomainMap.put("clusterType", "Configured");
289303
if (VOYAGER) {
290304
wdtDomainMap.put("loadBalancer", "VOYAGER");
291-
wdtDomainMap.put("loadBalancerWebPort", new Integer("30306"));
305+
wdtDomainMap.put("loadBalancerWebPort", new Integer("30308"));
292306
logger.info(
293307
"domain2onpvwdt loadBalancer is set to: "
294308
+ wdtDomainMap.get("loadBalancer")
@@ -363,7 +377,12 @@ public void testCreateDomainWithStartPolicyAdminOnly() throws Exception {
363377
if (VOYAGER) {
364378
Map<String, Object> domainMap = TestUtils.loadYaml(domainadminonlyFile);
365379
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"));
367386
domain = TestUtils.createDomain(domainMap);
368387
} else {
369388
domain = TestUtils.createDomain(domainadminonlyFile);
@@ -405,8 +424,12 @@ public void testCreateDomainPVReclaimPolicyRecycle() throws Exception {
405424
if (VOYAGER) {
406425
Map<String, Object> domainMap = TestUtils.loadYaml(domainrecyclepolicyFile);
407426
domainMap.put("loadBalancer", "VOYAGER");
427+
domainMap.put("loadBalancerWebPort", new Integer("30310"));
408428
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"));
410433
domain = TestUtils.createDomain(domainMap);
411434
} else {
412435
domain = TestUtils.createDomain(domainrecyclepolicyFile);
@@ -447,8 +470,12 @@ public void testCreateDomainWithDefaultValuesInSampleInputs() throws Exception {
447470
if (VOYAGER) {
448471
Map<String, Object> domainMap = TestUtils.loadYaml(domainsampledefaultsFile);
449472
domainMap.put("loadBalancer", "VOYAGER");
473+
domainMap.put("loadBalancerWebPort", new Integer("30311"));
450474
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"));
452479
domain = TestUtils.createDomain(domainMap);
453480
} else {
454481
domain = TestUtils.createDomain(domainsampledefaultsFile);
@@ -499,9 +526,12 @@ public void testAutoAndCustomSitConfigOverrides() throws Exception {
499526
domainMap.put("t3ChannelPort", new Integer("30051"));
500527
if (VOYAGER) {
501528
domainMap.put("loadBalancer", "VOYAGER");
529+
domainMap.put("loadBalancerWebPort", new Integer("30312"));
502530
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"));
505535
}
506536
// use NFS for this domain on Jenkins, defaultis HOST_PATH
507537
if (System.getenv("JENKINS") != null && System.getenv("JENKINS").equalsIgnoreCase("true")) {

0 commit comments

Comments
 (0)