Merge pull request #841 from oracle/develop-OWLS-70602

Develop owls 70602

Author: rjeberhard

integration-tests/pom.xml

@@ -71,7 +71,12 @@
             <artifactId>client-java</artifactId>
             <scope>test</scope>
         </dependency>
-    </dependencies>
+		<dependency>
+			<groupId>javax.jms</groupId>
+			<artifactId>javax.jms-api</artifactId>
+			<version>2.0</version>
+		</dependency>
+	</dependencies>
 
 
 	<profiles>
@@ -156,6 +161,9 @@
 								<!--<TAGS>${env.TAGS}</TAGS> -->
 								<maxThreads>3</maxThreads>
 							</systemPropertyVariables>
+							<additionalClasspathElements>
+								<additionalClasspathElement>${project.basedir}/src/test/resources/wlthint3client.jar</additionalClasspathElement>
+							</additionalClasspathElements>
     					</configuration>
 
 						<executions>

integration-tests/src/test/java/oracle/kubernetes/operator/BaseTest.java

@@ -11,6 +11,8 @@
 import java.util.logging.FileHandler;
 import java.util.logging.Logger;
 import java.util.logging.SimpleFormatter;
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
 import oracle.kubernetes.operator.utils.Domain;
 import oracle.kubernetes.operator.utils.ExecCommand;
 import oracle.kubernetes.operator.utils.ExecResult;
@@ -179,6 +181,23 @@ public void testAdminT3Channel(Domain domain) throws Exception {
     logger.info("Done - testAdminT3Channel");
   }
 
