rename traceUtils.py and traceUtils.sh to utils.py and utils.sh

Tom Barnes · Tom Barnes · commit 9c6788ffcc58 · 2019-07-12T10:14:54.000-07:00
diff --git a/operator/src/main/resources/scripts/introspectDomain.py b/operator/src/main/resources/scripts/introspectDomain.py
@@ -87,7 +87,7 @@
 import re
 from datetime import datetime
 
-# Include this script's current directory in the import path (so we can import traceUtils, etc.)
+# Include this script's current directory in the import path (so we can import utils, etc.)
 # sys.path.append('/weblogic-operator/scripts')
 
 # Alternative way to dynamically get script's current directory
@@ -96,7 +96,7 @@
 tmp_scriptdir=os.path.dirname(tmp_info[0])
 sys.path.append(tmp_scriptdir)
 
-from traceUtils import *
+from utils import *
 
 class OfflineWlstEnv(object):
 
diff --git a/operator/src/main/resources/scripts/introspectDomain.sh b/operator/src/main/resources/scripts/introspectDomain.sh
@@ -40,8 +40,8 @@ SCRIPTPATH="$( cd "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )"
 
 # setup tracing
 
-source ${SCRIPTPATH}/traceUtils.sh
-[ $? -ne 0 ] && echo "Error: missing file ${SCRIPTPATH}/traceUtils.sh" && exit 1 
+source ${SCRIPTPATH}/utils.sh
+[ $? -ne 0 ] && echo "Error: missing file ${SCRIPTPATH}/utils.sh" && exit 1 
 
 trace "Introspecting the domain"
 
diff --git a/operator/src/main/resources/scripts/livenessProbe.sh b/operator/src/main/resources/scripts/livenessProbe.sh
@@ -12,8 +12,8 @@
 RETVAL=$(test -f /weblogic-operator/debug/livenessProbeSuccessOverride ; echo $?)
 
 SCRIPTPATH="$( cd "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )"
-source ${SCRIPTPATH}/traceUtils.sh
-[ $? -ne 0 ] && echo "Error: missing file ${SCRIPTPATH}/traceUtils.sh" && exit $RETVAL
+source ${SCRIPTPATH}/utils.sh
+[ $? -ne 0 ] && echo "Error: missing file ${SCRIPTPATH}/utils.sh" && exit $RETVAL
 
 # check DOMAIN_HOME for a config/config.xml, reset DOMAIN_HOME if needed:
 exportEffectiveDomainHome || exit $RETVAL
diff --git a/operator/src/main/resources/scripts/monitorLog.sh b/operator/src/main/resources/scripts/monitorLog.sh
@@ -14,7 +14,7 @@
 echo $$ > /tmp/monitorLog-pid
 
 SCRIPTPATH="$( cd "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )"
-source ${SCRIPTPATH}/traceUtils.sh
+source ${SCRIPTPATH}/utils.sh
 
 trace "Monitoring server log file $1 every $2 seconds for selected known log messages."
 
diff --git a/operator/src/main/resources/scripts/readState.sh b/operator/src/main/resources/scripts/readState.sh
@@ -8,8 +8,8 @@
 # file which is updated by the node manager.
 
 SCRIPTPATH="$( cd "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )"
-source ${SCRIPTPATH}/traceUtils.sh
-[ $? -ne 0 ] && echo "Error: missing file ${SCRIPTPATH}/traceUtils.sh" && exit 1
+source ${SCRIPTPATH}/utils.sh
+[ $? -ne 0 ] && echo "Error: missing file ${SCRIPTPATH}/utils.sh" && exit 1
 
 # check DOMAIN_HOME for a config/config.xml, reset DOMAIN_HOME if needed:
 exportEffectiveDomainHome || exit 1
diff --git a/operator/src/main/resources/scripts/startNodeManager.sh b/operator/src/main/resources/scripts/startNodeManager.sh
@@ -47,8 +47,8 @@
 
 SCRIPTPATH="$( cd "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )"
 
-source ${SCRIPTPATH}/traceUtils.sh 
-[ $? -ne 0 ] && echo "Error: missing file ${SCRIPTPATH}/traceUtils.sh" && exit 1 
+source ${SCRIPTPATH}/utils.sh 
+[ $? -ne 0 ] && echo "Error: missing file ${SCRIPTPATH}/utils.sh" && exit 1 
 
 export WL_HOME="${WL_HOME:-/u01/oracle/wlserver}"
 
diff --git a/operator/src/main/resources/scripts/startServer.sh b/operator/src/main/resources/scripts/startServer.sh
@@ -10,8 +10,8 @@
 #
 
 SCRIPTPATH="$( cd "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )"
-source ${SCRIPTPATH}/traceUtils.sh
-[ $? -ne 0 ] && echo "Error: missing file ${SCRIPTPATH}/traceUtils.sh" && exitOrLoop
+source ${SCRIPTPATH}/utils.sh
+[ $? -ne 0 ] && echo "Error: missing file ${SCRIPTPATH}/utils.sh" && exitOrLoop
 
 trace "Starting WebLogic Server '${SERVER_NAME}'."
 
