Merge pull request #882 from oracle/introspect-mock-test-updates

Introspect mock test updates

Author: rjeberhard

src/integration-tests/bash/cleanup.sh

@@ -24,6 +24,9 @@
 #   DELETE_FILES Delete local test files, and launch a job to delete PV 
 #                hosted test files (default true).
 #
+#   FAST_DELETE  Set to "--grace-period=1 --timeout=1" to speedup
+#                deletes and skip phase 2.
+#
 # --------------------
 # Detailed Description
 # --------------------
@@ -98,13 +101,13 @@ function deleteWithOneLabel {
   getResWithLabel $1
   # delete namespaced types
   cat $1 | awk '{ print $4 }' | grep -v "^$" | sort -u | while read line; do
-    kubectl -n $line delete $NAMESPACED_TYPES -l "$LABEL_SELECTOR"
+    kubectl $FAST_DELETE -n $line delete $NAMESPACED_TYPES -l "$LABEL_SELECTOR"
   done
 
   # delete non-namespaced types
   local no_namespace_count=`grep -c -v " -n " $1`
   if [ ! "$no_namespace_count" = "0" ]; then
-    kubectl delete $NOT_NAMESPACED_TYPES -l "$LABEL_SELECTOR"
+    kubectl $FAST_DELETE delete $NOT_NAMESPACED_TYPES -l "$LABEL_SELECTOR"
   fi
 
   echo "@@ Waiting for pods to stop running."
@@ -136,7 +139,7 @@ function deleteWithOneLabel {
 function deleteNamespaces {
   cat $1 | awk '{ print $4 }' | grep -v "^$" | sort -u | while read line; do
     if [ "$line" != "default" ]; then
-      kubectl delete namespace $line --ignore-not-found
+      kubectl $FAST_DELETE delete namespace $line --ignore-not-found
     fi
   done
 
@@ -246,7 +249,7 @@ function genericDelete {
         return 0
       fi
 
-      if [ "$iteration" = "first" ]; then
+      if [ "$iteration" = "first" ] && [ "$FAST_DELETE" = "" ]; then
         # in the first iteration we just wait to see if artifacts go away on there own
 
         echo "@@ Waiting for $artcount_total artifacts to delete.  Wait time $((mnow - mstart)) seconds (max=$maxwaitsecs).  Waiting for:"
@@ -269,8 +272,8 @@ function genericDelete {
 
         if [ ${artcount_no} -gt 0 ]; then
           cat "$resfile_no" | while read line; do
-            echo "kubectl delete $line --ignore-not-found"
-            kubectl delete $line --ignore-not-found
+            echo "kubectl $FAST_DELETE delete $line --ignore-not-found"
+            kubectl $FAST_DELETE delete $line --ignore-not-found
           done
         fi
 
@@ -292,9 +295,9 @@ function genericDelete {
 }
 
 function cleanup_tiller {
-  kubectl -n kube-system delete deployment tiller-deploy --ignore-not-found=true
-  kubectl delete clusterrolebinding tiller-cluster-rule --ignore-not-found=true
-  kubectl -n kube-system delete serviceaccount tiller --ignore-not-found=true
+  kubectl $FAST_DELETE -n kube-system delete deployment tiller-deploy --ignore-not-found=true
+  kubectl $FAST_DELETE delete clusterrolebinding tiller-cluster-rule --ignore-not-found=true
+  kubectl $FAST_DELETE -n kube-system delete serviceaccount tiller --ignore-not-found=true
 }
 
 function fail {

src/integration-tests/introspector/Dockerfile.adduser

@@ -0,0 +1,9 @@
+FROM mysql:5.6
+
+RUN groupadd -g 1000 oracle && \
+    mkdir -p /u01 && \
+    chmod a+xr /u01 && \
+    useradd -b /u01 -d /u01/oracle -g 1000 -u 1000 -m -s /bin/bash oracle && \
+    chown oracle:oracle -R /u01
+
+USER oracle

src/integration-tests/introspector/README

@@ -33,7 +33,7 @@ Internal Test Flow:
 
    Cleanup files in /tmp/introspect
 
-() Cleanup test k8s artifacts and (optionally) an old created domain.
+() Cleanup test k8s artifacts and any old created domain.
 
    <operator-src>/src/integration-tests/bash/cleanup.sh 
 
@@ -42,21 +42,22 @@ Internal Test Flow:
    create-test-root-pv.yamlt, create-test-root-pvc.yamlt
    create-test-root.sh, create-test-root-job.yamlt
 
-() Optionally deploy pv/pvc for use by introspector job, the optional domain create step, and wl pods.  (If PV_COMMENT != "#").
+() Deploy pv/pvc for use by introspector job, the domain create step, and wl pods.  (If PV_COMMENT != "#").
 
    wl-pv.yamlt, wl-pvc.yamlt
 
 () Deploy a secret for the admin credentials.
 
    wl-secret.yamlt
 
-() Optionally create a domain home.  (If CREATE_DOMAIN == "true").
+() Create a domain home. 
 
-   wl-job.yamlt, createDomain.sh, createDomain.pyt
+   wl-create-domain-pod.yamlt, wl-create-domain-pod.sh, wl-create-domain-pod.pyt
 
-() Run the introspector job.
+() Run the introspector job (as a direct pod instead of a job)
 
-   wl-job.yamlt
+   wl-instrospect-pod.yamlt
+   wl-instrospect-pod.sh
    <operator-src>/operator/src/main/resources/scripts/introspectDomain.sh
    <operator-src>/operator/src/main/resources/scripts/startNodeManager.sh
    <operator-src>/operator/src/main/resources/scripts/introspectDomain.py

src/integration-tests/introspector/checkBeans.inputt

@@ -25,7 +25,10 @@
 # Note that a customer/admin should never override a port, they must stay fixed
 /ServerTemplates/mycluster-template,ListenPort,8001,8001
 
-/JDBCSystemResources/testDS/JDBCResource/testDS/JDBCDriverParams/testDS,Url,jdbc:oracle:thin:@myoriginalhostname:1521:myoriginalsid,jdbc:oracle:thin:@mynewhost:1521:mynewsid
+/JDBCSystemResources/testDS/JDBCResource/testDS/JDBCDriverParams/testDS,Url,jdbc:oracle:thin:@invalid-host:1521:invalid-sid,jdbc:oracle:thin:@mynewhost:1521:mynewsid
 /JDBCSystemResources/testDS/JDBCResource/testDS/JDBCDriverParams/testDS,PasswordEncrypted,*,!
-/JDBCSystemResources/testDS/JDBCResource/testDS/JDBCDriverParams/testDS/Properties/testDS/Properties/user,Value,scott,supersecret
+/JDBCSystemResources/testDS/JDBCResource/testDS/JDBCDriverParams/testDS/Properties/testDS/Properties/user,Value,invalid-user,supersecret
 
+/JDBCSystemResources/mysqlDS/JDBCResource/mysqlDS/JDBCDriverParams/mysqlDS,Url,jdbc:mysql://invalid-host:3306/invalid-db-name,jdbc:mysql://${DOMAIN_UID}-mysql:3306/mysql
+/JDBCSystemResources/mysqlDS/JDBCResource/mysqlDS/JDBCDriverParams/mysqlDS,PasswordEncrypted,*,!
+/JDBCSystemResources/mysqlDS/JDBCResource/mysqlDS/JDBCDriverParams/mysqlDS/Properties/mysqlDS/Properties/user,Value,invalid-user,root

src/integration-tests/introspector/checkDataSource.py

@@ -0,0 +1,38 @@
+# Copyright 2018, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
+# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.a
+
+#
+# purpose:
+#
+#    invoke on-line WLST to check if a datasource is working
+#
+#    assumes the admin user/pass was encoded to a userConfig/userKey by the 
+#      introspector these files have been mounted to /weblogic-operator/introspector
+#
+# usage:
+#    wlst.sh checkDataSource.py url server-name data-source-name
+#
+# sample usage:
+#    wlst.sh checkDataSource.py t3://domain1-admin-server:7001 admin-server mysqlDS
+#
+
+import sys
+
+url = sys.argv[1]
+server_name = sys.argv[2]
+data_source_name = sys.argv[3]
+
+connect(userConfigFile='/weblogic-operator/introspector/userConfigNodeManager.secure',userKeyFile='/tmp/userKeyNodeManager.secure.bin',url=url)
+
+serverRuntime()
+
+cd('/JDBCServiceRuntime/' + server_name + '/JDBCDataSourceRuntimeMBeans/' + data_source_name)
+
+ret=cmo.testPool()
+
+if ret is None:
+  print 'ok'
+  exit(exitcode=0)
+else:
+  print 'error: ' + ret
+  exit(exitcode=1)

src/integration-tests/introspector/create-test-root-job.yamlt

@@ -23,6 +23,10 @@ spec:
         env:
         - name: DOMAIN_UID
           value: "${DOMAIN_UID}"
+        - name: JAVA_OPTIONS
+          value: "-Djava.security.egd=file:/dev/./urandom "
+        - name: USER_MEM_ARGS
+          value: "-Xms64m -Xmx256m "
         image: "${WEBLOGIC_IMAGE_NAME}:${WEBLOGIC_IMAGE_TAG}"
         imagePullPolicy: ${WEBLOGIC_IMAGE_PULL_POLICY}
         name: weblogic-server

src/integration-tests/introspector/createDomain.sh

@@ -2,7 +2,7 @@
 
 # This script runs inside a job (create-test-root-job.yamlt), it sets up the top
 # level directory for this test that in turn is mounted as /shared by the 
-# test's wl-pvc, wl-pv, wl-job, and wl-pod yamlt.
+# test's wl-pvc, wl-pv, wl-job, and wl-pod yamlt (plus similar 'mysql' yamlt).
 
 # The 'acceptance_test_pv' directory it creates matches the directory 
 # expected by the integration test 'cleanup.sh' script.
@@ -11,6 +11,9 @@
 # create-test-root-pv.yamlt, and create-test-root-pvc.yamlt.  It physically
 # corresponds to the PV_ROOT env var path specified as an input to the test.
 
-mkdir -p /pv-root/acceptance_test_pv/domain-${DOMAIN_UID?}-storage || exit 1
+mkdir -p /pv-root/acceptance_test_pv/domain-${DOMAIN_UID?}-storage/domains || exit 1
+mkdir -p /pv-root/acceptance_test_pv/domain-${DOMAIN_UID?}-storage/mysql || exit 1
 chmod 777 /pv-root/acceptance_test_pv || exit 1
 chmod 777 /pv-root/acceptance_test_pv/domain-${DOMAIN_UID?}-storage || exit 1
+chmod 777 /pv-root/acceptance_test_pv/domain-${DOMAIN_UID?}-storage/domains || exit 1
+chmod 777 /pv-root/acceptance_test_pv/domain-${DOMAIN_UID?}-storage/mysql || exit 1