From 91d51f68059cc9ff526efde52c2b451bf3aa002b Mon Sep 17 00:00:00 2001 From: Ryan Eberhard Date: Thu, 14 Dec 2023 23:19:11 +0000 Subject: [PATCH] Cherry-pick branch 'unicode-fix-operator-1' into 'release/4.1' --- operator/src/main/resources/scripts/model_wdt_mii_filter.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/operator/src/main/resources/scripts/model_wdt_mii_filter.py b/operator/src/main/resources/scripts/model_wdt_mii_filter.py index b987e41334b..005f9d5bdd6 100644 --- a/operator/src/main/resources/scripts/model_wdt_mii_filter.py +++ b/operator/src/main/resources/scripts/model_wdt_mii_filter.py @@ -408,7 +408,7 @@ def isAdministrationPortEnabledForServer(server, model): else: administrationPortEnabled = isAdministrationPortEnabledForDomain(model) - if isinstance(administrationPortEnabled, str): + if isinstance(administrationPortEnabled, str) or isinstance(administrationPortEnabled, unicode): return Boolean.valueOf(administrationPortEnabled) else: return administrationPortEnabled @@ -424,7 +424,7 @@ def isAdministrationPortEnabledForDomain(model): # Starting with 14.1.2.0, the domain's AdministrationPortEnabled default is derived from the domain's SecureMode administrationPortEnabled = isSecureModeEnabledForDomain(model) - if isinstance(administrationPortEnabled, str): + if isinstance(administrationPortEnabled, str) or isinstance(administrationPortEnabled, unicode): return Boolean.valueOf(administrationPortEnabled) else: return administrationPortEnabled @@ -449,7 +449,7 @@ def isSecureModeEnabledForDomain(model): is_production_mode_enabled = topology['ProductionModeEnabled'] secureModeEnabled = is_production_mode_enabled and not env.wlsVersionEarlierThan("14.1.2.0") - if isinstance(secureModeEnabled, str): + if isinstance(secureModeEnabled, str) or isinstance(secureModeEnabled, unicode): return Boolean.valueOf(secureModeEnabled) else: return secureModeEnabled