Merge pull request #572 from oracle/sit-cfg-unit-testing

Sit cfg mock/unit testing - initial version

Author: rjeberhard

operator/src/main/resources/scripts/introspectDomain.py

@@ -878,8 +878,28 @@ def generateAndValidate(self):
     if not os.path.exists(self.env.CUSTOM_SITCFG_PATH):
       return
 
+    # We expect the user to include a 'version.txt' file in their situational
+    # config directory.
+    #
+    # That file is expected to contain '2.0'
+    #
+    versionPath=os.path.join(self.env.CUSTOM_SITCFG_PATH,"version.txt")
+    if not os.path.exists(versionPath):
+        self.env.addError("Error, Required file, '"+versionPath+"', does not exist")
+    else:
+        version=self.env.readFile(versionPath).strip()
+        if not version == "2.0":
+            # truncate and ellipsify at 75 characters
+            version = version[:75] + (version[75:] and '...')
+            self.env.addError("Error, "+versionPath+" does not have the value of"
+                              + " '2.0'. The current content: '" + version 
+                              + "' is not valid.")
+
     for the_file in os.listdir(self.env.CUSTOM_SITCFG_PATH):
 
+      if the_file == "version.txt":
+        continue  
+
       the_file_path = os.path.join(self.env.CUSTOM_SITCFG_PATH, the_file)
 
       if not os.path.isfile(the_file_path):

src/integration-tests/introspector/checkBeans.input

@@ -0,0 +1,6 @@
+/Servers/admin-server,ListenAddress,,domain1-admin-server
+#/Servers/admin-server,ListenAddress,foob,domain1-admin-server
+#/Servers/admin-server,ListenAddress,,foob
+#/Servers/admin-server,ListenAddress,,
+#,
+

src/integration-tests/introspector/checkBeans.py

@@ -0,0 +1,103 @@
+# Copyright 2018, 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
+
+import sys
+import os
+
+#
+# This program verifies that bean attr values are expected values.
+# 
+# Usage:
+#
+#   Create a file with lines of format:
+#      bean-path,attr-name,original-val,overridden-val
+#
+#   For example:
+#      /Servers/admin-server,ListenAddress,,domain1-admin-server
+#
+#   If you don't want to check the original-val is as expected
+#   then specify an asterisk (*) instead of the expected value.
+#
+#   Then run this program:
+#      wlst.sh checkBeans admin_name admin_pass url input_file_name
+#
+#   The program will check that the original-val matches the value
+#   in the 'domainConfig' mbean tree and that the overridden-val
+#   matches the value in the 'serverConfig' mbean tree.
+#
+#   The program exits with a non-zero exit code on any failure
+#   (including an unexpected attribute value).
+# 
+#    
+
+admin_username = sys.argv[1]
+admin_password = sys.argv[2]
+url = sys.argv[3]
+input_file = sys.argv[4]
+
+connect(admin_username,admin_password,url)
+
+errors=[]
+def addError(err):
+  errors.append(err)
+
+file = open(input_file, 'r')
+
+line_no=0
+for line in file:
+  line=line.strip()
+  line_no+=1
+  print "Info:  input file line# " + str(line_no) + " ='"+line+"'"
+  if len(line)>0 and line[0]=='#':
+    continue
+  words=line.split(',')
+  if len(words) != 4:
+    if line != '':
+      addError("Error in line syntax line#=" + str(line_no) + " line='"+line+"'")
+    continue
+  bean_path=words[0]
+  attr=words[1]
+  originalExpected=words[2]
+  overriddenExpected=words[3]
+
+  print(
+      "Info: Checking bean_path='" + bean_path + "'"
+    + " attr='" + attr + "'"
+    + " originalExpected='" + originalExpected + "'"
+    + " overriddenExpected='" + overriddenExpected + "'"
+  )
+
+  domainConfig()
+  cd(bean_path)
+  originalActual=str(get(attr))
+  serverConfig()
+  cd(bean_path)
+  overriddenActual=str(get(attr))
+
+  print("Info: originalActual='" + originalActual + "'")
+  print("Info: overriddenActual='" + overriddenActual + "'")
+
+  if originalExpected != '*' and originalActual != originalExpected:
+    addError(
+      "Error: got '" + originalActual + "'"
+             + " but expected value '" + originalExpected + "'"
+             + " for bean_path=domainConfig/" + bean_path 
+             + " attr='" + attr + "'. "
+    )
+
+  if overriddenActual != overriddenExpected:
+    addError(
+      "Error: got '" + overriddenActual + "'"
+             + " but expected value '" + overriddenExpected + "'"
+             + " for bean_path=serverConfig/" + bean_path 
+             + " attr='" + attr + "'. "
+    )
+file.close()		
+
+if len(errors) > 0:
+  print "Found " + str(len(errors)) + " errors:"
+  for err in errors:
+    print " --> " + err
+  exit(exitcode=1)
+
+print "Test Passed!"

