added mysql db replacing Oracle DB

sankarpn · sankarpn · commit d681bc65bb66 · 2019-03-21T08:27:00.000-07:00
diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/BaseTest.java b/integration-tests/src/test/java/oracle/kubernetes/operator/BaseTest.java
@@ -52,6 +52,7 @@ public class BaseTest {
   private static String resultDir = "";
   private static String userProjectsDir = "";
   private static String projectRoot = "";
+  protected static String sitconfigDir = "";
   private static String username = "weblogic";
   private static String password = "welcome1";
   private static int maxIterationsPod = 50;
@@ -114,6 +115,7 @@ public static void initialize(String appPropsFile) throws Exception {
     resultDir = resultRoot + "/acceptance_test_tmp";
     userProjectsDir = resultDir + "/user-projects";
     projectRoot = System.getProperty("user.dir") + "/..";
+    sitconfigDir = resultRoot + "/configoverridefiles";
 
     // BRANCH_NAME var is used in Jenkins job
     if (System.getenv("BRANCH_NAME") != null) {
@@ -157,12 +159,16 @@ public static void initialize(String appPropsFile) throws Exception {
           "/usr/local/packages/aime/ias/run_as_root \"chmod 777 "
               + pvRoot
               + "/acceptance_test_pv\"");
+      logger.info("Creating " + sitconfigDir);
+      TestUtils.exec("/usr/local/packages/aime/ias/run_as_root \"mkdir -p " + sitconfigDir + "\"");
+      TestUtils.exec("/usr/local/packages/aime/ias/run_as_root \"chmod 777 " + sitconfigDir + "\"");
     }
 
     // create resultRoot, PVRoot, etc
     Files.createDirectories(Paths.get(resultRoot));
     Files.createDirectories(Paths.get(resultDir));
     Files.createDirectories(Paths.get(userProjectsDir));
+    Files.createDirectories(Paths.get(sitconfigDir));
 
     // create file handler
     FileHandler fh = new FileHandler(resultDir + "/java_test_suite.out");
diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/ITSitConfig.java b/integration-tests/src/test/java/oracle/kubernetes/operator/ITSitConfig.java
@@ -6,6 +6,13 @@
 import static oracle.kubernetes.operator.BaseTest.initialize;
 import static oracle.kubernetes.operator.BaseTest.logger;
 
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
 import java.util.*;
 import java.util.logging.Level;
 import oracle.kubernetes.operator.utils.Domain;
@@ -27,7 +34,9 @@ public class ITSitConfig extends BaseTest {
   private static final String DOMAINUID = "customsitconfigdomain";
   private static final String ADMINPORT = "30710";
   private static final int T3CHANNELPORT = 30091;
-  private static String fqdn = "";
+  private static final String MYSQL_DB_PORT = "31306";
+  private static String fqdn;
+  private static String JDBC_URL;
 
   private static Domain domain = null;
   private static Operator operator1;
@@ -50,6 +59,10 @@ public static void staticPrepare() throws Exception {
         operator1 = TestUtils.createOperator(OPERATOR1_YAML);
       }
       TESTSCRIPTDIR = BaseTest.getProjectRoot() + "/integration-tests/src/test/resources/";
+      manageMySqlDB(TESTSCRIPTDIR + "/sitconfig/mysql/mysql-dbservices.yml", "create");
+      fqdn = TestUtils.getHostName();
+      JDBC_URL = "jdbc:mysql://" + fqdn + ":" + MYSQL_DB_PORT + "/";
+      copySitConfigFiles();
       domain = createSitConfigDomain();
       Assert.assertNotNull(domain);
       ADMINPODNAME = domain.getDomainUid() + "-" + domain.getAdminServerName();
@@ -63,7 +76,6 @@ public static void staticPrepare() throws Exception {
           "runSitConfigTests.sh",
           ADMINPODNAME,
           domain.getDomainNS());
-      fqdn = TestUtils.getHostName();
     }
   }
 
@@ -81,6 +93,7 @@ public static void staticUnPrepare() throws Exception {
 
       destroySitConfigDomain();
       tearDown();
+      manageMySqlDB(TESTSCRIPTDIR + "/sitconfig/mysql-dbservices.yml", "delete");
       logger.info("SUCCESS");
     }
   }
