Avoid default JNDI name list for merge (#665)

* JIRA WDT-426 Use "weblogic" and "password1" for placeholders

* Issue #660 - Avoid merging values that are not set in online update

Author: rakillen

core/src/main/python/wlsdeploy/tool/deploy/deployer.py

@@ -228,6 +228,11 @@ def _get_existing_wlst_value(self, location, key, lsa_required_attribute_names):
         if wlst_key is None:
             return None
 
+        # online WLST may return a default value, even if the attribute was not set.
+        # don't merge with a value that was not set (example: JDBCDataSourceParams: JNDINames).
+        if not self.wlst_helper.is_set(wlst_key):
+            return None
+
         if key in lsa_required_attribute_names:
             attribute_map = self.wlst_helper.lsa()
             if wlst_key in attribute_map:

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

@@ -94,6 +94,34 @@ def get(self, attribute):
         self.__logger.finest('WLSDPLY-00006', attribute, class_name=self.__class_name, method_name=_method_name)
         return result
 
+    def is_set(self, attribute):
+        """
+        Determine if the specified attribute has been set.
+        In online WLST, attributes may return values that did not originate in config.xml (not set).
+        For offline WLST, return True always.
+        :param attribute: name of the WLST attribute
+        :return: True if the value has been set or in offline mode, False otherwise
+        :raises: Exception for the specified tool type: if a WLST error occurs
+        """
+        _method_name = 'is_set'
+        self.__logger.finest('WLSDPLY-00124', attribute, class_name=self.__class_name, method_name=_method_name)
+
+        if not self.__check_online_connection():
+            return True
+
+        try:
+            mbean_path = self.get_pwd()
+            mbean = self.get_mbean_for_wlst_path(mbean_path)
+            result = mbean.isSet(attribute)
+        except (self.__load_global('WLSTException'), offlineWLSTException), e:
+            pwe = exception_helper.create_exception(self.__exception_type, 'WLSDPLY-00125', attribute,
+                                                    self.__get_exception_mode(e), _format_exception(e), error=e)
+            self.__logger.throwing(class_name=self.__class_name, method_name=_method_name, error=pwe)
+            raise pwe
+
+        self.__logger.finest('WLSDPLY-00126', attribute, class_name=self.__class_name, method_name=_method_name)
+        return result
+
     def set_if_needed(self, wlst_name, wlst_value, masked=False):
         """
         Set the WLST attribute to the specified value if the name and value are not None.

core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties

@@ -106,6 +106,9 @@ WLSDPLY-0098=Quoted WebLogic String
 WLSDPLY-0100=Failed to set attribute {0} in path {1} to value {2}: {3}
 WLSDPLY-00101=Failed to modify the bootstrap credentials : {0}
 WLSDPLY-00123=Setting the server group {0} on dynamic cluster {1} failed : {2}
+WLSDPLY-00124=Entering is_set({0}) method
+WLSDPLY-00125=is_set({0}) in {1} mode failed: {2}
+WLSDPLY-00126=Exiting is_set({0}) method
 
 
 ###############################################################################