Merge pull request #1050 from oracle/improve-atp-errmsg

Improve ATP error message

Author: robertpatrick

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

@@ -1,12 +1,16 @@
 """
-Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+Copyright (c) 2017, 2022, Oracle Corporation and/or its affiliates.  All rights reserved.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 
 """
 import re
 from xml.dom.minidom import parse
+from wlsdeploy.exception import exception_helper
 
+from wlsdeploy.logging.platform_logger import PlatformLogger
+
+_logger = PlatformLogger('wlsdeploy.create')
 
 def set_ssl_properties(xmlDoc, atp_creds_path, keystore_password, truststore_password):
     '''
@@ -63,7 +67,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:
@@ -76,17 +79,24 @@ def get_atp_connect_string(tnsnames_ora_path, tns_sid_name):
         pattern = tns_sid_name + '\s*=\s*([(].*\n.*)'
         match = re.search(pattern, text)
         if match:
-            str = match.group(1)
-            tnsConnectString=str.replace('\r','').replace('\n','')
-            str = format_connect_string(tnsConnectString)
-            return str
-    except:
-        pass
-
-    return None
-
-
-def format_connect_string(connect_string):
+            connect_string = match.group(1)
+            tnsConnectString = connect_string.replace('\r','').replace('\n','')
+            connect_string = cleanup_connect_string(tnsConnectString)
+            return connect_string, None
+        else:
+            ex = exception_helper.create_create_exception("WLSDPLY-12563", tns_sid_name)
+            _logger.throwing(ex, class_name='atp_helper', method_name='get_atp_connect_string')
+            raise ex
+    except IOError, ioe:
+        ex = exception_helper.create_create_exception("WLSDPLY-12570", str(ioe))
+        _logger.throwing(ex, class_name='atp_helper', method_name='get_atp_connect_string')
+        raise ex
+    except Exception, ex:
+        ex = exception_helper.create_create_exception("WLSDPLY-12570", str(ex))
+        _logger.throwing(ex, class_name='atp_helper', method_name='get_atp_connect_string')
+        raise ex
+
+def cleanup_connect_string(connect_string):
     """
     Formats connect string for ATP DB by removing unwanted whitespaces.
     Input:
@@ -109,5 +119,5 @@ def format_connect_string(connect_string):
         part3 = match.group(3)
         part4 = match.group(4).replace(' ', '')
         connect_string = "%s%s%s%s" % (part1, part2, part3, part4)
-
+    # if no match then return original one
     return connect_string

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

@@ -950,14 +950,9 @@ def __retrieve_atp_rcudbinfo(self, rcu_db_info, checkAdminPwd=False):
             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_database, error = 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()
 

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

@@ -1322,15 +1322,17 @@ 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-12563=Unable to retrieve database connection info, please make sure the RCUDbInfo.tns.alias - {0} specified \
+  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'.
 WLSDPLY-12565=The archive file was not provided so there are no custom files to extract
 WLSDPLY-12566=Installing {0} user custom files to domain home {1}
 WLSDPLY-12567=The archive file {0} contains no user custom files to install
 WLSDPLY-12568=Creating empty folder {0}. Folder contains no attributes or sub-folders.
 WLSDPLY-12569=Setting the topology profile to {0}
+WLSDPLY-12570=Unable to retrieve database connection info: {0}
+WLSDPLY-12571=Error in setting up ATP connection string: {0}
 
 # domain_typedef.py
 WLSDPLY-12300={0} got the domain type {1} but the domain type definition file {2} was not valid: {3}