@@ -128,7 +141,7 @@ public void testCustomSitConfigOverridesForJdbc() throws Exception {
     String stdout =
         callShellScriptByExecToPod(
             "runSitConfigTests.sh",
-            fqdn + " " + T3CHANNELPORT + " weblogic welcome1 " + testMethod,
+            fqdn + " " + T3CHANNELPORT + " weblogic welcome1 " + testMethod + " " + JDBC_URL,
             ADMINPODNAME,
             domain.getDomainNS());
     Assert.assertFalse(stdout.toLowerCase().contains("error"));
@@ -188,8 +201,7 @@ private static Domain createSitConfigDomain() throws Exception {
     // load input yaml to map and add configOverrides
     Map<String, Object> domainMap = TestUtils.loadYaml(DOMAINONPV_WLST_YAML);
     domainMap.put("configOverrides", "sitconfigcm");
-    domainMap.put(
-        "configOverridesFile", "/integration-tests/src/test/resources/sitconfig/configoverrides");
+    domainMap.put("configOverridesFile", sitconfigDir);
     domainMap.put("domainUID", DOMAINUID);
     domainMap.put("adminNodePort", new Integer(ADMINPORT));
     domainMap.put("t3ChannelPort", new Integer(T3CHANNELPORT));
@@ -199,7 +211,6 @@ private static Domain createSitConfigDomain() throws Exception {
     domainMap.put(
         "javaOptions",
         "-Dweblogic.debug.DebugSituationalConfig=true -Dweblogic.debug.DebugSituationalConfigDumpXml=true");
-
     domain = TestUtils.createDomain(domainMap);
     domain.verifyDomainCreated();
     return domain;
@@ -234,4 +245,48 @@ private static String callShellScriptByExecToPod(
     logger.log(Level.INFO, result.stdout().trim());
     return result.stdout().trim();
   }
+
+  /**
+   * create mysql crd
+   *
+   * @throws Exception
+   */
+  public static void manageMySqlDB(String dbYaml, String task) throws Exception {
+    StringBuffer cmd = new StringBuffer("kubectl " + task + " -f ");
+    cmd.append(dbYaml);
+    logger.info("Running " + cmd);
+    ExecResult result = ExecCommand.exec(cmd.toString());
+    if (result.exitValue() != 0) {
+      logger.log(Level.INFO, result.stdout().trim());
+      throw new RuntimeException(
+          "FAILURE: command "
+              + cmd
+              + " failed, returned "
+              + result.stdout()
+              + "\n"
+              + result.stderr());
+    }
+    String outputStr = result.stdout().trim();
+    logger.info("Command returned " + outputStr);
+  }
+
+  private static void copySitConfigFiles() throws IOException {
+    String src_dir = TESTSCRIPTDIR + "/sitconfig/configoverrides";
+    String dst_dir = sitconfigDir;
+    String files[] = {
+      "config.xml",
+      "jdbc-JdbcTestDataSource-0.xml",
+      "diagnostics-WLDF-MODULE-0.xml",
+      "jms-ClusterJmsSystemResource.xml",
+      "version.txt"
+    };
+    for (String file : files) {
+      Path path = Paths.get(src_dir, file);
+      Charset charset = StandardCharsets.UTF_8;
+      String content = new String(Files.readAllBytes(path), charset);
+      content = content.replaceAll("JDBC_URL", JDBC_URL);
+      path = Paths.get(dst_dir, file);
+      Files.write(path, content.getBytes(charset), StandardOpenOption.TRUNCATE_EXISTING);
+    }
+  }
 }
diff --git a/integration-tests/src/test/resources/sitconfig/configoverrides/jdbc-JdbcTestDataSource-0.xml b/integration-tests/src/test/resources/sitconfig/configoverrides/jdbc-JdbcTestDataSource-0.xml
@@ -12,7 +12,7 @@
         <jdbc:inactive-connection-timeout-seconds jdbcf:combine-mode="add">120</jdbc:inactive-connection-timeout-seconds>
     </jdbc:jdbc-connection-pool-params>
     <jdbc:jdbc-driver-params>
-        <jdbc:url jdbcf:combine-mode="replace">jdbc:oracle:thin:@//slc11smq.us.oracle.com:1583/w18ys12c.us.oracle.com</jdbc:url>
+        <jdbc:url jdbcf:combine-mode="replace">JDBC_URL</jdbc:url>
         <jdbc:driver-name>oracle.jdbc.OracleDriver</jdbc:driver-name>
         <jdbc:properties>
             <jdbc:property>
diff --git a/integration-tests/src/test/resources/sitconfig/java/SitConfigTests.java b/integration-tests/src/test/resources/sitconfig/java/SitConfigTests.java
@@ -83,7 +83,8 @@ public static void main(String args[]) throws Exception {
       test.verifyT3ChannelPublicPort(30091);
     }
     if (testName.equals("testCustomSitConfigOverridesForJdbc")) {
-      test.testSystemResourcesJDBCAttributeChange("JdbcTestDataSource-0");
+      String JDBC_URL = args[5];
+      test.testSystemResourcesJDBCAttributeChange("JdbcTestDataSource-0", JDBC_URL);
     }
 
     if (testName.equals("testSystemResourcesJDBCAttributeChangeSecret")) {
@@ -268,15 +269,12 @@ private ServerMBean getServerMBean() {
     return serverMBean;
   }
 
-  public void testSystemResourcesJDBCAttributeChange(String jdbcResourceName) {
+  public void testSystemResourcesJDBCAttributeChange(String jdbcResourceName, String dsUrl) {
     int initialCapacity = 2;
     int maxCapacity = 12;
     boolean testConnectionsonReserve = true;
     int harvestMaxCount = 7;
     int inactiveConnectionTimeoutSeconds = 120;
-    String dsUrl = "jdbc:oracle:thin:@//slc11smq.us.oracle.com:1583/w18ys12c.us.oracle.com";
-    String dbInstanceName = "w18ys12c";
-    String dbHostName = "slc11smq";
 
     println("Verifying the configuration changes made by sit config file");
 
@@ -314,13 +312,8 @@ public void testSystemResourcesJDBCAttributeChange(String jdbcResourceName) {
     try {
       Connection connection = dataSource.getConnection();
       Statement stmt = connection.createStatement();
-      ResultSet rs = stmt.executeQuery("SELECT * FROM v$instance");
-      while (rs.next()) {
-        println("INSTANCE_NAME:" + rs.getString("INSTANCE_NAME"));
-        assert dbInstanceName.equals(rs.getString("INSTANCE_NAME"));
-        println("HOST_NAME:" + rs.getString("HOST_NAME"));
-        assert dbHostName.equals(rs.getString("HOST_NAME"));
-      }
+      int createSchema = stmt.executeUpdate("CREATE SCHEMA `mysqldb` ;");
+      assert createSchema == 0 : "create schema failed";
     } catch (SQLException ex) {
       Logger.getLogger(SitConfigTests.class.getName()).log(Level.SEVERE, null, ex);
     }
diff --git a/integration-tests/src/test/resources/sitconfig/scripts/create-domain-auto-custom-sit-config20.py b/integration-tests/src/test/resources/sitconfig/scripts/create-domain-auto-custom-sit-config20.py
@@ -103,8 +103,8 @@ def createDataSource(dsName, dsJNDI, dsUrl, dsUser, dsPassword, dsTarget):
 
     cd('JDBCConnectionPoolParams/NO_NAME_0')
     set('TestTableName', 'SQL SELECT 1 FROM DUAL')
-    #set('InitialCapacity', 1)
-    #set('MinCapacity', 3)
+    set('InitialCapacity', 0)
+    set('MinCapacity', 0)
 
 # This python script is used to create a WebLogic domain
 
@@ -125,6 +125,9 @@ def createDataSource(dsName, dsJNDI, dsUrl, dsUser, dsPassword, dsTarget):
 domain_logs                  = getEnvVar("DOMAIN_LOGS_DIR")
 script_dir                   = getEnvVar("CREATE_DOMAIN_SCRIPT_DIR")
 production_mode_enabled      = getEnvVar("PRODUCTION_MODE_ENABLED")
+jdbc_url                     = 'jdbc:mysql://HOSTNAME:NOPORT/'
+jdbc_user                    = 'user'
+jdbc_password                = 'password'
 
 # Read the domain secrets from the common python file
 execfile('%s/read-domain-secret.py' % script_dir)
@@ -227,7 +230,7 @@ def createDataSource(dsName, dsJNDI, dsUrl, dsUser, dsPassword, dsTarget):
 
     print('Done setting attributes for Dynamic Cluster: %s' % cluster_name);
 
-createDataSource('JdbcTestDataSource-0', 'jdbc/JdbcTestDataSource-0', 'jdbc:oracle:thin:@//slcai724.us.oracle.com:1583/w03ys12c', 'j2ee', 'j2ee', admin_server_name)
+createDataSource('JdbcTestDataSource-0', 'jdbc/JdbcTestDataSource-0', jdbc_url, jdbc_user, jdbc_password, admin_server_name)
 createJMSSystemResource(cluster_name)
 createWLDFSystemResource("WLDF-MODULE-0", admin_server_name)
 
