add run_rcu logic for ATP

jshum2479 · jshum2479 · commit e5b5ab24d5f1 · 2019-02-26T14:18:18.000-06:00
diff --git a/core/src/main/java/oracle/weblogic/deploy/create/RCURunner.java b/core/src/main/java/oracle/weblogic/deploy/create/RCURunner.java
@@ -19,6 +19,9 @@
 import oracle.weblogic.deploy.util.ScriptRunnerException;
 import oracle.weblogic.deploy.util.StringUtils;
 
+import org.python.core.PyDictionary;
+import org.python.core.PyString;
+
 /**
  * This class does all the work to drop and recreate the RCU schemas besed on the domain type definition.
  */
@@ -44,7 +47,13 @@ public class RCURunner {
     private static final String DB_ROLE = "SYSDBA";
     private static final String SCHEMA_PREFIX_SWITCH = "-schemaPrefix";
     private static final String COMPONENT_SWITCH = "-component";
+    private static final String TABLESPACE_SWITCH = "-tablespace";
+    private static final String TEMPTABLESPACE_SWITCH = "-tempTablespace";
     private static final String READ_STDIN_SWITCH = "-f";
+    private static final String USE_SSL_SWITCH = "-useSSL";
+    private static final String SERVER_DN_SWITCH = "-serverDN";
+    private static final String SSLARGS = "-sslArgs";
+
     private static final String SERVICE_TABLE_COMPONENT = "STB";
     private static final String WLS_COMPONENT = "WLS";
     private static final String WLS_RUNTIME_COMPONENT = "WLS_RUNTIME";
@@ -61,6 +70,7 @@ public class RCURunner {
     private String rcuDb;
     private String rcuPrefix;
     private List<String> rcuSchemas;
+    private boolean ATP_DB = false;
 
     /**
      * The constructor.
@@ -87,6 +97,53 @@ public RCURunner(String domainType, String oracleHome, String javaHome, String r
         }
     }
 
+    /**
+     * The constructor.
+     *
+     * @param domainType the domain type
+     * @param oracleHome the ORACLE_HOME location
+     * @param javaHome   the JAVA_HOME location
+     * @throws CreateException if a parameter validation error occurs
+     */
+    public RCURunner(String domainType, String oracleHome, String javaHome, PyDictionary rcuProperties)
+        throws CreateException {
+
+
+        String tnsAdmin = rcuProperties.get(new PyString("oracle.net.tns_admin")).toString();
+        String keyStorePassword = rcuProperties.get(new PyString("javax.net.ssl.keyStorePassword")).toString();
+        String trustStorePassword = rcuProperties.get(new PyString("javax.net.ssl.trustStorePassword")).toString();
+
+        StringBuffer sslArgs = new StringBuffer();
+        sslArgs.append("oracle.net.tns_admin=");
+        sslArgs.append(tnsAdmin);
+        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.trustStorePassword=");
+        sslArgs.append(trustStorePassword);
+        sslArgs.append(",javax.net.ssl.keyStore=");
+        sslArgs.append(tnsAdmin + "/keystore.jks");
+        sslArgs.append(",javax.net.ssl.keyStoreType=JKS");
+        sslArgs.append(",javax.net.ssl.keyStorePassword=");
+        sslArgs.append(keyStorePassword);
+        sslArgs.append(",oracle.jdbc.fanEnabled=false");
+        sslArgs.append(",oracle.net.ssl_server_dn_match=true");
+
+        ATP_DB = true;
+
+        this.oracleHome = validateExistingDirectory(oracleHome, "ORACLE_HOME");
+        this.javaHome = validateExistingDirectory(javaHome, "JAVA_HOME");
+        this.rcuDb = 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)) {
+            LOGGER.warning("WLSDPLY-12000", CLASS, domainType, SERVICE_TABLE_COMPONENT);
+            this.rcuSchemas.remove(SERVICE_TABLE_COMPONENT);
+        }
+    }
+
+
     /**
      * Run RCU to drop and recreate the RCU schemas.
      *
@@ -146,9 +203,19 @@ public void runRcu(String rcuSysPass, String rcuSchemaPass) throws CreateExcepti
     // Private helper methods                                                //
     ///////////////////////////////////////////////////////////////////////////
 
+    private void addATPEnv(Map<String, String> env) {
+        if (ATP_DB) {
+            env.put("RCU_SSL_MODE", "true");
+            env.put("SKIP_CONNECTSTRING_VALIDATION", "true");
+            env.put("RCU_SKIP_PRE_REQS", "ALL");
+        }
+    }
+
+
     private Map<String, String> getRcuDropEnv() {
         Map<String, String> env = new HashMap<>(1);
         env.put("JAVA_HOME", this.javaHome.getAbsolutePath());
+        addATPEnv(env);
         return env;
     }
 
@@ -203,6 +270,12 @@ private String[] getRcuCreateArgs() {
         for (String rcuSchema : rcuSchemas) {
             createArgs.add(COMPONENT_SWITCH);
             createArgs.add(rcuSchema);
+            if (ATP_DB) {
+                createArgs.add(TABLESPACE_SWITCH);
+                createArgs.add("DATA");
+                createArgs.add(TEMPTABLESPACE_SWITCH);
+                createArgs.add("TEMP");
+            }
         }
         createArgs.add(READ_STDIN_SWITCH);
 
diff --git a/core/src/main/python/wlsdeploy/aliases/model_constants.py b/core/src/main/python/wlsdeploy/aliases/model_constants.py
@@ -286,6 +286,7 @@
 DRIVER_PARAMS_NET_FAN_ENABLED = 'oracle.jdbc.fanEnabled'
 ATP_RCU_PREFIX='rcu_prefix'
 ATP_RCU_SCHEMA_PASSWORD='rcu_schema_password'
+ATP_ADMIN_PASSWORD='rcu_admin_password'
 ATP_TNS_ENTRY='tns.entry'
 
 ENABLED = 'Enabled'
diff --git a/core/src/main/python/wlsdeploy/tool/create/domain_creator.py b/core/src/main/python/wlsdeploy/tool/create/domain_creator.py
@@ -30,6 +30,8 @@
 from wlsdeploy.aliases.model_constants import DRIVER_PARAMS_NET_FAN_ENABLED
 from wlsdeploy.aliases.model_constants import ATP_RCU_PREFIX
 from wlsdeploy.aliases.model_constants import ATP_RCU_SCHEMA_PASSWORD
+from wlsdeploy.aliases.model_constants import ATP_ADMIN_PASSWORD
+
 from wlsdeploy.aliases.model_constants import ATP_TNS_ENTRY
 
 from wlsdeploy.aliases.model_constants import JDBC_DRIVER_PARAMS
@@ -215,14 +217,45 @@ def __run_rcu(self):
         domain_type = self.model_context.get_domain_type()
         oracle_home = self.model_context.get_oracle_home()
         java_home = self.model_context.get_java_home()
-        rcu_db = self.model_context.get_rcu_database()
-        rcu_prefix = self.model_context.get_rcu_prefix()
-        rcu_sys_pass = self.model_context.get_rcu_sys_pass()
-        rcu_schema_pass = self.model_context.get_rcu_schema_pass()
 
+        props_file = self.model_context.get_rcu_properties_file()
+        if props_file:
+            try:
+                rcu_properties_map = variables.load_variables(props_file)
+                # parse the tnsnames.ora file and retrieve the connection string
+                tns_admin = rcu_properties_map[DRIVER_PARAMS_NET_TNS_ADMIN]
+                tns_names = variables.load_variables( tns_admin + os.sep +
+                                                      'tnsnames.ora')
+
+                rcu_db = tns_names[rcu_properties_map[ATP_TNS_ENTRY]]
+
+                rcu_prefix = rcu_properties_map[ATP_RCU_PREFIX]
+                rcu_schema_pass = rcu_properties_map[ATP_RCU_SCHEMA_PASSWORD]
+                rcu_sys_pass = rcu_properties_map[ATP_ADMIN_PASSWORD]
+
+                keystore_pwd = rcu_properties_map[DRIVER_PARAMS_KEYSTOREPWD_PROPERTY]
+                truststore_pwd = rcu_properties_map[DRIVER_PARAMS_TRUSTSTOREPWD_PROPERTY]
+
+                # Need to set for the connection proeprty for each datasource
+
+                runner = RCURunner(domain_type, oracle_home, java_home, rcu_db, rcu_prefix, rcu_schemas)
+                runner.runRcu(rcu_sys_pass, rcu_schema_pass)
+
+
+            except VariableException, ex:
+                self.logger.severe('WLSDPLY-20004', _program_name, ex.getLocalizedMessage(), error=ex,
+                                   class_name=_class_name, method_name=_method_name)
+                self.logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
+                raise ex
+
+        else:
+            rcu_db = self.model_context.get_rcu_database()
+            rcu_prefix = self.model_context.get_rcu_prefix()
+            rcu_sys_pass = self.model_context.get_rcu_sys_pass()
+            rcu_schema_pass = self.model_context.get_rcu_schema_pass()
 
-        runner = RCURunner(domain_type, oracle_home, java_home, rcu_db, rcu_prefix, rcu_schemas)
-        runner.runRcu(rcu_sys_pass, rcu_schema_pass)
+            runner = RCURunner(domain_type, oracle_home, java_home, rcu_db, rcu_prefix, rcu_schemas)
+            runner.runRcu(rcu_sys_pass, rcu_schema_pass)
 
         self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
         return
