Merge branch 'alias-test-boolean-fix' into 'main'

Fix alias test problems from null boolean fix

See merge request weblogic-cloud/weblogic-deploy-tooling!1531

Author: robertpatrick

core/src/main/python/wlsdeploy/aliases/alias_utils.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2022, Oracle and/or its affiliates.
+Copyright (c) 2017, 2023, Oracle and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
 import copy
@@ -534,16 +534,10 @@ def convert_boolean(value):
     if value is not None:
         if type(value) is bool:
             result = value
-        elif type(value) is int:
-            if value == 1:
-                result = True
-            elif value == 0:
-                result = False
+        elif isinstance(value, (int, long)):
+            result = value == 1
         elif isinstance(value, basestring):
-            if value.lower() == 'true':
-                result = True
-            elif value.lower() == 'false':
-                result = False
+            result =  value.lower() in ['true', '1']
         elif isinstance(value, PyRealBoolean):
             result = value.getValue()
     return result

core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Domain.json

@@ -25,7 +25,11 @@
                                                              {"version": "[14.1.2,)",         "wlst_mode": "online",  "wlst_name": "ConsoleContextPath",                               "wlst_path": "WP001", "default_value": "retired-console", "wlst_type": "string", "uses_path_tokens": "true"  },
                                                              {"version": "[14.1.2,)",         "wlst_mode": "offline", "wlst_name": "ConsoleContextPath",                               "wlst_path": "WP001", "default_value": "console",         "wlst_type": "string", "uses_path_tokens": "true"  }
         ],
-        "ConsoleEnabled":                                  [ {"version": "[10,)",             "wlst_mode": "both",    "wlst_name": "ConsoleEnabled",                                   "wlst_path": "WP001", "default_value": "true",         "wlst_type": "boolean"  } ],
+        "ConsoleEnabled":                                  [
+            {"version": "[10,14.1.2)", "wlst_mode": "both",    "wlst_name": "ConsoleEnabled", "wlst_path": "WP001", "default_value": "true",  "wlst_type": "boolean" },
+            {"version": "[14.1.2,)",   "wlst_mode": "offline", "wlst_name": "ConsoleEnabled", "wlst_path": "WP001", "default_value": "true",  "wlst_type": "boolean" },
+            {"version": "[14.1.2,)",   "wlst_mode": "online",  "wlst_name": "ConsoleEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" }
+        ],
         "ConsoleExtensionDirectory":                       [ {"version": "[10,)",             "wlst_mode": "both",    "wlst_name": "ConsoleExtensionDirectory",                        "wlst_path": "WP001", "default_value": "console-ext",  "wlst_type": "string", "uses_path_tokens": "true"   } ],
         "DbPassiveMode":                                   [ {"version": "[12.2.1.3,)",       "wlst_mode": "both",    "wlst_name": "${Db:DB}PassiveMode",                              "wlst_path": "WP001", "default_value": "false",        "wlst_type": "boolean"  } ],
         "DbPassiveModeGracePeriodSeconds":                 [ {"version": "[12.2.1.3,)",       "wlst_mode": "both",    "wlst_name": "${Db:DB}PassiveModeGracePeriodSeconds",            "wlst_path": "WP001", "default_value": 30,             "wlst_type": "integer"  } ],