Merge branch 'refactor-domain-creator' into 'develop-4.0'

Refactor create.py and domain_creator.py to use RCUHelper

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

Author: robertpatrick

core/src/main/python/create.py

@@ -4,17 +4,12 @@
 
 The main module for the WLSDeploy tool to create empty domains.
 """
-import exceptions
 import os
 import sys
 
 from java.io import IOException
-from java.lang import Class as JClass
-from java.lang import Exception as JException
 from java.lang import IllegalArgumentException
 from java.lang import String
-from java.sql import DriverManager
-from java.util import Properties
 from oracle.weblogic.deploy.create import CreateException
 from oracle.weblogic.deploy.deploy import DeployException
 from oracle.weblogic.deploy.util import FileUtils
@@ -32,8 +27,6 @@
 from wlsdeploy.exception import exception_helper
 from wlsdeploy.exception.exception_types import ExceptionType
 from wlsdeploy.logging.platform_logger import PlatformLogger
-from wlsdeploy.tool.create import rcudbinfo_helper
-from wlsdeploy.tool.create.jps_config_helper import JpsConfigHelper
 from wlsdeploy.tool.create.domain_creator import DomainCreator
 from wlsdeploy.tool.util import model_context_helper
 from wlsdeploy.tool.util.archive_helper import ArchiveList
@@ -43,7 +36,6 @@
 from wlsdeploy.util import cla_helper
 from wlsdeploy.util import env_helper
 from wlsdeploy.util import getcreds
-from wlsdeploy.util import string_utils
 from wlsdeploy.util import tool_main
 from wlsdeploy.util.cla_utils import CommandLineArgUtil
 from wlsdeploy.util.cla_utils import TOOL_TYPE_CREATE
@@ -206,63 +198,6 @@ def _get_domain_path(model_context, model):
         return domain_parent + os.sep + DEFAULT_WLS_DOMAIN_NAME
 
 
-def _precheck_rcu_connectivity(model_context, creator, rcu_db_info):
-    _method_name = '_precheck_rcu_connectivity'
-    __logger.entering(class_name=_class_name, method_name=_method_name)
-
-    domain_typename = model_context.get_domain_typedef().get_domain_type()
-    if model_context.get_domain_typedef().requires_rcu() and not model_context.is_run_rcu():
-        rcu_prefix = rcu_db_info.get_rcu_prefix()
-        schema_name = None
-        if not string_utils.is_empty(rcu_prefix):
-            user_name = model_context.get_weblogic_helper().get_stb_user_name(rcu_prefix)
-            schema_name = user_name[len(rcu_prefix) + 1:]
-
-        if schema_name is None or schema_name not in model_context.get_domain_typedef().get_rcu_schemas():
-            __logger.exiting(class_name=_class_name, method_name=_method_name)
-            return
-
-        db_conn_props = None
-
-        rcu_database_type = rcu_db_info.get_rcu_database_type()
-        tns_admin, rcu_prefix, jdbc_conn_string, rcu_schema_pwd = \
-            creator.get_rcu_datasource_basic_connection_info(rcu_db_info)
-
-        if rcu_db_info.is_use_atp() or rcu_db_info.is_use_ssl():
-            db_conn_props = creator.get_jdbc_ssl_connection_properties(tns_admin, rcu_db_info.is_use_atp(), rcu_db_info)
-
-        jdbc_driver_name = creator.get_jdbc_driver_class_name(rcu_database_type)
-
-        try:
-            props = Properties()
-            if db_conn_props is not None:
-                for item in db_conn_props:
-                    for key in item.keys():
-                        props.put(key, item[key])
-
-            __logger.info('WLSDPLY_12575', 'test datasource', jdbc_conn_string, schema_name, props,
-                          class_name=_class_name, method_name=_method_name)
-
-            props.put('user', user_name)
-            props.put('password', rcu_schema_pwd)
-
-            # Force the driver to be loaded and registered...
-            JClass.forName(jdbc_driver_name)
-            DriverManager.getConnection(jdbc_conn_string, props)
-
-        except (exceptions.Exception, JException), e:
-            ex = exception_helper.create_create_exception('WLSDPLY-12505', domain_typename,
-                                                          e.getClass().getName(), e.getLocalizedMessage(), error=e)
-            __logger.throwing(ex, class_name=_class_name, method_name=_method_name)
-            raise ex
-        except ee:
-            ex = exception_helper.create_create_exception('WLSDPLY-12506', domain_typename, error=ee)
-            __logger.throwing(ex, class_name=_class_name, method_name=_method_name)
-            raise ex
-
-    __logger.exiting(class_name=_class_name, method_name=_method_name)
-
-
 def main(model_context):
     """
     The entry point for the createDomain tool.
@@ -303,18 +238,8 @@ def main(model_context):
             archive_helper.extract_weblogic_remote_console_extension()
 
         creator = DomainCreator(model_dictionary, model_context, aliases)
-
-        rcu_db_info = rcudbinfo_helper.create(model_dictionary, model_context, aliases)
-
-        # JRF domain pre-check connectivity
-        _precheck_rcu_connectivity(model_context, creator, rcu_db_info)
-
         creator.create()
 
-        if model_context.get_domain_typedef().requires_rcu():
-            jps_config_helper = JpsConfigHelper(model_context, rcu_db_info)
-            jps_config_helper.fix_jps_config()
-
     except WLSDeployArchiveIOException, ex:
         _exit_code = ExitCode.ERROR
         __logger.severe('WLSDPLY-12409', _program_name, ex.getLocalizedMessage(), error=ex,

core/src/main/python/update.py

@@ -236,7 +236,7 @@ def __update_offline(model_deployer, model, model_context, aliases):
 
     # update rcu schema password must happen before updating a jrf domain
     if model_context.get_update_rcu_schema_pass() is True:
-        rcu_helper = RCUHelper(model, model_context, aliases)
+        rcu_helper = RCUHelper(model, None, model_context, aliases, exception_type=ExceptionType.DEPLOY)
         rcu_helper.update_rcu_password()
 
     __update_offline_domain()