Add run_rcu logic to support create rcu schema for atp

Author: jshum2479

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

@@ -58,7 +58,7 @@ public class RCURunner {
     private static final String WLS_COMPONENT = "WLS";
     private static final String WLS_RUNTIME_COMPONENT = "WLS_RUNTIME";
 
-    private static final Pattern SCHEMA_DOES_NOT_EXIST_PATTERN = Pattern.compile("(ORA-01918|RCU-6013)");
+    private static final Pattern SCHEMA_DOES_NOT_EXIST_PATTERN = Pattern.compile("(ORA-01918|RCU-6013|ORA-12899)");
 
     private static final int RCU_CREATE_COMMON_ARG_COUNT = 13;
 
@@ -71,6 +71,7 @@ public class RCURunner {
     private String rcuPrefix;
     private List<String> rcuSchemas;
     private boolean ATP_DB = false;
+    private String atpSSlArgs = null;
 
     /**
      * The constructor.
@@ -105,7 +106,8 @@ public RCURunner(String domainType, String oracleHome, String javaHome, String r
      * @param javaHome   the JAVA_HOME location
      * @throws CreateException if a parameter validation error occurs
      */
-    public RCURunner(String domainType, String oracleHome, String javaHome, PyDictionary rcuProperties)
+    public RCURunner(String domainType, String oracleHome, String javaHome, List<String> rcuSchemas,
+        PyDictionary rcuProperties)
         throws CreateException {
 
 
@@ -119,7 +121,7 @@ public RCURunner(String domainType, String oracleHome, String javaHome, PyDictio
         sslArgs.append(",oracle.net.ssl_version=1.2");
         sslArgs.append(",javax.net.ssl.trustStore=");
         sslArgs.append(tnsAdmin + "/truststore.jks");
-        sslArgs.append("javax.net.ssl.trustStoreType=JKS");
+        sslArgs.append(",javax.net.ssl.trustStoreType=JKS");
         sslArgs.append(",javax.net.ssl.trustStorePassword=");
         sslArgs.append(trustStorePassword);
         sslArgs.append(",javax.net.ssl.keyStore=");
@@ -131,15 +133,16 @@ public RCURunner(String domainType, String oracleHome, String javaHome, PyDictio
         sslArgs.append(",oracle.net.ssl_server_dn_match=true");
 
         ATP_DB = true;
+        atpSSlArgs = sslArgs.toString();
 
         this.oracleHome = validateExistingDirectory(oracleHome, "ORACLE_HOME");
         this.javaHome = validateExistingDirectory(javaHome, "JAVA_HOME");
-        this.rcuDb = rcuProperties.get(new PyString("tns.entry")).toString();
+        this.rcuDb = "jdbc:oracle:thin:@" + rcuProperties.get(new PyString("tns.entry")).toString();
         this.rcuPrefix = rcuProperties.get(new PyString("rcu_prefix")).toString();
         this.rcuSchemas = validateNonEmptyListOfStrings(rcuSchemas, "rcu_schema_list");
-        if (this.rcuSchemas.contains(SERVICE_TABLE_COMPONENT)) {
+        if (!this.rcuSchemas.contains(SERVICE_TABLE_COMPONENT)) {
             LOGGER.warning("WLSDPLY-12000", CLASS, domainType, SERVICE_TABLE_COMPONENT);
-            this.rcuSchemas.remove(SERVICE_TABLE_COMPONENT);
+            this.rcuSchemas.add(SERVICE_TABLE_COMPONENT);
         }
     }
 
@@ -187,6 +190,9 @@ public void runRcu(String rcuSysPass, String rcuSchemaPass) throws CreateExcepti
         runner = new ScriptRunner(createEnv, RCU_CREATE_LOG_BASENAME);
         try {
             exitCode = runner.executeScript(rcuScript, scriptStdinLines, scriptArgs);
+            if (ATP_DB && exitCode != 0 && isSchemaNotExistError(runner)) {
+                exitCode = 0;
+            }
         } catch (ScriptRunnerException sre) {
             CreateException ce = new CreateException("WLSDPLY-12003", sre, CLASS, sre.getLocalizedMessage());
             LOGGER.throwing(CLASS, METHOD, ce);
@@ -231,10 +237,23 @@ private String[] getRcuDropArgs() {
         dropArgs.add(ORACLE_DB_TYPE);
         dropArgs.add(DB_CONNECT_SWITCH);
         dropArgs.add(rcuDb);
-        dropArgs.add(DB_USER_SWITCH);
-        dropArgs.add(DB_USER);
-        dropArgs.add(DB_ROLE_SWITCH);
-        dropArgs.add(DB_ROLE);
+
+        if (ATP_DB) {
+            dropArgs.add(DB_USER_SWITCH);
+            dropArgs.add("admin");
+            dropArgs.add(USE_SSL_SWITCH);
+            dropArgs.add("true");
+            dropArgs.add(SERVER_DN_SWITCH);
+            dropArgs.add("CN=ignored");
+            dropArgs.add(SSLARGS);
+            dropArgs.add(atpSSlArgs);
+
+        } else {
+            dropArgs.add(DB_USER_SWITCH);
+            dropArgs.add(DB_USER);
+            dropArgs.add(DB_ROLE_SWITCH);
+            dropArgs.add(DB_ROLE);
+        }
         dropArgs.add(SCHEMA_PREFIX_SWITCH);
         dropArgs.add(rcuPrefix);
 
@@ -260,10 +279,21 @@ private String[] getRcuCreateArgs() {
         createArgs.add(ORACLE_DB_TYPE);
         createArgs.add(DB_CONNECT_SWITCH);
         createArgs.add(rcuDb);
-        createArgs.add(DB_USER_SWITCH);
-        createArgs.add(DB_USER);
-        createArgs.add(DB_ROLE_SWITCH);
-        createArgs.add(DB_ROLE);
+        if (ATP_DB) {
+            createArgs.add(DB_USER_SWITCH);
+            createArgs.add("admin");
+            createArgs.add(USE_SSL_SWITCH);
+            createArgs.add("true");
+            createArgs.add(SERVER_DN_SWITCH);
+            createArgs.add("CN=ignored");
+            createArgs.add(SSLARGS);
+            createArgs.add(atpSSlArgs);
+        } else {
+            createArgs.add(DB_USER_SWITCH);
+            createArgs.add(DB_USER);
+            createArgs.add(DB_ROLE_SWITCH);
+            createArgs.add(DB_ROLE);
+        }
         createArgs.add(SCHEMA_PREFIX_SWITCH);
         createArgs.add(rcuPrefix);
 
@@ -329,6 +359,19 @@ private static boolean isSchemaNotExistError(ScriptRunner runner) {
         return schemaDoesNotExist;
     }
 
+    private static boolean isValueTooLargeError(ScriptRunner runner) {
+        List<String> stdoutBuffer = runner.getStdoutBuffer();
+        boolean schemaDoesNotExist = false;
+        for (String line : stdoutBuffer) {
+            Matcher matcher = SCHEMA_DOES_NOT_EXIST_PATTERN.matcher(line);
+            if (matcher.find()) {
+                schemaDoesNotExist = true;
+                break;
+            }
+        }
+        return schemaDoesNotExist;
+    }
+
     private static File validateExistingDirectory(String directoryName, String directoryTypeName)
         throws CreateException {
         final String METHOD = "validateExistingDirectory";

core/src/main/python/create.py

@@ -6,6 +6,7 @@
 """
 import javaos as os
 import sys
+from xml.dom.minidom import parse
 
 from java.io import IOException
 from java.lang import IllegalArgumentException
@@ -70,7 +71,7 @@
     CommandLineArgUtil.VARIABLE_FILE_SWITCH,
     CommandLineArgUtil.USE_ENCRYPTION_SWITCH,
     CommandLineArgUtil.PASSPHRASE_SWITCH,
-    CommandLineArgUtil.RCU_PROPERTIES_FILE_SWITCH
+    CommandLineArgUtil.ATP_PROPERTIES_FILE_SWITCH
 ]
 
 
@@ -267,7 +268,7 @@ def __process_rcu_args(optional_arg_map, domain_type, domain_typedef):
                 ex.setExitCode(CommandLineArgUtil.USAGE_ERROR_EXIT_CODE)
                 __logger.throwing(ex, class_name=_class_name, method_name=_method_name)
                 raise ex
-        elif CommandLineArgUtil.RCU_PROPERTIES_FILE_SWITCH in optional_arg_map:
+        elif CommandLineArgUtil.ATP_PROPERTIES_FILE_SWITCH in optional_arg_map:
             pass
         else:
             ex = exception_helper.create_cla_exception('WLSDPLY-12408', domain_type, rcu_schema_count,
@@ -332,6 +333,49 @@ def validate_model(model_dictionary, model_context, aliases):
         __clean_up_temp_files()
         tool_exit.end(model_context, CommandLineArgUtil.PROG_ERROR_EXIT_CODE)
 
+def set_ssl_properties(xmlDoc, atp_creds_path, keystore_password, truststore_password):
+    '''
+    Add SSL config properties to the specified XML document.
+    :param xmlDoc:                  The XML document
+    :param db_keystore_password:    The DB keystore/truststore password (assumed to be same)
+    :return: void
+    '''
+    DOMTree = parse(xmlDoc)
+    collection = DOMTree.documentElement
+    props = collection.getElementsByTagName("propertySet")
+
+    for prop in props:
+        if prop.getAttribute('name') == 'props.db.1':
+            set_property(DOMTree, prop, 'javax.net.ssl.trustStoreType', 'JKS')
+            set_property(DOMTree, prop, 'javax.net.ssl.trustStore', atp_creds_path + '/truststore.jks')
+            set_property(DOMTree, prop, 'oracle.net.tns_admin', atp_creds_path)
+            set_property(DOMTree, prop, 'javax.net.ssl.keyStoreType', 'JKS')
+            set_property(DOMTree, prop, 'javax.net.ssl.keyStore', atp_creds_path + '/keystore.jks')
+            set_property(DOMTree, prop, 'javax.net.ssl.keyStorePassword', keystore_password)
+            set_property(DOMTree, prop, 'javax.net.ssl.trustStorePassword', truststore_password)
+            set_property(DOMTree, prop, 'oracle.net.ssl_server_dn_match', 'true')
+            set_property(DOMTree, prop, 'oracle.net.ssl_version', '1.2')
+            # Persist the changes in the xml file
+            file_handle = open(xmlDoc,"w")
+            DOMTree.writexml(file_handle)
+            file_handle.close()
+
+def set_property(DOMTree, prop, name, value):
+    '''
+    Sets the property child element under prop parent node.
+    :param DOMTree: The DOM document handle
+    :param prop:    The propertySet parent handle
+    :param name:    The property name
+    :param value:   The property value
+    :return: void
+    '''
+    property = DOMTree.createElement('property')
+    property.setAttribute("name", name)
+    property.setAttribute("value", value)
+    prop.appendChild(property)
+    newline = DOMTree.createTextNode('\n')
+    prop.appendChild(newline)
+
 
 def main(args):
     """
@@ -350,6 +394,9 @@ def main(args):
 
     try:
         model_context = __process_args(args)
+        if model_context.get_atp_properties_file():
+            current_wlst_properties = os.environ.get('WLST_PROPERTIES')
+            os.environ['oracle.net.fanEnabled'] = 'false'
     except CLAException, ex:
         exit_code = ex.getExitCode()
         if exit_code != CommandLineArgUtil.HELP_EXIT_CODE:
@@ -391,7 +438,19 @@ def main(args):
     try:
         creator = DomainCreator(model, model_context, aliases)
         creator.create()
-    except CreateException, ex:
+        atp_props_path = model_context.get_atp_properties_file()
+
+        if atp_props_path:
+            rcu_properties_map = variables.load_variables(atp_props_path)
+            atp_creds_path = rcu_properties_map['oracle.net.tns_admin']
+            jsp_config = model_context.get_domain_home() + '/config/fmwconfig/jps-config.xml'
+            jsp_config_jse = model_context.get_domain_home() + '/config/fmwconfig/jps-config-jse.xml'
+            set_ssl_properties(jsp_config, atp_creds_path, rcu_properties_map['javax.net.ssl.keyStorePassword'],
+                               rcu_properties_map['javax.net.ssl.trustStorePassword'])
+            set_ssl_properties(jsp_config_jse, atp_creds_path, rcu_properties_map['javax.net.ssl.keyStorePassword'],
+                               rcu_properties_map['javax.net.ssl.trustStorePassword'])
+
+    except (IOException | CreateException), ex:
         __logger.severe('WLSDPLY-12409', _program_name, ex.getLocalizedMessage(), error=ex,
                         class_name=_class_name, method_name=_method_name)
         __clean_up_temp_files()