adding check for derived value and moving restart-related errors to warnings (#1222)

* adding check for derived value and moving restart-related errors to warnings

* change test for default value

* removing derived default check from the wrong location

* adding back the corrected logic accounting for derived defaults

Co-authored-by: Carolyn Rountree <[email protected]>

Author: robertpatrick

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

@@ -1305,11 +1305,11 @@ def is_derived_default(self, location, model_attribute):
         :param model_attribute: model name of attribute to check
         :return: True if the default is derived
         """
-        _method_name = "get_derived_default"
+        _method_name = "is_derived_default"
         self._logger.entering(model_attribute, class_name=self._class_name, method_name=_method_name)
         result = False
         try:
-            attribute_info = self._alias_entries.get_alias_attribute_entry_by_wlst_name(location, model_attribute)
+            attribute_info = self._alias_entries.get_alias_attribute_entry_by_model_name(location, model_attribute)
             if attribute_info is not None and DERIVED_DEFAULT in attribute_info:
                 result = attribute_info[DERIVED_DEFAULT]
         except AliasException, ae:

integration-tests/alias-test/verify/src/test/python/aliastest/verify/alias_helper.py

@@ -138,3 +138,5 @@ def get_preferred_model_type(self, location, model_name):
     def get_wlst_read_type(self, location, model_name):
         return self.__aliases.get_wlst_read_type(location, model_name)
 
+    def is_derived_default(self, location, model_name):
+        return self.__aliases.is_derived_default(location, model_name)

integration-tests/alias-test/verify/src/test/python/aliastest/verify/verifier.py

@@ -730,12 +730,19 @@ def _is_valid_default_value(self, location, generated_attribute, generated_attri
         match = True
         model_name = None
         model_value = None
-        # aliases will automatically return None for a None in value
+        is_derived_default = False
         if generated_default is not None:
             try:
+                # This code is sort of non-intuitive because the method was written for a different
+                # purpose.  This get_model_attribute_name_and_value() function compared the value
+                # we pass in with the alias default (accounting for type conversion).  If the value
+                # passed in matches the alias default value, it returns None for model_value.
+                # Otherwise, it returns the passed in value converted to the alias type, if necessary.
+                #
                 model_name, model_value = \
                     self._alias_helper.get_model_attribute_name_and_value(location, generated_attribute,
                                                                           generated_default)
+                is_derived_default = self._alias_helper.is_derived_default(location, model_name)
             except TypeError, te:
                 self._add_error(location, ERROR_ATTRIBUTE_WRONG_DEFAULT_VALUE,
                                 message=te, attribute=generated_attribute)
@@ -747,8 +754,10 @@ def _is_valid_default_value(self, location, generated_attribute, generated_attri
         else:
             model_value = model_default_value
 
-        if match and model_value is not None:
-            match = False
+        # This if statement will be true if the default values do not match and the alias attribute
+        # is not marked as a derived_default.
+        #
+        if match and model_value is not None and not is_derived_default:
             attr_type = type(generated_default)
             if CMO_TYPE in generated_attribute_info and \
                     (generated_attribute_info[CMO_TYPE] == alias_constants.BOOLEAN or
@@ -799,7 +808,8 @@ def _is_valid_restart(self, location, generated_attribute, generated_attribute_i
                 self._add_error(location, ERROR_ATTRIBUTE_NOT_RESTART, attribute=model_attribute_name)
                 valid = False
         elif RESTART in generated_attribute_info and generated_attribute_info[RESTART] == 'true':
-            self._add_error(location, ERROR_ATTRIBUTE_RESTART, attribute=generated_attribute)
+            # TODO - temporary change to warning until we decide what to do about the restart attributes of the aliases.
+            self._add_warning(location, ERROR_ATTRIBUTE_RESTART, attribute=generated_attribute)
             valid = False
 
         _logger.exiting(result=verify_utils.bool_to_string(valid), class_name=CLASS_NAME, method_name=_method_name)