Config overrides test update.

Author: Tom Barnes

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/introspectTest.sh

@@ -711,6 +711,37 @@ function checkOverrides() {
   fi
 }
 
+#############################################################################
+#
+# Check if datasource is working
+#
+
+function checkDataSource() {
+
+  local pod_name=${1?}
+  local admin_url=${2?}
+  local wl_server_name=${3?}
+  local data_source_name=${4?}
+  local script_file=checkDataSource.py
+  local out_file=$test_home/checkDataSource-${pod_name}-${data_source_name}.out
+
+  local script_cmd="wlst.sh /shared/${script_file} ${admin_url} ${wl_server_name} ${data_source_name}"
+
+  trace "Info: Checking datasource via '$script_cmd' on pod '$pod_name'."
+  
+  kubectl -n ${NAMESPACE} cp ${SCRIPTPATH}/${script_file} ${pod_name}:/shared/${script_file} || exit 1
+
+  tracen "Info: Waiting for script to complete"
+  printdots_start
+  kubectl exec -it ${pod_name} ${script_cmd} > ${out_file} 2>&1
+  status=$?
+  printdots_end
+  if [ $status -ne 0 ]; then
+    trace "Error: The '$script_cmd' failed, see '$out_file'."
+    exit 1
+  fi
+}
+
 
 #############################################################################
 #
@@ -766,4 +797,9 @@ waitForPod ${DOMAIN_UID}-${MANAGED_SERVER_NAME_BASE?}1
 
 checkOverrides
 
+# Check DS to see if it can contact the DB.  This will only pass if the
+# overrides actually took effect:
+
+checkDataSource ${DOMAIN_UID}-${ADMIN_NAME?} t3://${DOMAIN_UID}-${ADMIN_NAME}:${ADMIN_PORT} ${ADMIN_NAME?} mysqlDS
+
 trace "Info: Success!"