add logic to set atp db properties

Author: jshum2479

core/src/main/python/create.py

@@ -74,7 +74,8 @@
     CommandLineArgUtil.RCU_SCHEMA_PASS_SWITCH,
     CommandLineArgUtil.VARIABLE_FILE_SWITCH,
     CommandLineArgUtil.USE_ENCRYPTION_SWITCH,
-    CommandLineArgUtil.PASSPHRASE_SWITCH
+    CommandLineArgUtil.PASSPHRASE_SWITCH,
+    CommandLineArgUtil.RCU_PROPERTIES_FILE_SWITCH
 ]
 
 
@@ -86,11 +87,12 @@ def __process_args(args):
     """
     cla_util = CommandLineArgUtil(_program_name, __required_arguments, __optional_arguments)
     required_arg_map, optional_arg_map = cla_util.process_args(args, True)
-
+    print 'PASSED 1'
     __verify_required_args_present(required_arg_map)
     __process_java_home_arg(optional_arg_map)
     __process_domain_location_args(optional_arg_map)
     __process_model_args(optional_arg_map)
+    print 'PASSED 2'
 
     #
     # Verify that the domain type is a known type and load its typedef.
@@ -272,6 +274,8 @@ def __process_rcu_args(optional_arg_map, domain_type, domain_typedef):
                 ex.setExitCode(CommandLineArgUtil.USAGE_ERROR_EXIT_CODE)
                 __logger.throwing(ex, class_name=_class_name, method_name=_method_name)
                 raise ex
+        elif CommandLineArgUtil.RCU_PROPERTIES_FILE_SWITCH in optional_arg_map:
+            pass
         else:
             ex = exception_helper.create_cla_exception('WLSDPLY-12408', domain_type, rcu_schema_count,
                                                        CommandLineArgUtil.RCU_DB_SWITCH,
@@ -381,6 +385,9 @@ def main(args):
         __clean_up_temp_files()
         tool_exit.end(model_context, CommandLineArgUtil.PROG_ERROR_EXIT_CODE)
 
+
+
+
     aliases = Aliases(model_context, wlst_mode=__wlst_mode)
     validate_model(model, model_context, aliases)
 

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

@@ -274,6 +274,16 @@
 DRIVER_NAME = 'DriverName'
 DRIVER_PARAMS_PROPERTY_VALUE = 'Value'
 DRIVER_PARAMS_USER_PROPERTY = 'user'
+DRIVER_PARAMS_TRUSTSTORE_PROPERTY = 'javax.net.ssl.trustStore'
+DRIVER_PARAMS_kEYSTORE_PROPERTY = 'javax.net.ssl.keyStore'
+DRIVER_PARAMS_TRUSTSTORETYPE_PROPERTY = 'javax.net.ssl.trustStoreType'
+DRIVER_PARAMS_KEYSTORETYPE_PROPERTY = 'javax.net.ssl.keyStoreType'
+DRIVER_PARAMS_TRUSTSTOREPWD_PROPERTY = 'javax.net.ssl.trustStorePassword'
+DRIVER_PARAMS_KEYSTOREPWD_PROPERTY = 'javax.net.ssl.keyStorePassword'
+DRIVER_PARAMS_NET_SERVER_DN_MATCH_PROPERTY = 'oracle.net.ssl_server_dn_match'
+DRIVER_PARAMS_NET_SSL_VERSION = 'oracle.net.ssl_version'
+DRIVER_PARAMS_NET_TNS_ADMIN = 'oracle.net.tns_admin'
+DRIVER_PARAMS_NET_FAN_ENABLED = 'oracle.jdbc.fanEnabled'
 ENABLED = 'Enabled'
 HARVESTED_ATTRIBUTE = 'HarvestedAttribute'
 HARVESTED_INSTANCE = 'HarvestedInstance'

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

@@ -17,6 +17,18 @@
 from wlsdeploy.aliases.model_constants import DRIVER_NAME
 from wlsdeploy.aliases.model_constants import DRIVER_PARAMS_PROPERTY_VALUE
 from wlsdeploy.aliases.model_constants import DRIVER_PARAMS_USER_PROPERTY
+
+from wlsdeploy.aliases.model_constants import DRIVER_PARAMS_TRUSTSTORE_PROPERTY
+from wlsdeploy.aliases.model_constants import DRIVER_PARAMS_kEYSTORE_PROPERTY
+from wlsdeploy.aliases.model_constants import DRIVER_PARAMS_TRUSTSTORETYPE_PROPERTY
+from wlsdeploy.aliases.model_constants import DRIVER_PARAMS_KEYSTORETYPE_PROPERTY
+from wlsdeploy.aliases.model_constants import DRIVER_PARAMS_TRUSTSTOREPWD_PROPERTY
+from wlsdeploy.aliases.model_constants import DRIVER_PARAMS_KEYSTOREPWD_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_TNS_ADMIN
+from wlsdeploy.aliases.model_constants import DRIVER_PARAMS_NET_FAN_ENABLED
+
 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
@@ -46,6 +58,7 @@
 from wlsdeploy.aliases.model_constants import WS_RELIABLE_DELIVERY_POLICY
 from wlsdeploy.aliases.model_constants import XML_ENTITY_CACHE
 from wlsdeploy.aliases.model_constants import XML_REGISTRY
+from wlsdeploy.util import variables
 from wlsdeploy.exception import exception_helper
 from wlsdeploy.exception.expection_types import ExceptionType
 from wlsdeploy.tool.create.creator import Creator
@@ -58,6 +71,7 @@
 from wlsdeploy.tool.util.topology_helper import TopologyHelper
 from wlsdeploy.util import dictionary_utils
 from wlsdeploy.util import model as model_helper
+from oracle.weblogic.deploy.util import VariableException
 
 
 class DomainCreator(Creator):
@@ -195,6 +209,7 @@ def __run_rcu(self):
         rcu_sys_pass = self.model_context.get_rcu_sys_pass()
         rcu_schema_pass = self.model_context.get_rcu_schema_pass()
 
+
         runner = RCURunner(domain_type, oracle_home, java_home, rcu_db, rcu_prefix, rcu_schemas)
         runner.runRcu(rcu_sys_pass, rcu_schema_pass)
 
@@ -642,6 +657,20 @@ def __create_other_domain_artifacts(self, location, mbean_type_list):
         self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
         return
 
+    def __set_atp_connection_property(self, root_location, propery_name, property_value):
+        token_name = self.alias_helper.get_name_token(root_location)
+        if token_name is not None:
+            root_location.add_name_token(token_name, propery_name)
+
+        wlst_name, wlst_value = \
+            self.alias_helper.get_wlst_attribute_name_and_value(root_location, DRIVER_PARAMS_PROPERTY_VALUE,
+                                                                property_value )
+        self.wlst_helper.set_if_needed(wlst_name, wlst_value,
+                                       JDBC_DRIVER_PARAMS_PROPERTIES, propery_name)
+
+        root_location.remove_name_token(propery_name)
+
+
     def __configure_fmw_infra_database(self):
         """
         Configure the FMW Infrastructure DataSources.
