Merge branch 'jrf-precheck-overrides' into 'develop-4.0'

Fixing precheck to honor model-specified STB DataSource overrides of the RCUDbInfo attributes

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

Author: robertpatrick

core/src/main/python/wlsdeploy/tool/create/jps_config_helper.py

@@ -5,7 +5,16 @@
 import os
 from xml.dom.minidom import parse
 
+from wlsdeploy.aliases.model_constants import DRIVER_PARAMS_KEYSTORE_PROPERTY
+from wlsdeploy.aliases.model_constants import DRIVER_PARAMS_KEYSTOREPWD_PROPERTY
+from wlsdeploy.aliases.model_constants import DRIVER_PARAMS_KEYSTORETYPE_PROPERTY
+from wlsdeploy.aliases.model_constants import DRIVER_PARAMS_NET_SERVER_DN_MATCH_PROPERTY
+from wlsdeploy.aliases.model_constants import DRIVER_PARAMS_NET_SSL_VERSION
 from wlsdeploy.aliases.model_constants import DRIVER_PARAMS_NET_SSL_VERSION_VALUE
+from wlsdeploy.aliases.model_constants import DRIVER_PARAMS_NET_TNS_ADMIN
+from wlsdeploy.aliases.model_constants import DRIVER_PARAMS_TRUSTSTORE_PROPERTY
+from wlsdeploy.aliases.model_constants import DRIVER_PARAMS_TRUSTSTOREPWD_PROPERTY
+from wlsdeploy.aliases.model_constants import DRIVER_PARAMS_TRUSTSTORETYPE_PROPERTY
 from wlsdeploy.logging.platform_logger import get_logged_value
 from wlsdeploy.logging.platform_logger import PlatformLogger
 from wlsdeploy.util import string_utils