+  /**
+   * Verify t3channel port by a JMS connection.
+   *
+   * @throws Exception
+   */
+  public void testAdminT3ChannelWithJMS(Domain domain) throws Exception {
+    logger.info("Inside testAdminT3ChannelWithJMS");
+    ConnectionFactory cf = domain.createJMSConnectionFactory();
+    Connection c = cf.createConnection();
+    logger.info("Connection created successfully before cycle.");
+    domain.shutdownUsingServerStartPolicy();
+    domain.restartUsingServerStartPolicy();
+    c = cf.createConnection();
+    logger.info("Connection created successfully after cycle");
+    c.close();
+    logger.info("Done - testAdminT3ChannelWithJMS");
+  }
   /**
    * Restarting the domain should not have any impact on Operator managing the domain, web app load
    * balancing and node port service

integration-tests/src/test/java/oracle/kubernetes/operator/ITOperator.java

@@ -565,6 +565,7 @@ public void testAutoSitConfigOverrides() throws Exception {
       domain11 = testDomainCreation(domain11YamlFile);
       domain11.verifyDomainCreated();
       testBasicUseCases(domain11);
+      testAdminT3ChannelWithJMS(domain11);
       // testAdvancedUseCasesForADomain(operator1, domain11);
       testCompletedSuccessfully = true;
 
@@ -613,6 +614,7 @@ public void testCustomSitConfigOverrides() throws Exception {
       domain12 = testDomainCreation(domain12YamlFile);
       domain12.verifyDomainCreated();
       testBasicUseCases(domain12);
+      testAdminT3ChannelWithJMS(domain12);
       // testAdvancedUseCasesForADomain(operator1, domain11);
       testCompletedSuccessfully = true;
 

integration-tests/src/test/java/oracle/kubernetes/operator/utils/Domain.java

@@ -12,9 +12,15 @@
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
 import java.util.HashMap;
+import java.util.Hashtable;
 import java.util.Map;
 import java.util.Objects;
 import java.util.logging.Logger;
+import javax.jms.ConnectionFactory;
+import javax.jms.QueueConnection;
+import javax.jms.QueueConnectionFactory;
+import javax.naming.Context;
+import javax.naming.InitialContext;
 import oracle.kubernetes.operator.BaseTest;
 import org.yaml.snakeyaml.Yaml;
 
@@ -306,6 +312,26 @@ public void deployWebAppViaWLST(
     callShellScriptByExecToPod(username, password, webappName);
   }
 
+  /**
+   * Creates a Connection Factory using JMS.
+   *
+   * @return connection facotry.
+   * @throws Exception
+   */
+  public ConnectionFactory createJMSConnectionFactory() throws Exception {
+    Hashtable<String, String> env = new Hashtable<>();
+    env.put(Context.INITIAL_CONTEXT_FACTORY, "weblogic.jndi.WLInitialContextFactory");
+    env.put(Context.PROVIDER_URL, "t3://" + TestUtils.getHostName() + ":" + t3ChannelPort);
+    logger.info("Creating JNDI context with URL " + env.get(Context.PROVIDER_URL));
+    InitialContext ctx = new InitialContext(env);
+    QueueConnection qcc = null;
+    logger.info("Getting JMS Connection Factory");
+    QueueConnectionFactory cf =
+        (QueueConnectionFactory) ctx.lookup("weblogic.jms.ConnectionFactory");
+    logger.info("Connection Factory created successfully");
+    return cf;
+  }
+
   /**
    * Test http load balancing using loadBalancerWebPort
    *
@@ -457,6 +483,28 @@ public void shutdownUsingServerStartPolicy() throws Exception {
     verifyServerPodsDeleted(replicas);
   }
 
+  /**
+   * restart domain by setting serverStartPolicy to IF_NEEDED
+   *
+   * @throws Exception
+   */
+  public void restartUsingServerStartPolicy() throws Exception {
+    String cmd =
+        "kubectl patch domain "
+            + domainUid
+            + " -n "
+            + domainNS
+            + " -p '{\"spec\":{\"serverStartPolicy\":\"IF_NEEDED\"}}' --type merge";
+    ExecResult result = ExecCommand.exec(cmd);
+    if (result.exitValue() != 0) {
+      throw new RuntimeException(
+          "FAILURE: command " + cmd + " failed, returned " + result.stderr());
+    }
+    String output = result.stdout().trim();
+    logger.info("command to restart domain " + cmd + " \n returned " + output);
+    verifyPodsCreated();
+    verifyServersReady();
+  }
   /**
    * verify domain is deleted
    *

integration-tests/src/test/resources/setupenv.sh

@@ -94,6 +94,12 @@ function create_image_pull_secret_jenkins {
   fi
 }
 
+function get_wlthint3client_from_image {
+  # Get wlthint3client.jar from image
+  id=$(docker create $IMAGE_NAME_WEBLOGIC:$IMAGE_TAG_WEBLOGIC)
+  docker cp $id:/u01/oracle/wlserver/server/lib/wlthint3client.jar $SCRIPTPATH
+  docker rm -v $id
+}
 export SCRIPTPATH="$( cd "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )"
 export PROJECT_ROOT="$SCRIPTPATH/../../../.."
 export RESULT_ROOT=${RESULT_ROOT:-/scratch/$USER/wl_k8s_test_results}
@@ -192,7 +198,8 @@ elif [ "$JENKINS" = "true" ]; then
 
   /usr/local/packages/aime/ias/run_as_root "mkdir -p $PV_ROOT/acceptance_test_pv_archive"
   /usr/local/packages/aime/ias/run_as_root "chmod 777 $PV_ROOT/acceptance_test_pv_archive"
-
+  
+  get_wlthint3client_from_image
 else
   pull_tag_images
 
@@ -203,4 +210,6 @@ else
 
   export JAR_VERSION="`grep -m1 "<version>" pom.xml | cut -f2 -d">" | cut -f1 -d "<"`"
   docker build --build-arg http_proxy=$http_proxy --build-arg https_proxy=$https_proxy --build-arg no_proxy=$no_proxy -t "${IMAGE_NAME_OPERATOR}:${IMAGE_TAG_OPERATOR}"  --build-arg VERSION=$JAR_VERSION --no-cache=true .
-fi
+  
+  get_wlthint3client_from_image
+fi