@@ -650,61 +679,167 @@ def __configure_fmw_infra_database(self):
         _method_name = '__configure_fmw_infra_database'
 
         self.logger.entering(class_name=self.__class_name, method_name=_method_name)
-        rcu_database = self.model_context.get_rcu_database()
-        if rcu_database is None:
-            return
 
-        # No need to validate since these were validated at the entry point...
-        rcu_prefix = self.model_context.get_rcu_prefix()
-        rcu_schema_pwd = self.model_context.get_rcu_schema_pass()
+        # For ATP databases :  we need to set all the property for each datasource
+        # load atp connection properties from properties file
+        #
+        props_file = self.model_context.get_rcu_properties_file()
+        if props_file:
+            try:
+                rcu_properties_map = variables.load_variables(props_file)
+
+                print rcu_properties_map
+                print '------'
+
+                # parse the tnsnames.ora file and retrieve the connection string
+                tns_admin = rcu_properties_map[DRIVER_PARAMS_NET_TNS_ADMIN]
+                tns_names = variables.load_variables( tns_admin + os.sep +
+                                                      'tnsnames.ora')
+
+                rcu_database = tns_names[rcu_properties_map['tns.entry']]
+
+                rcu_prefix = rcu_properties_map['rcu_prefix']
+                rcu_schema_pwd = rcu_properties_map['rcu_schema_password']
+
+                keystore_pwd = rcu_properties_map[DRIVER_PARAMS_KEYSTOREPWD_PROPERTY]
+                truststore_pwd = rcu_properties_map[DRIVER_PARAMS_TRUSTSTOREPWD_PROPERTY]
+
+                # Need to set for the connection proeprty for each datasource
+
+                print 'conn ' + str(rcu_database)
+                print 'prefix ' + str(rcu_prefix)
+                print 'pawws ' + str(rcu_schema_pwd)
+                fmw_database = self.wls_helper.get_jdbc_url_from_rcu_connect_string(rcu_database)
+
+                location = LocationContext()
+                location.append_location(JDBC_SYSTEM_RESOURCE)
+                token_name = self.alias_helper.get_name_token(location)
+
+                folder_path = self.alias_helper.get_wlst_list_path(location)
+                self.wlst_helper.cd(folder_path)
+                ds_names = self.wlst_helper.lsc()
+                print ds_names
+
+                for ds_name in ds_names:
+                    location = LocationContext()
+                    location.append_location(JDBC_SYSTEM_RESOURCE)
+                    token_name = self.alias_helper.get_name_token(location)
+                    location.add_name_token(token_name, ds_name)
+
+
+                    location.append_location(JDBC_RESOURCE)
+                    location.append_location(JDBC_DRIVER_PARAMS)
+                    wlst_path = self.alias_helper.get_wlst_attributes_path(location)
+                    self.wlst_helper.cd(wlst_path)
+
+                    wlst_name, wlst_value = \
+                        self.alias_helper.get_wlst_attribute_name_and_value(location, URL, fmw_database)
+                    self.wlst_helper.set_if_needed(wlst_name, wlst_value, JDBC_DRIVER_PARAMS, ds_name)
+
+                    wlst_name, wlst_value = \
+                        self.alias_helper.get_wlst_attribute_name_and_value(location, PASSWORD_ENCRYPTED,
+                                                                            rcu_schema_pwd, masked=True)
+
+                    self.wlst_helper.set_if_needed(wlst_name, wlst_value, JDBC_DRIVER_PARAMS, ds_name, masked=True)
+
+
+                    location.append_location(JDBC_DRIVER_PARAMS_PROPERTIES)
+                    token_name = self.alias_helper.get_name_token(location)
+                    if token_name is not None:
+                        location.add_name_token(token_name, DRIVER_PARAMS_USER_PROPERTY)
+
+                    wlst_path = self.alias_helper.get_wlst_attributes_path(location)
+                    self.wlst_helper.cd(wlst_path)
+                    orig_user = self.wlst_helper.get('Value')
+                    stb_user = orig_user.replace('DEV', rcu_prefix)
+                    wlst_name, wlst_value = \
+                        self.alias_helper.get_wlst_attribute_name_and_value(location, DRIVER_PARAMS_PROPERTY_VALUE, stb_user)
+                    self.wlst_helper.set_if_needed(wlst_name, wlst_value,
+                                                   JDBC_DRIVER_PARAMS_PROPERTIES, DRIVER_PARAMS_USER_PROPERTY)
+
+                    # need to set other properties
+
+                    location.remove_name_token(DRIVER_PARAMS_USER_PROPERTY)
+
+                    self.__set_atp_connection_property(location, DRIVER_PARAMS_kEYSTORE_PROPERTY, tns_admin + os.sep
+                                                       + 'keystore.jks')
+                    self.__set_atp_connection_property(location, DRIVER_PARAMS_KEYSTORETYPE_PROPERTY,
+                                                       'JKS')
+                    self.__set_atp_connection_property(location, DRIVER_PARAMS_KEYSTOREPWD_PROPERTY, keystore_pwd)
+                    self.__set_atp_connection_property(location, DRIVER_PARAMS_TRUSTSTORE_PROPERTY, tns_admin + os.sep
+                                                       + 'truststore.jks')
+                    self.__set_atp_connection_property(location, DRIVER_PARAMS_TRUSTSTORETYPE_PROPERTY,
+                                                       'JKS')
+                    self.__set_atp_connection_property(location, DRIVER_PARAMS_TRUSTSTOREPWD_PROPERTY, truststore_pwd)
+
+                    self.__set_atp_connection_property(location, DRIVER_PARAMS_NET_SSL_VERSION, '1.2')
+                    self.__set_atp_connection_property(location, DRIVER_PARAMS_NET_SERVER_DN_MATCH_PROPERTY, 'true')
+                    self.__set_atp_connection_property(location, DRIVER_PARAMS_NET_TNS_ADMIN, tns_admin)
+                    self.__set_atp_connection_property(location, DRIVER_PARAMS_NET_FAN_ENABLED, 'false')
+                    print 'UPDATED ALL PROPERTIES '
+
+            except VariableException, ex:
+                self.logger.severe('WLSDPLY-20004', _program_name, ex.getLocalizedMessage(), error=ex,
+                                   class_name=_class_name, method_name=_method_name)
+                self.logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
+                raise ex
 
