Skip to content

Commit 1929a16

Browse files
committed
Merge branch 'fix-mii-filter-script' into 'main'
correct filter script error See merge request weblogic-cloud/weblogic-kubernetes-operator!4510
2 parents 9e11b1d + 9b38cbd commit 1929a16

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

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

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,10 @@ def isAdministrationPortEnabledForServer(server, model):
446446
else:
447447
administrationPortEnabled = isAdministrationPortEnabledForDomain(model)
448448

449-
return Boolean.valueOf(administrationPortEnabled)
449+
if isinstance(administrationPortEnabled, str):
450+
return Boolean.valueOf(administrationPortEnabled)
451+
else:
452+
return administrationPortEnabled
450453

451454

452455
def isAdministrationPortEnabledForDomain(model):
@@ -459,7 +462,10 @@ def isAdministrationPortEnabledForDomain(model):
459462
# Starting with 14.1.2.0, the domain's AdministrationPortEnabled default is derived from the domain's SecureMode
460463
administrationPortEnabled = isSecureModeEnabledForDomain(model)
461464

462-
return Boolean.valueOf(administrationPortEnabled)
465+
if isinstance(administrationPortEnabled, str):
466+
return Boolean.valueOf(administrationPortEnabled)
467+
else:
468+
return administrationPortEnabled
463469

464470

465471

@@ -481,7 +487,10 @@ def isSecureModeEnabledForDomain(model):
481487
is_production_mode_enabled = topology['ProductionModeEnabled']
482488
secureModeEnabled = is_production_mode_enabled and not env.wlsVersionEarlierThan("14.1.2.0")
483489

484-
return Boolean.valueOf(secureModeEnabled)
490+
if isinstance(secureModeEnabled, str):
491+
return Boolean.valueOf(secureModeEnabled)
492+
else:
493+
return secureModeEnabled
485494

486495

487496
def getSSLOrNone(server):

0 commit comments

Comments
 (0)