diff --git a/operator/src/main/resources/scripts/stopServer.sh b/operator/src/main/resources/scripts/stopServer.sh
@@ -10,8 +10,8 @@
 #
 
 SCRIPTPATH="$( cd "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )"
-source ${SCRIPTPATH}/traceUtils.sh
-[ $? -ne 0 ] && echo "Error: missing file ${SCRIPTPATH}/traceUtils.sh" && exit 1
+source ${SCRIPTPATH}/utils.sh
+[ $? -ne 0 ] && echo "Error: missing file ${SCRIPTPATH}/utils.sh" && exit 1
 
 trace "Stop server ${SERVER_NAME}" &>> /weblogic-operator/stopserver.out
 
@@ -79,4 +79,4 @@ if [ -f /weblogic-operator/pid ]; then
   kill -2 $(</weblogic-operator/pid)
 fi
 
-trace "Exit script"  &>> /weblogic-operator/stopserver.out
+trace "Exit script"  &>> /weblogic-operator/stopserver.out
diff --git a/operator/src/main/resources/scripts/utils.py b/operator/src/main/resources/scripts/utils.py
@@ -3,7 +3,7 @@
 
 # Usage: trace('string')
 #
-# This matches format of bash trace_utils.sh trace, and the operator's log format.
+# This matches format of bash utils.sh trace, and the operator's log format.
 #
 # Sample output:   @[2018-09-28T17:23:55.335 UTC][introspectDomain.py:614] Domain introspection complete.
 #
diff --git a/operator/src/main/resources/scripts/utils.sh b/operator/src/main/resources/scripts/utils.sh
@@ -3,13 +3,15 @@
 
 #
 # Purpose:
-#   Define a trace functions that match format of the trace function
-#   in traceUtils.py and of the logging in the java operator.
+#   Define trace functions that match format of the trace function
+#   in utils.py and of the logging in the java operator.
+#
+#   Define various shared utility functions.
 #
 # Load this file via the following pattern:
 #   SCRIPTPATH="$( cd "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )"
-#   source ${SCRIPTPATH}/traceUtils.sh
-#   [ $? -ne 0 ] && echo "Error: missing file ${SCRIPTPATH}/traceUtils.sh" && exit 1
+#   source ${SCRIPTPATH}/utils.sh
+#   [ $? -ne 0 ] && echo "Error: missing file ${SCRIPTPATH}/utils.sh" && exit 1
 #
 
 # timestamp
diff --git a/operator/src/main/resources/scripts/wlst.sh b/operator/src/main/resources/scripts/wlst.sh
@@ -18,8 +18,8 @@
 #
 
 SCRIPTPATH="$( cd "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )"
-source ${SCRIPTPATH}/traceUtils.sh
-[ $? -ne 0 ] && echo "Error: missing file ${SCRIPTPATH}/traceUtils.sh" && exit 1 
+source ${SCRIPTPATH}/utils.sh
+[ $? -ne 0 ] && echo "Error: missing file ${SCRIPTPATH}/utils.sh" && exit 1 
 
 wlst_script=${1?}
 
diff --git a/operator/src/test/java/oracle/kubernetes/operator/helpers/ConfigMapHelperTest.java b/operator/src/test/java/oracle/kubernetes/operator/helpers/ConfigMapHelperTest.java
@@ -64,8 +64,8 @@ public class ConfigMapHelperTest {
     "introspectDomain.sh",
     "introspectDomain.py",
     "startNodeManager.sh",
-    "traceUtils.py",
-    "traceUtils.sh",
+    "utils.py",
+    "utils.sh",
     "wlst.sh",
     "tailLog.sh",
     "monitorLog.sh"
diff --git a/src/integration-tests/introspector/introspectTest.sh b/src/integration-tests/introspector/introspectTest.sh
@@ -34,7 +34,7 @@
 
 SCRIPTPATH="$( cd "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )"
 SOURCEPATH="`echo $SCRIPTPATH | sed 's/weblogic-kubernetes-operator.*/weblogic-kubernetes-operator/'`"
-traceFile=${SOURCEPATH}/operator/src/main/resources/scripts/traceUtils.sh
+traceFile=${SOURCEPATH}/operator/src/main/resources/scripts/utils.sh
 source ${traceFile}
 source ${SCRIPTPATH}/util_dots.sh
 [ $? -ne 0 ] && echo "Error: missing file ${traceFile}" && exit 1