-        fmw_database = self.wls_helper.get_jdbc_url_from_rcu_connect_string(rcu_database)
-        self.logger.fine('WLSDPLY-12221', fmw_database, class_name=self.__class_name, method_name=_method_name)
+        else:
+            rcu_database = self.model_context.get_rcu_database()
+            if rcu_database is None:
+                return
 
-        location = LocationContext()
-        location.append_location(JDBC_SYSTEM_RESOURCE)
-        token_name = self.alias_helper.get_name_token(location)
-        svc_table_ds_name = self.wls_helper.get_jrf_service_table_datasource_name()
-        if token_name is not None:
-            location.add_name_token(token_name, svc_table_ds_name)
+            rcu_prefix = self.model_context.get_rcu_prefix()
+            rcu_schema_pwd = self.model_context.get_rcu_schema_pass()
 
-        location.append_location(JDBC_RESOURCE)
-        location.append_location(JDBC_DRIVER_PARAMS)
-        wlst_path = self.alias_helper.get_wlst_attributes_path(location)
-        self.wlst_helper.cd(wlst_path)
+            fmw_database = self.wls_helper.get_jdbc_url_from_rcu_connect_string(rcu_database)
+            self.logger.fine('WLSDPLY-12221', fmw_database, class_name=self.__class_name, method_name=_method_name)
 
