Merge branch 'jps-config-overrides' into 'develop-4.0'

Adding model overrides for opss-data-source driver properties in setting jps-config.xml

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

Author: robertpatrick

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

@@ -15,20 +15,30 @@
 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.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 STORE_TYPE_SSO
 from wlsdeploy.logging.platform_logger import get_logged_value
 from wlsdeploy.logging.platform_logger import PlatformLogger
+from wlsdeploy.util import dictionary_utils
 from wlsdeploy.util import string_utils
 
+OPSS_DATA_SOURCE_NAME = 'opss-data-source'
+
 
 class JpsConfigHelper(object):
     _logger = PlatformLogger('wlsdeploy.create')
     _class_name = 'JpsConfigHelper'
 
-    def __init__(self, model_context, rcu_db_info):
+    def __init__(self, model_object, model_context, rcu_db_info):
+        self._model_object = model_object
         self._model_context = model_context
         self._rcu_db_info = rcu_db_info
         self._use_ssl = rcu_db_info.is_use_atp() or rcu_db_info.is_use_ssl()
+        self._opss_data_source_model_props = self.__get_opss_data_source_model_properties()
 
     def fix_jps_config(self):
         _method_name = 'fix_jps_config'
@@ -121,12 +131,35 @@ def __set_property(self, dom_tree, prop, name, value, logMask=False):
         else:
             self._logger.entering(name, value, logMask, class_name=self._class_name, method_name=_method_name)
 
-        if not string_utils.is_empty(value):
+        value_to_set = dictionary_utils.get_element(self._opss_data_source_model_props, name, value)
+        if not string_utils.is_empty(value_to_set):
             property_element = dom_tree.createElement('property')
             property_element.setAttribute("name", name)
-            property_element.setAttribute("value", value)
+            property_element.setAttribute("value", value_to_set)
             prop.appendChild(property_element)
             newline = dom_tree.createTextNode('\n')
             prop.appendChild(newline)
 
         self._logger.exiting(class_name=self._class_name, method_name=_method_name)
+
+    def __get_opss_data_source_model_properties(self):
+        _method_name = '__get_opss_data_source_model_properties'
+        self._logger.entering(class_name=self._class_name, method_name=_method_name)
+
+        model_resources_dict = self._model_object.get_model_resources()
+        model_data_sources_dict = dictionary_utils.get_dictionary_element(model_resources_dict, JDBC_SYSTEM_RESOURCE)
+        model_opss_data_source_dict = \
+            dictionary_utils.get_dictionary_element(model_data_sources_dict, OPSS_DATA_SOURCE_NAME)
+        model_jdbc_resource_dict = dictionary_utils.get_dictionary_element(model_opss_data_source_dict, JDBC_RESOURCE)
+        model_driver_params_dict = dictionary_utils.get_dictionary_element(model_jdbc_resource_dict, JDBC_DRIVER_PARAMS)
+        model_driver_props_dict = \
+            dictionary_utils.get_dictionary_element(model_driver_params_dict, JDBC_DRIVER_PARAMS_PROPERTIES)
+
+        opss_model_props = dict()
+        for prop_key, prop_value in model_driver_props_dict.iteritems():
+            if prop_key == DRIVER_PARAMS_USER_PROPERTY:
+                continue
+            opss_model_props[prop_key] = prop_value
+
+        self._logger.exiting(class_name=self._class_name, method_name=_method_name)
+        return opss_model_props

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

@@ -218,7 +218,7 @@ def update_rcu_password(self, modify_bootstrap_credential=True):
 
     def fix_jps_config(self):
         if self._model_context.get_domain_typedef().requires_rcu():
-            jps_config_helper = JpsConfigHelper(self._model_context, self._rcu_db_info)
+            jps_config_helper = JpsConfigHelper(self._model_object, self._model_context, self._rcu_db_info)
             jps_config_helper.fix_jps_config()
 
     ####################

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

@@ -27,8 +27,8 @@ 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, #1655, #1656, #1658 - Overhaul of the Create Domain Tool's support for running RCU and applying RCU-related changes to the
-          RCU Data Sources.
+- #1654, #1655, #1656, #1658, #1659, #1660 - Overhaul of the Create Domain Tool's support for running RCU and applying
+          RCU-related changes to the RCU Data Sources.
 
 #### Other Changes
 - #1544 - Consolidated multiple internal WLST helper methods to get an MBean.
@@ -91,8 +91,10 @@ 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 
+- #1657 - Fixed an issue with the JRF pre-check functionality of the Create Domain Tool where it was ignoring any Data 
           Source overrides for the STB data source set in the model.
+- #1659 - Fixed an issue with the Create Domain Tool where it was ignoring any Data Source overrides for the OPSS data
+          source set in the model when fixing the jps-copfig.xml and jps-config-jse.xml files.
 
 #### Known Issues
 - SSH support requires a reasonably recent version of Bouncy Castle.  WDT picks up Bouncy Castle from WLST so, for example,