src/integration-tests/introspector/introspectTest.sh

@@ -117,7 +117,7 @@ export NODEMGR_HOME=${NODEMGR_HOME:-/shared/nodemanagers}
 #     values match the values in those macros.
 
 export ADMIN_NAME=${ADMIN_NAME:-"admin-server"}
-export ADMIN_PORT=${ADMIN_PROT:-7001}
+export ADMIN_PORT=${ADMIN_PORT:-7001}
 export MANAGED_SERVER_NAME_BASE=${MANAGED_SERVER_NAME_BASE:-"managed-server"}
 export DOMAIN_NAME=${DOMAIN_NAME:-"base_domain"}
 
@@ -241,7 +241,7 @@ function deployYamlTemplate() {
   if [ -f "{test_home}/${yaml_file}" ]; then
     kubectl -n $NAMESPACE delete -f ${test_home}/${yaml_file} \
       --ignore-not-found \
-      2>&1 | tracePipe "kubectl output: "
+      2>&1 | tracePipe "Info: kubectl output: "
     rm -f ${test_home}/${yaml_file}
   fi
 
@@ -250,7 +250,7 @@ function deployYamlTemplate() {
   ${SCRIPTPATH}/util_subst.sh -g ${yaml_file}t ${test_home}/${yaml_file} || exit 1
 
   kubectl create -f ${test_home}/${yaml_file} \
-    2>&1 | tracePipe "kubectl output: " || exit 1 
+    2>&1 | tracePipe "Info: kubectl output: " || exit 1 
 }
 
 #############################################################################
@@ -265,13 +265,13 @@ createConfigMapFromDir() {
 
   kubectl -n $NAMESPACE create cm ${cm_name} \
     --from-file ${cm_dir} \
-    2>&1 | tracePipe "kubectl output: " || exit 1 
+    2>&1 | tracePipe "Info: kubectl output: " || exit 1 
 
   kubectl -n $NAMESPACE label cm ${cm_name} \
     weblogic.createdByOperator=true \
     weblogic.operatorName=look-ma-no-hands \
     weblogic.resourceVersion=domain-v2 \
-    2>&1 | tracePipe "kubectl output: " || exit 1 
+    2>&1 | tracePipe "Info: kubectl output: " || exit 1 
 }
 
 
@@ -300,7 +300,7 @@ function deployDomainConfigMap() {
 
   kubectl -n $NAMESPACE delete cm weblogic-domain-cm \
     --ignore-not-found  \
-    2>&1 | tracePipe "kubectl output: "
+    2>&1 | tracePipe "Info: kubectl output: "
 
   createConfigMapFromDir weblogic-domain-cm ${SOURCEPATH}/operator/src/main/resources/scripts
 }
@@ -329,7 +329,7 @@ function deployTestScriptConfigMap() {
 
   kubectl -n $NAMESPACE delete cm test-script-cm \
     --ignore-not-found  \
-    2>&1 | tracePipe "kubectl output: "
+    2>&1 | tracePipe "Info: kubectl output: "
 
   createConfigMapFromDir test-script-cm ${test_home}/test-scripts
 
@@ -413,7 +413,7 @@ function deployIntrospectJob() {
 
   kubectl -n $NAMESPACE delete cm $introspect_output_cm_name \
     --ignore-not-found  \
-    2>&1 | tracePipe "kubectl output: "
+    2>&1 | tracePipe "Info: kubectl output: "
 
   # run introspection job
 
@@ -452,26 +452,31 @@ function deployPod() {
   if [ -f "${target_yaml}" ]; then
     kubectl -n $NAMESPACE delete -f ${target_yaml} \
       --ignore-not-found \
-      2>&1 | tracePipe "kubectl output: "
+      2>&1 | tracePipe "Info: kubectl output: "
     rm -f ${target_yaml}
   fi
 
   # Generate server pod yaml from template and deploy it
 
   ( 
     export SERVER_NAME=${server_name}
-    # TBD SERVER_NAME should be derived from introspect results
+    # TBD SERVER_NAME, ADMIN_PORT, MANAGED_SERVER_PORT should be derived from introspect results
     export SERVICE_NAME=`toDNS1123Legal ${DOMAIN_UID}-${server_name}`
     export AS_SERVICE_NAME=`toDNS1123Legal ${DOMAIN_UID}-${ADMIN_NAME}`
+    if [ "${SERVER_NAME}" = "${ADMIN_NAME}" ]; then
+      export LOCAL_SERVER_DEFAULT_PORT=$ADMIN_PORT
+    else
+      export LOCAL_SERVER_DEFAULT_PORT=$MANAGED_SERVER_PORT
+    fi
     ${SCRIPTPATH}/util_subst.sh -g wl-pod.yamlt ${target_yaml}  || exit 1
   ) || exit 1
 
   kubectl create -f ${target_yaml} \
-    2>&1 | tracePipe "kubectl output: " || exit 1 
+    2>&1 | tracePipe "Info: kubectl output: " || exit 1 
 
   # Wait for pod to come up successfully
 
-  tracen "Waiting for pod readiness"
+  tracen "Info: Waiting for pod readiness"
   local status="0/1"
   local startsecs=$SECONDS
   local maxsecs=180
@@ -504,7 +509,7 @@ function deploySinglePodService() {
   if [ -f "${target_yaml}" ]; then
     kubectl -n $NAMESPACE delete -f ${target_yaml} \
       --ignore-not-found \
-      2>&1 | tracePipe "kubectl output: "
+      2>&1 | tracePipe "Info: kubectl output: "
     rm -f ${target_yaml}
   fi
 
@@ -517,7 +522,7 @@ function deploySinglePodService() {
   )
 
   kubectl create -f ${target_yaml} \
-    2>&1 | tracePipe "kubectl output: " || exit 1 
+    2>&1 | tracePipe "Info: kubectl output: " || exit 1 
 
   local svc=""
   local startsecs=$SECONDS
@@ -561,14 +566,32 @@ deployIntrospectJob
 #     topology file
 #
 
-deployPod ${ADMIN_NAME}
+deployPod ${ADMIN_NAME?}
+
+deploySinglePodService ${ADMIN_NAME?} ${ADMIN_PORT?} 30701
 
-deploySinglePodService ${ADMIN_NAME} 7001 30701
+deployPod ${MANAGED_SERVER_NAME_BASE?}1
 
-deployPod ${MANAGED_SERVER_NAME_BASE}1
+deploySinglePodService ${MANAGED_SERVER_NAME_BASE?}1 ${MANAGED_SERVER_PORT?} 30801
 
 #
 # TBD potentially add additional checks to verify wl pods are healthy
 #
 
+# TBD 1 weblogic/welcome1 should be deduced via a base64 of the admin secret
+# TBD 2 generate checkBeans.input instead of using a hard coded file, add more beans to check, and check mgd servers too
+
+trace "Info: Checking beans to see if sit-cfg took effect.  Input file 'checkBeans.input', output file '$test_home/checkBeans.out'."
+kubectl cp checkBeans.input domain1-admin-server:/shared/checkBeans.input || exit 1
+kubectl cp checkBeans.py domain1-admin-server:/shared/checkBeans.py || exit 1
+kubectl exec -it domain1-admin-server \
+  wlst.sh /shared/checkBeans.py \
+    weblogic welcome1 t3://domain1-admin-server:7001 \
+    /shared/checkBeans.input \
+    > $test_home/checkBeans.out 2>&1
+if [ $? -ne 0 ]; then
+  trace "Error:  checkBeans failed, see '$test_home/checkBeans.out'."
+  exit 1
+fi
+
 trace "Info: success!"

src/integration-tests/introspector/wl-pod.yamlt

@@ -43,6 +43,8 @@ spec:
       value: "${SERVICE_NAME}"
     - name: AS_SERVICE_NAME
       value: "${AS_SERVICE_NAME}"
+    - name: LOCAL_SERVER_DEFAULT_PORT
+      value: "${LOCAL_SERVER_DEFAULT_PORT}"
     - name: ADMIN_USERNAME
       value: ""
     - name: ADMIN_PASSWORD
@@ -71,15 +73,16 @@ spec:
     #  timeoutSeconds: 5
     name: weblogic-server
     ports:
-    - containerPort: ${ADMIN_PORT}
+    - containerPort: ${LOCAL_SERVER_DEFAULT_PORT}
       protocol: TCP
     readinessProbe:
-      exec:
-        command:
-        - /weblogic-operator/scripts/readinessProbe.sh
       failureThreshold: 1
+      httpGet:
+        path: /weblogic
+        port: ${LOCAL_SERVER_DEFAULT_PORT}
+        scheme: HTTP
       initialDelaySeconds: 2
-      periodSeconds: 5
+      periodSeconds: 1
       successThreshold: 1
       timeoutSeconds: 5
     resources: {}