fix regular rcu db in yaml problem

Author: jshum2479

core/src/main/python/create.py

@@ -414,15 +414,22 @@ def unzip_atp_wallet(wallet_file, location):
 
 
 def validateRCUArgsAndModel(model_context, model):
-    has_atp = 0
-    if model_constants.RCU_DB_INFO in model[model_constants.DOMAIN_INFO]:
-        # extract the wallet first
-        has_atp = 1
-        has_tns_admin = model_constants.DRIVER_PARAMS_NET_TNS_ADMIN in model[model_constants.DOMAIN_INFO][
+    has_atpdbinfo = 0
+    domain_info = model[model_constants.DOMAIN_INFO]
+    if model_constants.RCU_DB_INFO in domain_info:
+        has_tns_admin = model_constants.DRIVER_PARAMS_NET_TNS_ADMIN in domain_info[
             model_constants.RCU_DB_INFO]
-        if model_context.get_archive_file_name():
-            # if it does not have the oracle.net.tns_admin specified, then extract to
+        has_regular_db = model_constants.RCU_DB_CONN in domain_info[model_constants.RCU_DB_INFO]
+
+        if model_constants.ATP_TNS_ENTRY in domain_info[model_constants.RCU_DB_INFO]:
+            has_atpdbinfo = 1
+
+        if model_context.get_archive_file_name() and not has_regular_db:
+            # 1. If it does not have the oracle.net.tns_admin specified, then extract to domain/atpwallet
+            # 2. If it is plain old regular oracle db, do nothing
+            # 3. If it deos not have tns_admin in the model, then the wallet must be in the archive
             if not has_tns_admin:
+                # extract the wallet first
                 archive_file = WLSDeployArchive(model_context.get_archive_file_name())
                 atp_path = archive_file.getATPWallet()
                 if atp_path and model[model_constants.TOPOLOGY]['Name']:
@@ -442,20 +449,16 @@ def validateRCUArgsAndModel(model_context, model):
                                     class_name=_class_name, method_name="validateRCUArgsAndModel")
                     __clean_up_temp_files()
                     tool_exit.end(model_context, CommandLineArgUtil.PROG_ERROR_EXIT_CODE)
-        elif not has_tns_admin:
-            __logger.severe('WLSDPLY-12411',  error=None,
-                            class_name=_class_name, method_name="validateRCUArgsAndModel")
-            __clean_up_temp_files()
-            tool_exit.end(model_context, CommandLineArgUtil.PROG_ERROR_EXIT_CODE)
-
-    if not has_atp and model_context.get_domain_type() not in ['WLS', 'RestrictedJRF']:
-        if not model_context.get_rcu_database() or not model_context.get_rcu_prefix():
-            __logger.severe('WLSDPLY-12408', model_context.get_domain_type(), CommandLineArgUtil.RCU_DB_SWITCH,
+
+    else:
+        if model_context.get_domain_type() not in ['WLS', 'RestrictedJRF']:
+            if not model_context.get_rcu_database() or not model_context.get_rcu_prefix():
+                __logger.severe('WLSDPLY-12408', model_context.get_domain_type(), CommandLineArgUtil.RCU_DB_SWITCH,
                             CommandLineArgUtil.RCU_PREFIX_SWITCH)
-            __clean_up_temp_files()
-            tool_exit.end(model_context, CommandLineArgUtil.PROG_ERROR_EXIT_CODE)
+                __clean_up_temp_files()
+                tool_exit.end(model_context, CommandLineArgUtil.PROG_ERROR_EXIT_CODE)
 
-    return has_atp
+    return has_atpdbinfo
 
 
 def main(args):

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

@@ -779,9 +779,9 @@ def __configure_fmw_infra_database(self):
         # For ATP databases :  we need to set all the property for each datasource
         # load atp connection properties from properties file
         #
+        domain_info = self.model.get_model_domain_info()
 
-        if RCU_DB_INFO in self.model.get_model_domain_info():
-            domain_info = self.model.get_model_domain_info()
+        if RCU_DB_INFO in domain_info:
             rcu_properties_map = domain_info[RCU_DB_INFO]
             #rcu_properties_map = self.model.get_model_domain_info()[RCU_DB_INFO]
             # HANDLE ATP case
@@ -866,12 +866,17 @@ def __configure_fmw_infra_database(self):
                     self.__set_atp_connection_property(location, DRIVER_PARAMS_NET_FAN_ENABLED, 'false')
 
         if not has_atp:
-            rcu_database = self.model_context.get_rcu_database()
-            if rcu_database is None:
-                return
+            if RCU_DB_INFO in domain_info:
+                rcu_prefix = domain_info[RCU_DB_INFO][RCU_PREFIX]
+                rcu_database = domain_info[RCU_DB_INFO][RCU_DB_CONN]
+                rcu_schema_pwd = domain_info[RCU_DB_INFO][RCU_SCHEMA_PASSWORD]
+            else:
+                rcu_database = self.model_context.get_rcu_database()
+                if rcu_database is None:
+                    return
+                rcu_prefix = self.model_context.get_rcu_prefix()
+                rcu_schema_pwd = self.model_context.get_rcu_schema_pass()
 
-            rcu_prefix = self.model_context.get_rcu_prefix()
-            rcu_schema_pwd = self.model_context.get_rcu_schema_pass()
             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)