Merge branch 'unicode-fix-operator-1' into 'main'

Handle unicode when converting boolean See merge request weblogic-cloud/weblogic-kubernetes-operator!4519
oracle · Dec 13, 2023 · 1c94978 · 1c94978
2 parents bff38a8 + a9ffcc9
commit 1c94978
Showing 1 changed file with 3 additions and 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
@@ -446,7 +446,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
@@ -462,7 +462,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
@@ -487,7 +487,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