-        svc_table_driver_name = self.wls_helper.get_stb_data_source_jdbc_driver_name()
-        wlst_name, wlst_value = \
-            self.alias_helper.get_wlst_attribute_name_and_value(location, DRIVER_NAME, svc_table_driver_name)
-        self.wlst_helper.set_if_needed(wlst_name, wlst_value, JDBC_DRIVER_PARAMS, svc_table_ds_name)
+            location = LocationContext()
+            location.append_location(JDBC_SYSTEM_RESOURCE)
+            token_name = self.alias_helper.get_name_token(location)
+            svc_table_ds_name = self.wls_helper.get_jrf_service_table_datasource_name()
+            if token_name is not None:
+                location.add_name_token(token_name, svc_table_ds_name)
 
-        wlst_name, wlst_value = \
-            self.alias_helper.get_wlst_attribute_name_and_value(location, URL, fmw_database)
-        self.wlst_helper.set_if_needed(wlst_name, wlst_value, JDBC_DRIVER_PARAMS, svc_table_ds_name)
+            location.append_location(JDBC_RESOURCE)
+            location.append_location(JDBC_DRIVER_PARAMS)
+            wlst_path = self.alias_helper.get_wlst_attributes_path(location)
+            self.wlst_helper.cd(wlst_path)
 
-        wlst_name, wlst_value = \
-            self.alias_helper.get_wlst_attribute_name_and_value(location, PASSWORD_ENCRYPTED,
-                                                                rcu_schema_pwd, masked=True)
-        self.wlst_helper.set_if_needed(wlst_name, wlst_value, JDBC_DRIVER_PARAMS, svc_table_ds_name, masked=True)
+            svc_table_driver_name = self.wls_helper.get_stb_data_source_jdbc_driver_name()
+            wlst_name, wlst_value = \
+                self.alias_helper.get_wlst_attribute_name_and_value(location, DRIVER_NAME, svc_table_driver_name)
+            self.wlst_helper.set_if_needed(wlst_name, wlst_value, JDBC_DRIVER_PARAMS, svc_table_ds_name)
 