@@ -256,7 +256,7 @@ function deployTestScriptConfigMap() {
 
   mkdir -p ${test_home}/test-scripts
 
-  cp ${SOURCEPATH}/operator/src/main/resources/scripts/traceUtils* ${test_home}/test-scripts || exit 1
+  cp ${SOURCEPATH}/operator/src/main/resources/scripts/utils* ${test_home}/test-scripts || exit 1
   cp ${SCRIPTPATH}/wl-create-domain-pod.sh ${test_home}/test-scripts || exit 1
   cp ${SCRIPTPATH}/createTestRoot.sh ${test_home}/test-scripts || exit 1
   cp ${SCRIPTPATH}/wl-introspect-pod.sh ${test_home}/test-scripts || exit 1
diff --git a/src/integration-tests/introspector/util_fsplit.sh b/src/integration-tests/introspector/util_fsplit.sh
@@ -28,7 +28,7 @@
 
 SCRIPTPATH="$( cd "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )"
 SOURCEPATH="`echo $SCRIPTPATH | sed 's/weblogic-kubernetes-operator.*/weblogic-kubernetes-operator/'`"
-traceFile=${SOURCEPATH}/operator/src/main/resources/scripts/traceUtils.sh
+traceFile=${SOURCEPATH}/operator/src/main/resources/scripts/utils.sh
 source ${traceFile}
 [ $? -ne 0 ] && echo "Error: missing file ${traceFile}" && exit 1
 
diff --git a/src/integration-tests/introspector/util_subst.sh b/src/integration-tests/introspector/util_subst.sh
@@ -29,7 +29,7 @@
 
 SCRIPTPATH="$( cd "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )"
 SOURCEPATH="`echo $SCRIPTPATH | sed 's/weblogic-kubernetes-operator.*/weblogic-kubernetes-operator/'`"
-traceFile=${SOURCEPATH}/operator/src/main/resources/scripts/traceUtils.sh
+traceFile=${SOURCEPATH}/operator/src/main/resources/scripts/utils.sh
 source ${traceFile}
 [ $? -ne 0 ] && echo "Error: missing file ${traceFile}" && exit 1
 
diff --git a/src/integration-tests/introspector/util_testwlversion.sh b/src/integration-tests/introspector/util_testwlversion.sh
@@ -12,7 +12,7 @@
 # and assumes the ORACLE_HOME env var has been set.
 #
 
-traceFile=/weblogic-operator/scripts/traceUtils.sh
+traceFile=/weblogic-operator/scripts/utils.sh
 source ${traceFile}
 [ $? -ne 0 ] && echo "Error: missing file ${traceFile}" && exit 1
 
diff --git a/src/integration-tests/introspector/wl-create-domain-pod.sh b/src/integration-tests/introspector/wl-create-domain-pod.sh
@@ -9,7 +9,7 @@
 
 while [ 1 -eq 1 ] ; do
   SCRIPTPATH="$( cd "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )"
-  traceFile=${SCRIPTPATH}/traceUtils.sh
+  traceFile=${SCRIPTPATH}/utils.sh
   source ${traceFile}
   [ $? -ne 0 ] && echo "Error: missing file ${traceFile}" && break
 

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@`
`10`	`10`	`#`
`11`	`11`
`12`	`12`	`SCRIPTPATH="$( cd "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )"`
`13`		`-source ${SCRIPTPATH}/traceUtils.sh`
`14`		`-[ $? -ne 0 ] && echo "Error: missing file ${SCRIPTPATH}/traceUtils.sh" && exitOrLoop`
	`13`	`+source ${SCRIPTPATH}/utils.sh`
	`14`	`+[ $? -ne 0 ] && echo "Error: missing file ${SCRIPTPATH}/utils.sh" && exitOrLoop`
`15`	`15`
`16`	`16`	`trace "Starting WebLogic Server '${SERVER_NAME}'."`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`# Usage: trace('string')`
`5`	`5`	`#`
`6`		`-# This matches format of bash trace_utils.sh trace, and the operator's log format.`
	`6`	`+# This matches format of bash utils.sh trace, and the operator's log format.`
`7`	`7`	`#`
`8`	`8`	`# Sample output: @[2018-09-28T17:23:55.335 UTC][introspectDomain.py:614] Domain introspection complete.`
`9`	`9`	`#`
Original file line number	Diff line number	Diff line change
`@@ -3,13 +3,15 @@`
`3`	`3`
`4`	`4`	`#`
`5`	`5`	`# Purpose:`
`6`		`-# Define a trace functions that match format of the trace function`
`7`		`-# in traceUtils.py and of the logging in the java operator.`
	`6`	`+# Define trace functions that match format of the trace function`
	`7`	`+# in utils.py and of the logging in the java operator.`
	`8`	`+#`
	`9`	`+# Define various shared utility functions.`
`8`	`10`	`#`
`9`	`11`	`# Load this file via the following pattern:`
`10`	`12`	`# SCRIPTPATH="$( cd "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )"`
`11`		`-# source ${SCRIPTPATH}/traceUtils.sh`
`12`		`-# [ $? -ne 0 ] && echo "Error: missing file ${SCRIPTPATH}/traceUtils.sh" && exit 1`
	`13`	`+# source ${SCRIPTPATH}/utils.sh`
	`14`	`+# [ $? -ne 0 ] && echo "Error: missing file ${SCRIPTPATH}/utils.sh" && exit 1`
`13`	`15`	`#`
`14`	`16`
`15`	`17`	`# timestamp`