Wdt 948 delete readd does not work (#956)

* Allow Set DatasourceAutomaticMigration to None

* Allow Set DatasourceAutomaticMigration to None

* Change to set mbean type

Author: CarolynRountree

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

@@ -797,6 +797,36 @@ def get_model_lsa_required_attribute_names(self, location):
 
         return lsa_required_attribute_names
 
+    def model_mbean_has_set_mbean_type_attribute_name(self, location, model_name):
+        """
+        Determine if the attribute for model_name has the set_mbean type value.
+        :param location: the location
+        :param model_name: the attribute name
+        :return: True if the attribute has the set method value
+        :raises: Tool type exception: if an error occurs
+        """
+        _method_name = 'model_mbean_has_set_mbean_type_attribute_name'
+
+        try:
+            module_folder = self._alias_entries.get_dictionary_for_location(location, resolve=False)
+            if ATTRIBUTES not in module_folder:
+                ex = exception_helper.create_alias_exception('WLSDPLY-08400', location.get_folder_path())
+                self._logger.throwing(ex, class_name=self._class_name, method_name=_method_name)
+                raise ex
+
+            set_mbean_type = False
+
+            if model_name in module_folder[ATTRIBUTES] and \
+                SET_MBEAN_TYPE in module_folder[ATTRIBUTES][model_name]:
+
+                    set_mbean_type = True
+
+            return set_mbean_type
+        except AliasException, ae:
+
+            self._raise_exception(ae, _method_name, 'WLSDPLY-19017', location.get_folder_path(),
+                          ae.getLocalizedMessage())
+
     def get_model_mbean_set_method_attribute_names_and_types(self, location):
         """
         Get the list of model attribute names and types where the set method requires an MBean.

core/src/main/python/wlsdeploy/tool/util/attribute_setter.py

@@ -236,8 +236,14 @@ def set_data_source_mbean(self, location, key, value, wlst_value):
         :param wlst_value: the existing value of the attribute from WLST
         :raises BundleAwareException of the specified type: if DataSource is not found
         """
-        mbean = self.__find_in_resource_group_or_domain(location, JDBC_SYSTEM_RESOURCE, value, required=True)
-        self.set_attribute(location, key, mbean, wlst_merge_value=wlst_value, use_raw_value=True)
+        if not value:
+            mbean = self.__wlst_helper.get_mbean(None)
+            wlst_attr = wlst_param = self.__aliases.get_wlst_attribute_name(location, key)
+            method = getattr(mbean, 'set' + wlst_attr)
+            method(None)
+        else:
+            mbean = self.__find_in_resource_group_or_domain(location, JDBC_SYSTEM_RESOURCE, value, required=True)
+            self.set_attribute(location, key, mbean, wlst_merge_value=wlst_value, use_raw_value=True)
         return
 
     def set_saf_remote_context_mbean(self, location, key, value, wlst_value):

core/src/main/python/wlsdeploy/tool/validate/validator.py

@@ -683,8 +683,9 @@ def __validate_attribute(self, attribute_name, attribute_value, valid_attr_infos
             self._logger.finer('WLSDPLY-05016', attribute_name, expected_data_type, actual_data_type,
                                class_name=_class_name, method_name=_method_name)
             if validation_utils.is_compatible_data_type(expected_data_type, actual_data_type) is False:
-                self._logger.warning('WLSDPLY-05017', attribute_name, model_folder_path, expected_data_type,
-                                     actual_data_type, class_name=_class_name, method_name=_method_name)
+                if not self._aliases.model_mbean_has_set_mbean_type_attribute_name(validation_location, attribute_name):
+                    self._logger.warning('WLSDPLY-05017', attribute_name, model_folder_path, expected_data_type,
+                                         actual_data_type, class_name=_class_name, method_name=_method_name)
 
             if attribute_name in path_tokens_attr_keys:
                 self.__validate_path_tokens_attribute(attribute_name, attribute_value, model_folder_path)

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

@@ -184,7 +184,7 @@
         "CoherenceClusterSystemResource":            [ {"version": "[12.1.2,)",     "wlst_mode": "both",    "wlst_name": "CoherenceClusterSystemResource",            "wlst_path": "WP001", "value": {"default": "None"                      }, "wlst_type": "string",           "set_method": "${:MBEAN.set_coherence_cluster_mbean}", "set_mbean_type": "${:weblogic.management.configuration.CoherenceClusterSystemResourceMBean}", "restart_required": "true" } ],
         "ConcurrentSingletonActivationEnabled":      [ {"version": "[12.2.1.3,)",   "wlst_mode": "both",    "wlst_name": "ConcurrentSingletonActivationEnabled",      "wlst_path": "WP001", "value": {"default": "false"                     }, "wlst_type": "boolean",          "restart_required": "true" } ],
         "ConsensusParticipants":                     [ {"version": "[10,)",         "wlst_mode": "both",    "wlst_name": "ConsensusParticipants",                     "wlst_path": "WP001", "value": {"default": 0                           }, "wlst_type": "integer",          "get_method": "GET" } ],
-        "DataSourceForAutomaticMigration":           [ {"version": "[10,)",         "wlst_mode": "both",    "wlst_name": "DataSourceForAutomaticMigration",           "wlst_path": "WP001", "value": {"default": "None"                      }, "wlst_type": "string",           "get_method": "${LSA:GET}", "set_method": "${:MBEAN.set_data_source_mbean}", "set_mbean_type": "${:weblogic.management.configuration.JDBCSystemResourceMBean}", "restart_required": "true" } ],
+        "DataSourceForAutomaticMigration":           [ {"version": "[10,)",         "wlst_mode": "both",    "wlst_name": "DataSourceForAutomaticMigration",           "wlst_path": "WP001", "value": {"default": "None"                      }, "wlst_type": "string",           "get_method": "${LSA:GET}", "set_method": "MBEAN.set_data_source_mbean", "set_mbean_type": "weblogic.management.configuration.JDBCSystemResourceMBean", "restart_required": "true" } ],
         "DataSourceForJobScheduler":                 [ {"version": "[10,)",         "wlst_mode": "both",    "wlst_name": "DataSourceForJobScheduler",                 "wlst_path": "WP001", "value": {"default": "None"                      }, "wlst_type": "string",           "set_method": "${:MBEAN.set_data_source_mbean}", "set_mbean_type": "${:weblogic.management.configuration.JDBCSystemResourceMBean}" } ],
         "DataSourceForSessionPersistence":           [ {"version": "[10,)",         "wlst_mode": "both",    "wlst_name": "DataSourceForSessionPersistence",           "wlst_path": "WP001", "value": {"default": "None"                      }, "wlst_type": "string",           "set_method": "${:MBEAN.set_data_source_mbean}", "set_mbean_type": "${:weblogic.management.configuration.JDBCSystemResourceMBean}", "restart_required": "true" } ],
         "DatabaseLeasingBasisConnectionRetryCount":  [ {"version": "[12.1.3,)",     "wlst_mode": "both",    "wlst_name": "DatabaseLeasingBasisConnectionRetryCount",  "wlst_path": "WP001", "value": {"default": 1                           }, "wlst_type": "integer",          "get_method": "GET", "restart_required": "true" } ],