adding validation of required RCUDbInfo section attributes

Author: robertpatrick

core/src/main/java/oracle/weblogic/deploy/create/RCURunner.java

@@ -244,7 +244,7 @@ public void runRcu(String rcuSysPass, String rcuSchemaPass, boolean disableRcuDr
         File rcuScript = FileUtils.getCanonicalFile(new File(rcuBinDir, RCU_SCRIPT_NAME));
 
         validateExistingExecutableFile(rcuScript, RCU_SCRIPT_NAME);
-        validateNonEmptyString(rcuSysPass, "rcu_sys_password", true);
+        validateNonEmptyString(rcuSysPass, "rcu_admin_password", true);
         validateNonEmptyString(rcuSchemaPass, "rcu_schema_password", true);
 
         if (!disableRcuDropSchema) {

core/src/main/python/create.py

@@ -27,7 +27,8 @@
 # imports from local packages start here
 from wlsdeploy.aliases.aliases import Aliases
 from wlsdeploy.aliases import model_constants
-from wlsdeploy.aliases.model_constants import DEFAULT_WLS_DOMAIN_NAME
+from wlsdeploy.aliases.model_constants import DEFAULT_WLS_DOMAIN_NAME, PATH_TO_RCU_ADMIN_PASSWORD, \
+    PATH_TO_RCU_SCHEMA_PASSWORD
 from wlsdeploy.aliases.model_constants import DOMAIN_NAME
 from wlsdeploy.aliases.model_constants import PATH_TO_RCU_DB_CONN
 from wlsdeploy.aliases.model_constants import PATH_TO_RCU_PREFIX
@@ -47,6 +48,7 @@
 from wlsdeploy.util import dictionary_utils
 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
@@ -204,22 +206,44 @@ def validate_rcu_args_and_model(model_context, model, archive_helper, aliases):
 
     domain_info = dictionary_utils.get_dictionary_element(model, model_constants.DOMAIN_INFO)
 
-    if model_constants.RCU_DB_INFO in domain_info:
-        rcu_info = domain_info[model_constants.RCU_DB_INFO]
-        rcu_db_info = RcuDbInfo(model_context, aliases, rcu_info)
-        has_tns_admin = rcu_db_info.has_tns_admin()
-        is_regular_db = rcu_db_info.is_regular_db()
-        has_atpdbinfo = rcu_db_info.has_atpdbinfo()
-        has_ssldbinfo = rcu_db_info.has_ssldbinfo()
-
-        _validate_atp_wallet_in_archive(archive_helper, is_regular_db, has_tns_admin, model)
-    elif model_context.get_domain_typedef().requires_rcu():
-        __logger.severe('WLSDPLY-12408', model_context.get_domain_type(), PATH_TO_RCU_DB_CONN,
-                        PATH_TO_RCU_PREFIX, class_name=_class_name, method_name=_method_name)
-        ex = exception_helper.create_create_exception('WLSDPLY-12408', model_context.get_domain_type(),
-                                                      PATH_TO_RCU_DB_CONN, PATH_TO_RCU_PREFIX)
-        __logger.throwing(ex, class_name=_class_name, method_name=_method_name)
-        raise ex
+    if model_context.get_domain_typedef().requires_rcu():
+        if model_constants.RCU_DB_INFO in domain_info:
+            rcu_info = domain_info[model_constants.RCU_DB_INFO]
+            rcu_db_info = RcuDbInfo(model_context, aliases, rcu_info)
+
+            if string_utils.is_empty(rcu_db_info.get_rcu_prefix()):
+                ex = exception_helper.create_validate_exception('WLSDPLY-12414', model_context.get_domain_type(),
+                                                                PATH_TO_RCU_PREFIX)
+                __logger.throwing(ex, class_name=_class_name, method_name=_method_name)
+                raise ex
+            #
+            # Skip validating rcu_db_conn since is there is a tnsnames.ora file,
+            # the connection string is picked up from there.
+            #
+            if string_utils.is_empty(rcu_db_info.get_rcu_schema_password()):
+                ex = exception_helper.create_validate_exception('WLSDPLY-12414', model_context.get_domain_type(),
+                                                                PATH_TO_RCU_SCHEMA_PASSWORD)
+                __logger.throwing(ex, class_name=_class_name, method_name=_method_name)
+                raise ex
+
+            if model_context.is_run_rcu() and string_utils.is_empty(rcu_db_info.get_rcu_admin_password()):
+                ex = exception_helper.create_validate_exception('WLSDPLY-12415', model_context.get_domain_type(),
+                                                                CommandLineArgUtil.RUN_RCU_SWITCH, PATH_TO_RCU_ADMIN_PASSWORD)
+                __logger.throwing(ex, class_name=_class_name, method_name=_method_name)
+                raise ex
+
+            has_tns_admin = rcu_db_info.has_tns_admin()
+            is_regular_db = rcu_db_info.is_regular_db()
+            has_atpdbinfo = rcu_db_info.has_atpdbinfo()
+            has_ssldbinfo = rcu_db_info.has_ssldbinfo()
+
+            _validate_atp_wallet_in_archive(archive_helper, is_regular_db, has_tns_admin, model)
+        else:
+            ex = exception_helper.create_validate_exception('WLSDPLY-12408', model_context.get_domain_type(),
+                                                            PATH_TO_RCU_DB_CONN, PATH_TO_RCU_PREFIX,
+                                                            PATH_TO_RCU_ADMIN_PASSWORD, PATH_TO_RCU_SCHEMA_PASSWORD)
+            __logger.throwing(ex, class_name=_class_name, method_name=_method_name)
+            raise ex
 
     return has_atpdbinfo, has_ssldbinfo
 
@@ -237,8 +261,7 @@ def _validate_atp_wallet_in_archive(archive_helper, is_regular_db, has_tns_admin
                 model[model_constants.DOMAIN_INFO][model_constants.RCU_DB_INFO][
                     model_constants.DRIVER_PARAMS_NET_TNS_ADMIN] = wallet_path
             else:
-                __logger.severe('WLSDPLY-12411', class_name=_class_name, method_name=_method_name)
-                ex = exception_helper.create_create_exception('WLSDPLY-12411')
+                ex = exception_helper.create_validate_exception('WLSDPLY-12411')
                 __logger.throwing(ex, class_name=_class_name, method_name=_method_name)
                 raise ex
 

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

@@ -471,3 +471,5 @@
 # Model Path constants
 PATH_TO_RCU_DB_CONN = '%s:/%s/%s' % (DOMAIN_INFO, RCU_DB_INFO, RCU_DB_CONN)
 PATH_TO_RCU_PREFIX = '%s:/%s/%s' % (DOMAIN_INFO, RCU_DB_INFO, RCU_PREFIX)
+PATH_TO_RCU_ADMIN_PASSWORD = '%s:/%s/%s' % (DOMAIN_INFO, RCU_DB_INFO, RCU_ADMIN_PASSWORD)
+PATH_TO_RCU_SCHEMA_PASSWORD = '%s:/%s/%s' % (DOMAIN_INFO, RCU_DB_INFO, RCU_SCHEMA_PASSWORD)

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

@@ -152,8 +152,6 @@ def get_atp_default_tablespace(self):
             self._logger.deprecation('WLSDPLY-22000', ATP_DEFAULT_TABLESPACE, RCU_DEFAULT_TABLESPACE,
                                      class_name=_class_name, method_name=_method_name)
             return result
-        elif self.get_rcu_default_tablespace() is not None:
-            return self.get_rcu_default_tablespace()
         else:
             return self.get_rcu_default_tablespace()
 
@@ -193,11 +191,10 @@ def get_storage_location(self):
         return None
 
     def get_rcu_variables(self):
-        result = self._get_dictionary_element_value(RCU_VARIABLES)
-        if result is not None:
-            return result
-        else:
-            return None
+        return self._get_dictionary_element_value(RCU_VARIABLES)
+
+    def get_rcu_admin_password(self):
+        return self._get_dictionary_element_value(RCU_ADMIN_PASSWORD)
 
     # has_tns_admin is used to find the extract location if it is already extracted by the user
     # its an optional field, so insufficient to determine whether it has atp

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

@@ -1723,14 +1723,16 @@ WLSDPLY-12404=<EMPTY>
 WLSDPLY-12405=<EMPTY>
 WLSDPLY-12406=<EMPTY>
 WLSDPLY-12407=<EMPTY>
-WLSDPLY-12408=Domain type {0} definition has RCU schemas defined so the {1} and {2} model attributes are required
+WLSDPLY-12408=Domain type {0} definition has RCU schemas defined so the {1}, {2}, {3}, and {4} model attributes are required
 WLSDPLY-12409={0} failed to create the domain: {1}
 WLSDPLY-12410={0} failed to deploy the resources and applications to the domain: {1}
 WLSDPLY-12411=The model file specified ATP database info without oracle.net.tns_admin directory but the archive does \
   not have wallet included
 WLSDPLY-12412=The model file specified ATP database info without oracle.net.tns_admin directory and there is no \
   archive specified
 WLSDPLY-12413=The model file specified RCUDbInfo section but key {0} is None or missing. Required keys are {1}
+WLSDPLY-12414=Domain type {0} definition has RCU schemas defined so the {1} model attribute is required
+WLSDPLY-12415=Domain type {0} definition has RCU schemas defined and the {1} argument was specified so the {2} model attribute is required
 
 # wlsroles_helper.py
 WLSDPLY-12500=The WebLogic role mapper will be updated with the roles: {0}

documentation/4.0/content/release-notes/_index.md

@@ -46,6 +46,7 @@ pre = "<b> </b>"
 - #1613 - Added ability to use variable tokens in the SAML 2 data initialization property files that will be replaced
           during domain creation or update processing.
 - #1614 - Updated Discover Domain Tool to overwrite existing variable and archive files if they already exist. 
+- #1616 - Improved `RCUDbInfo` validation in Create Domain tool.
 
 #### Bug Fixes
 - #1555 - Fixed issues with creating and discovering `UnixMachine` objects in online mode.
@@ -60,6 +61,9 @@ pre = "<b> </b>"
 - #1608 - Fixed a bug in creating Security groups that are members of another group.
 - #1610 - Fixed a bug where the Create Domain and Update Domain Tools were trying to create a security provider that
           is not valid in the current WebLogic Server version.
+- #1615 - Fixed an issue where certain errors during online update or deploy operations could leave a pending edit
+          state that caused subsequent invocations to fail due to the pending edit state.
+
 #### Known Issues
 None