Skip to content

Commit 946094e

Browse files
committed
Merge branch 'fixadminport-detection' into 'main'
Fix admin port and secure mode detection, wlst jython can accept boolean,... See merge request weblogic-cloud/weblogic-kubernetes-operator!4504
2 parents f6845b5 + 463eaa4 commit 946094e

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

operator/src/main/resources/scripts/model_wdt_mii_filter.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import sys, traceback
5050
import time
5151
from java.lang import System
52+
from java.lang import Boolean
5253

5354
tmp_callerframerecord = inspect.stack()[0] # 0 represents this line # 1 represents line at caller
5455
tmp_info = inspect.getframeinfo(tmp_callerframerecord[0])
@@ -444,7 +445,8 @@ def isAdministrationPortEnabledForServer(server, model):
444445
administrationPortEnabled = server['AdministrationPortEnabled']
445446
else:
446447
administrationPortEnabled = isAdministrationPortEnabledForDomain(model)
447-
return administrationPortEnabled
448+
449+
return Boolean.valueOf(administrationPortEnabled)
448450

449451

450452
def isAdministrationPortEnabledForDomain(model):
@@ -456,7 +458,9 @@ def isAdministrationPortEnabledForDomain(model):
456458
# AdministrationPortEnabled is not explicitly set so going with the default
457459
# Starting with 14.1.2.0, the domain's AdministrationPortEnabled default is derived from the domain's SecureMode
458460
administrationPortEnabled = isSecureModeEnabledForDomain(model)
459-
return administrationPortEnabled
461+
462+
return Boolean.valueOf(administrationPortEnabled)
463+
460464

461465

462466
# Derive the default value for SecureMode of a domain
@@ -476,7 +480,8 @@ def isSecureModeEnabledForDomain(model):
476480
if 'ProductionModeEnabled' in topology:
477481
is_production_mode_enabled = topology['ProductionModeEnabled']
478482
secureModeEnabled = is_production_mode_enabled and not env.wlsVersionEarlierThan("14.1.2.0")
479-
return secureModeEnabled
483+
484+
return Boolean.valueOf(secureModeEnabled)
480485

481486

482487
def getSSLOrNone(server):

0 commit comments

Comments
 (0)