@@ -69,19 +78,19 @@ def __set_ssl_properties(self, xml_doc, tns_admin, truststore, truststore_type,
 
         for prop in props:
             if prop.getAttribute('name') == 'props.db.1':
-                self.__set_property(dom_tree, prop, 'oracle.net.ssl_server_dn_match', 'true')
-                self.__set_property(dom_tree, prop, 'oracle.net.ssl_version', DRIVER_PARAMS_NET_SSL_VERSION_VALUE)
-                self.__set_property(dom_tree, prop, 'oracle.net.tns_admin', tns_admin)
-                self.__set_property(dom_tree, prop, 'javax.net.ssl.trustStoreType', truststore_type)
-                self.__set_property(dom_tree, prop, 'javax.net.ssl.keyStoreType', keystore_type)
-                self.__set_property(dom_tree, prop, 'javax.net.ssl.keyStore', keystore)
-                self.__set_property(dom_tree, prop, 'javax.net.ssl.trustStore', truststore)
+                self.__set_property(dom_tree, prop, DRIVER_PARAMS_NET_SERVER_DN_MATCH_PROPERTY, 'true')
+                self.__set_property(dom_tree, prop, DRIVER_PARAMS_NET_SSL_VERSION, DRIVER_PARAMS_NET_SSL_VERSION_VALUE)
+                self.__set_property(dom_tree, prop, DRIVER_PARAMS_NET_TNS_ADMIN, tns_admin)
+                self.__set_property(dom_tree, prop, DRIVER_PARAMS_TRUSTSTORETYPE_PROPERTY, truststore_type)
+                self.__set_property(dom_tree, prop, DRIVER_PARAMS_KEYSTORETYPE_PROPERTY, keystore_type)
+                self.__set_property(dom_tree, prop, DRIVER_PARAMS_KEYSTORE_PROPERTY, keystore)
+                self.__set_property(dom_tree, prop, DRIVER_PARAMS_TRUSTSTORE_PROPERTY, truststore)
 
                 if keystore_type != 'SSO':
-                    self.__set_property(dom_tree, prop, 'javax.net.ssl.keyStorePassword', keystore_password, True)
+                    self.__set_property(dom_tree, prop, DRIVER_PARAMS_KEYSTOREPWD_PROPERTY, keystore_password, True)
 
                 if truststore_type != 'SSO':
-                    self.__set_property(dom_tree, prop, 'javax.net.ssl.trustStorePassword', truststore_password, True)
+                    self.__set_property(dom_tree, prop, DRIVER_PARAMS_TRUSTSTOREPWD_PROPERTY, truststore_password, True)
 
                 # Persist the changes in the xml file
                 file_handle = None

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

@@ -45,7 +45,9 @@
 from wlsdeploy.aliases.model_constants import DRIVER_PARAMS_TRUSTSTORETYPE_PROPERTY
 from wlsdeploy.aliases.model_constants import DRIVER_PARAMS_TRUSTSTORE_PROPERTY
 from wlsdeploy.aliases.model_constants import DRIVER_PARAMS_USER_PROPERTY
+from wlsdeploy.aliases.model_constants import JDBC_DRIVER_PARAMS
 from wlsdeploy.aliases.model_constants import JDBC_DRIVER_PARAMS_PROPERTIES
+from wlsdeploy.aliases.model_constants import JDBC_RESOURCE
 from wlsdeploy.aliases.model_constants import JDBC_SYSTEM_RESOURCE
 from wlsdeploy.aliases.model_constants import PASSWORD_ENCRYPTED
 from wlsdeploy.aliases.model_constants import RCU_COMP_INFO
@@ -228,9 +230,9 @@ def __precheck_rcu_connectivity(self):
         self.__logger.entering(class_name=self.__class_name, method_name=_method_name)
 
         domain_typename = self._model_context.get_domain_typedef().get_domain_type()
+
         rcu_prefix = self._rcu_db_info.get_rcu_prefix()
         schema_name = None
-
         user_name = None
         if not string_utils.is_empty(rcu_prefix):
             user_name = self._model_context.get_weblogic_helper().get_stb_user_name(rcu_prefix)
@@ -264,6 +266,10 @@ def __precheck_rcu_connectivity(self):
             props.put('user', user_name)
             props.put('password', rcu_schema_pwd)
 
+            # Pick up any values overridden by any model resources section overrides for the STB datasource.
+            jdbc_driver_name, jdbc_conn_string = \
+                self.__update_precheck_from_model_data_source(jdbc_driver_name, jdbc_conn_string, props)
+
             # Force the driver to be loaded and registered...
             JClass.forName(jdbc_driver_name)
             DriverManager.getConnection(jdbc_conn_string, props)
@@ -839,3 +845,32 @@ def __get_jdbc_driver_class_name(self, rcu_database_type, is_xa=False):
 
         self.__logger.exiting(class_name=self.__class_name, method_name=_method_name, result=driver_name)
         return driver_name
+
+    def __update_precheck_from_model_data_source(self, jdbc_driver_name, jdbc_conn_string, props):
+        _method_name = '__update_precheck_from_model_data_source'
+        self.__logger.entering(jdbc_driver_name, jdbc_conn_string,
+                               class_name=self.__class_name, method_name=_method_name)
+
+        model_resources_dict = self._model_object.get_model_resources()
+        data_source_name = self._model_context.get_weblogic_helper().get_jrf_service_table_datasource_name()
+        data_sources_dict = dictionary_utils.get_dictionary_element(model_resources_dict, JDBC_SYSTEM_RESOURCE)
+        model_data_source_dict = dictionary_utils.get_dictionary_element(data_sources_dict, data_source_name)
+        model_jdbc_resource_dict = dictionary_utils.get_dictionary_element(model_data_source_dict, JDBC_RESOURCE)
+        model_driver_params_dict = dictionary_utils.get_dictionary_element(model_jdbc_resource_dict, JDBC_DRIVER_PARAMS)
+        model_properties_dict = \
+            dictionary_utils.get_dictionary_element(model_driver_params_dict, JDBC_DRIVER_PARAMS_PROPERTIES)
+
+        new_jdbc_driver_name = dictionary_utils.get_element(model_driver_params_dict, DRIVER_NAME, jdbc_driver_name)
+        new_jdbc_conn_string = dictionary_utils.get_element(model_driver_params_dict, URL, jdbc_conn_string)
+
+        new_password = dictionary_utils.get_element(model_driver_params_dict, PASSWORD_ENCRYPTED)
+        if new_password is not None:
+            new_password = self._aliases.decrypt_password(new_password)
+            props.set('password', new_password)
+
+        for prop_key, prop_value in model_properties_dict.iteritems():
+            props.set(prop_key, prop_value)
+
+        self.__logger.exiting(class_name=self.__class_name, method_name=_method_name,
+                              result=[new_jdbc_driver_name, new_jdbc_conn_string])
+        return new_jdbc_driver_name, new_jdbc_conn_string

documentation/4.0/content/release-notes/_index.md

@@ -27,7 +27,7 @@ pre = "<b> </b>"
           with online Update Domain and Deploy Applications tools.  For non-archive applications/libraries, online deployment of
           binaries outside of the archive will always assume that the binaries are available to the Administration Server at the
           model-specified paths.  Neither the `-remote` or SSH options will attempt to upload the non-archived binaries.
-- #1654 - Overhaul of the Create Domain Tool's support for running RCU and applying RCU-related changes to the
+- #1654, #1655, #1656, #1658 - Overhaul of the Create Domain Tool's support for running RCU and applying RCU-related changes to the
           RCU Data Sources.
 
 #### Other Changes
@@ -91,6 +91,8 @@ pre = "<b> </b>"
 - #1642 - Fixed deployment issues with deploying applications not included in an archive file.
 - #1643 - Fixed an issue with Discover Domain where application/library path tokenization was preventing adding
           deployments to the archive file.
+- #1657 - Fixed an issue with the JRF precheck functionality of the Create Domain Tool where it was ignoring any Data 
+          Source overrides for the STB data source set in the model.
 
 #### Known Issues
 - SSH support requires a reasonably recent version of Bouncy Castle.  WDT picks up Bouncy Castle from WLST so, for example,