-        location.append_location(JDBC_DRIVER_PARAMS_PROPERTIES)
-        token_name = self.alias_helper.get_name_token(location)
+            wlst_name, wlst_value = \
+                self.alias_helper.get_wlst_attribute_name_and_value(location, URL, fmw_database)
+            self.wlst_helper.set_if_needed(wlst_name, wlst_value, JDBC_DRIVER_PARAMS, svc_table_ds_name)
 
-        if token_name is not None:
-            location.add_name_token(token_name, DRIVER_PARAMS_USER_PROPERTY)
+            wlst_name, wlst_value = \
+                self.alias_helper.get_wlst_attribute_name_and_value(location, PASSWORD_ENCRYPTED,
+                                                                    rcu_schema_pwd, masked=True)
+            self.wlst_helper.set_if_needed(wlst_name, wlst_value, JDBC_DRIVER_PARAMS, svc_table_ds_name, masked=True)
 
-        stb_user = self.wls_helper.get_stb_user_name(rcu_prefix)
-        self.logger.fine('WLSDPLY-12222', stb_user, class_name=self.__class_name, method_name=_method_name)
-        wlst_path = self.alias_helper.get_wlst_attributes_path(location)
-        self.wlst_helper.cd(wlst_path)
-        wlst_name, wlst_value = \
-            self.alias_helper.get_wlst_attribute_name_and_value(location, DRIVER_PARAMS_PROPERTY_VALUE, stb_user)
-        self.wlst_helper.set_if_needed(wlst_name, wlst_value,
-                                       JDBC_DRIVER_PARAMS_PROPERTIES, DRIVER_PARAMS_USER_PROPERTY)
+            location.append_location(JDBC_DRIVER_PARAMS_PROPERTIES)
+            token_name = self.alias_helper.get_name_token(location)
+
+            if token_name is not None:
+                location.add_name_token(token_name, DRIVER_PARAMS_USER_PROPERTY)
+
+            stb_user = self.wls_helper.get_stb_user_name(rcu_prefix)
+            self.logger.fine('WLSDPLY-12222', stb_user, class_name=self.__class_name, method_name=_method_name)
+            wlst_path = self.alias_helper.get_wlst_attributes_path(location)
+            self.wlst_helper.cd(wlst_path)
+            wlst_name, wlst_value = \
+                self.alias_helper.get_wlst_attribute_name_and_value(location, DRIVER_PARAMS_PROPERTY_VALUE, stb_user)
+            self.wlst_helper.set_if_needed(wlst_name, wlst_value,
+                                           JDBC_DRIVER_PARAMS_PROPERTIES, DRIVER_PARAMS_USER_PROPERTY)
+
+            self.logger.info('WLSDPLY-12223', class_name=self.__class_name, method_name=_method_name)
+            if self.wls_helper.is_database_defaults_supported():
+                self.wlst_helper.get_database_defaults()
 
-        self.logger.info('WLSDPLY-12223', class_name=self.__class_name, method_name=_method_name)
-        if self.wls_helper.is_database_defaults_supported():
-            self.wlst_helper.get_database_defaults()
 
         self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
         return

installer/src/main/bin/createDomain.sh

@@ -316,7 +316,7 @@ echo "WLST_PROPERTIES = ${WLST_PROPERTIES}"
 PY_SCRIPTS_PATH=${WLSDEPLOY_HOME}/lib/python
 echo "${WLST} ${PY_SCRIPTS_PATH}/create.py ${SCRIPT_ARGS}"
 
-"${WLST}" "${PY_SCRIPTS_PATH}/create.py" ${SCRIPT_ARGS}
+eval "${WLST}" "${PY_SCRIPTS_PATH}/create.py" ${SCRIPT_ARGS}
 
 RETURN_CODE=$?
 if [ ${RETURN_CODE} -eq 100 ]; then