Atp harden error detection (#845)

* harden error detection for atp rcu db info.

* refactor validate atp rcudbinfo into function for reuse

* update check for non atp also

* update error message text

* Update rcuinfo.md

* fix system test problem

Author: jshum2479

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

@@ -64,7 +64,6 @@ def fix_jps_config(rcu_db_info, model_context):
 
 def get_atp_connect_string(tnsnames_ora_path, tns_sid_name):
 
-
     try:
         f = open(tnsnames_ora_path, "r+")
         try:

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

@@ -286,6 +286,8 @@ def __run_rcu(self):
         if rcu_db_info.is_use_atp():
             # ATP database, build runner map from RCUDbInfo in the model.
 
+            # check it first
+            self.__retrieve_atp_rcudbinfo(rcu_db_info, True)
             # make a copy of model's map to pass to RCURunner, since we will modify some values
             rcu_properties_map = self.model.get_model_domain_info()[RCU_DB_INFO]
             rcu_runner_map = dict(rcu_properties_map)
@@ -893,6 +895,61 @@ def __set_atp_connection_property(self, root_location, property_name, property_v
 
         root_location.remove_name_token(property_name)
 
+    def __retrieve_atp_rcudbinfo(self, rcu_db_info, checkAdminPwd=False):
+        """
+        Check and return atp connection info and make sure atp rcudb info is complete
+        :raises: CreateException: if an error occurs
+        """
+        _method_name = '__retrieve_atp_rcudbinfo'
+
+        tns_admin = rcu_db_info.get_atp_tns_admin()
+
+        if tns_admin is None or not os.path.exists(tns_admin + os.sep + "tnsnames.ora"):
+            ex = exception_helper.create_create_exception('WLSDPLY-12562')
+            self.logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
+            raise ex
+
+        if rcu_db_info.get_atp_entry() is None:
+            ex = exception_helper.create_create_exception('WLSDPLY-12413','tns.alias',
+                                                          "['tns.alias','javax.net.ssl.keyStorePassword',"
+                                                          "'javax.net.ssl.trustStorePassword']")
+            self.logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
+            raise ex
+
+        rcu_database = atp_helper.get_atp_connect_string(tns_admin + os.sep + 'tnsnames.ora',
+                                                         rcu_db_info.get_atp_entry())
+
+        if rcu_database is None:
+            ex = exception_helper.create_create_exception('WLSDPLY-12563', rcu_db_info.get_atp_entry())
+            self.logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
+            raise ex
+
+        keystore_pwd = rcu_db_info.get_keystore_password()
+        truststore_pwd = rcu_db_info.get_truststore_password()
+
+        if keystore_pwd is None:
+            ex = exception_helper.create_create_exception('WLSDPLY-12413','javax.net.ssl.keyStorePassword',
+                                                          "['tns.alias','javax.net.ssl.keyStorePassword',"
+                                                          "'javax.net.ssl.trustStorePassword']")
+            self.logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
+            raise ex
+
+        if truststore_pwd is None:
+            ex = exception_helper.create_create_exception('WLSDPLY-12413','javax.net.ssl.trustStorePassword',
+                                                          "['tns.alias','javax.net.ssl.keyStorePassword',"
+                                                          "'javax.net.ssl.trustStorePassword']")
+            raise ex
+
+        if checkAdminPwd:
+            admin_pwd = rcu_db_info.get_admin_password()
+            if admin_pwd is None:
+                ex = exception_helper.create_create_exception('WLSDPLY-12413','rcu_admin_password',
+                                                              "['rcu_prefix','rcu_schema_password',"
+                                                              "'rcu_admin_password']")
+                raise ex
+
+        return tns_admin, rcu_database, keystore_pwd, truststore_pwd
+
     def __configure_fmw_infra_database(self):
         """
         Configure the FMW Infrastructure DataSources.
@@ -911,19 +968,29 @@ def __configure_fmw_infra_database(self):
         rcu_prefix = rcu_db_info.get_preferred_prefix()
         rcu_schema_pwd = rcu_db_info.get_preferred_schema_pass()
 
+        if rcu_prefix is None:
+            ex = exception_helper.create_create_exception('WLSDPLY-12413','rcu_prefix',
+                                                          "['rcu_prefix','rcu_schema_password']")
+            self.logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
+            raise ex
+
+        if rcu_schema_pwd is None:
+            ex = exception_helper.create_create_exception('WLSDPLY-12413','rcu_schema_password',
+                                                          "['rcu_prefix','rcu_schema_password']")
+            self.logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
+            raise ex
+
         # For ATP databases :  we need to set all the property for each datasource
         # load atp connection properties from properties file
         # HANDLE ATP case
 
         if rcu_db_info.has_atpdbinfo():
             has_atp = 1
             # parse the tnsnames.ora file and retrieve the connection string
-            tns_admin = rcu_db_info.get_atp_tns_admin()
-            rcu_database = atp_helper.get_atp_connect_string(tns_admin + os.sep + 'tnsnames.ora',
-                                                             rcu_db_info.get_atp_entry())
+            # tns_admin is the wallet path either the path to $DOMAIN_HOME/atpwallet or
+            # specified in RCUDbinfo.oracle.net.tns_admin
 
-            keystore_pwd = rcu_db_info.get_keystore_password()
-            truststore_pwd = rcu_db_info.get_truststore_password()
+            tns_admin, rcu_database, keystore_pwd, truststore_pwd = self.__retrieve_atp_rcudbinfo(rcu_db_info)
 
             # Need to set for the connection property for each datasource
 
@@ -988,9 +1055,11 @@ def __configure_fmw_infra_database(self):
         if not has_atp:
             rcu_database = rcu_db_info.get_preferred_db()
             if rcu_database is None:
-                return
+                ex = exception_helper.create_create_exception('WLSDPLY-12564')
+                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)
 
             svc_table_ds_name = self.wls_helper.get_jrf_service_table_datasource_name()

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

@@ -115,6 +115,8 @@ def is_jrf_domain_type(self):
         This returns False for the Restricted JRF domain type.
         :return: True if the JRF template is present
         """
+        if self.is_restricted_jrf_domain_type():
+            return False
         for template in self.get_extension_templates():
             if re.match(self.JRF_TEMPLATE_REGEX, template):
                 return True

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

@@ -1301,6 +1301,14 @@ WLSDPLY-12258=RCU {0} file {1} is invalid : {2}
 WLSDPLY-12259=Error creating directory {0} to extract RCU {1} file {2}
 WLSDPLY-12560=Dynamic cluster {0} has size of {1}
 WLSDPLY-12561=Dynamic cluster {0} set to size of {1}
+WLSDPLY-12562=Unable to get ATP database connection info: cannot find ATP tnsnames.ora file. Please make sure \
+  you have the correct ATP wallet in the archive file or RCUDbInfo.oracle.net.tns_admin is pointing to an unzipped \
+  ATP wallet root directory that contains the tnsnames.ora file.
+WLSDPLY-12563=Unable to retrieve database connection info, please make sure the the entry {0} specified in \
+  RCUDbInfo.tns.alias exists in the tnsnames.ora file in the ATP wallet.
+WLSDPLY-12564=Unable to retrieve database connection string, please make sure it is specified in \
+  RCUDbInfo.rcu_db_conn_string field or in command line argument '-rcu_database'.
+
 
 # domain_typedef.py
 WLSDPLY-12300={0} got the domain type {1} but the domain type definition file {2} was not valid: {3}

site/rcuinfo.md

@@ -9,18 +9,20 @@ domainInfo:
     RCUDbInfo:
         useATP : true
         rcu_prefix : DEV
-        rcu_admin_password: <database admin password is required only when you specify -run_rcu flag, will be prompted
-         if not specified>
-        rcu_schema_password : <RCU schema password, user will be prompted if not specified>
+        rcu_admin_password: <database admin password is required only when you specify -run_rcu flag>
+        rcu_schema_password : <RCU schema password>
         atp.admin.user : admin
         tns.alias : dbatp_tp
         javax.net.ssl.keyStorePassword : <atp wallet password>
         javax.net.ssl.trustStorePassword : <atp wallet password>
+        oracle.net.tns_admin: <optional: absolute path of the unzipped wallet root directory (outside of the archive), if the wallet.zip is not included in the archive>
 ```           
 The database wallet can be included in the archive file under `atpwallet` zipentry structure
 
 `atpwallet/Walletxyz.zip`
-        
+
+or by specifying the unzipped root directory of the ATP wallet zip file in `oracle.net.tns_admin`.
+     
 Using the Create Domain Tool with the `-run_rcu` flag will create the RCU schemas against the Oracle Autonomous Transaction Processing Cloud Database and configure the datasources in the JRF domain to use the database.  For example:
 
     weblogic-deploy/bin/createDomain.sh -oracle_home /u01/wls12213 -domain_type JRF -domain_home /u01/data/domains/demodomain -archive_file DemoDomain.zip -run_rcu