Merge branch 'boolean-null-default' into 'main'

Compare null-default boolean values correctly during discovery

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

Author: robertpatrick

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

@@ -1091,9 +1091,10 @@ def get_model_attribute_name_and_value(self, location, wlst_attribute_name, wlst
                         model_attribute_value = PASSWORD_TOKEN
 
                 elif model_type == 'boolean':
-                    wlst_val = alias_utils.convert_boolean(converted_value)
-                    default_val = alias_utils.convert_boolean(default_value)
-                    if wlst_val == default_val:
+                    # some boolean attributes have WLST value of null until they are set
+                    wlst_boolean = _get_boolean_or_none(wlst_attribute_value)  # from unconverted value
+                    default_boolean = _get_boolean_or_none(default_value)
+                    if wlst_boolean == default_boolean:
                         model_attribute_value = None
                     else:
                         model_attribute_value = converted_value
@@ -1591,3 +1592,14 @@ def _strings_are_empty(converted_value, default_value):
         str_default_value = None
 
     return string_utils.is_empty(str_converted_value) and string_utils.is_empty(str_default_value)
+
+
+def _get_boolean_or_none(attribute_value):
+    """
+    Return the boolean value of the specified value, or None if it is None.
+    This is needed to match boolean WLST attributes that are null until they are set.
+    :param attribute_value: the value to convert to boolean or None
+    """
+    if attribute_value is None:
+        return None
+    return alias_utils.convert_boolean(attribute_value)

core/src/test/python/aliases_test.py

@@ -350,23 +350,23 @@ def testGetWlstAttributeNameAndValue(self):
     def testGetModelAttributeNameAndValue(self):
         location = get_jdbc_ds_params_location('my-datasource', self.aliases)
 
-        # get model attribute value should return the value only if its NOT the default
-        boolean_values = ['false', None]
+        # get model attribute value should return the value only if it's NOT the default
+        boolean_values = ['false', False]
         wlst_attribute_name = 'RowPrefetch'
         wlst_attribute_value = boolean_values[0]
         model_attribute_name, model_attribute_value = \
             self.aliases.get_model_attribute_name_and_value(location, wlst_attribute_name, wlst_attribute_value)
-        self.assertEqual(model_attribute_value, boolean_values[1])
+        self.assertEqual(bool(model_attribute_value), boolean_values[1])
 
-        # get model attribute value should return the value only if its NOT the default
+        # get model attribute value should return the value only if it's NOT the default
         string_value = [None, None]
         wlst_attribute_name = 'RowPrefetchSize'
         wlst_attribute_value = string_value[0]
         model_attribute_name, model_attribute_value = \
             self.aliases.get_model_attribute_name_and_value(location, wlst_attribute_name, wlst_attribute_value)
         self.assertEqual(model_attribute_value, string_value[1])
 
-        # get model attribute value should return the value only if its NOT the default
+        # get model attribute value should return the value only if it's NOT the default
         location = LocationContext()
         location.append_location(FOLDERS.SERVER)
         boolean_values = [0, None]