Run test env towards selected kube cluster

[nonrtric.git] / test / common / prodstub_api_functions.sh

diff --git a/test/common/prodstub_api_functions.sh b/test/common/prodstub_api_functions.sh
index bb4ccf5..9af00d8 100644 (file)
--- a/test/common/prodstub_api_functions.sh
+++ b/test/common/prodstub_api_functions.sh
@@ -94,7 +94,7 @@ __PRODSTUB_kube_delete_all() {
 # args: <log-dir> <file-prexix>
 __PRODSTUB_store_docker_logs() {
        if [ $RUNMODE == "KUBE" ]; then
-               kubectl  logs -l "autotest=PRODSTUB" -n $KUBE_SIM_NAMESPACE --tail=-1 > $1$2_prodstub.log 2>&1
+               kubectl $KUBECONF  logs -l "autotest=PRODSTUB" -n $KUBE_SIM_NAMESPACE --tail=-1 > $1$2_prodstub.log 2>&1
        else
                docker logs $PROD_STUB_APP_NAME > $1$2_prodstub.log 2>&1
        fi
@@ -107,6 +107,24 @@ __PRODSTUB_initial_setup() {
        use_prod_stub_http
 }
 
+# Set app short-name, app name and namespace for logging runtime statistics of kubernets pods or docker containers
+# For docker, the namespace shall be excluded
+# This function is called for apps managed by the test script as well as for prestarted apps.
+# args: -
+__PRODSTUB_statisics_setup() {
+       if [ $RUNMODE == "KUBE" ]; then
+               echo "PRODSTUB $PROD_STUB_APP_NAME $KUBE_SIM_NAMESPACE"
+       else
+               echo "PRODSTUB $PROD_STUB_APP_NAME"
+       fi
+}
+
+# Check application requirements, e.g. helm, the the test needs. Exit 1 if req not satisfied
+# args: -
+__PRODSTUB_test_requirements() {
+       :
+}
+
 #######################################################
 
 # Set http as the protocol to use for all communication to the Prod stub sim
@@ -127,7 +145,7 @@ use_prod_stub_https() {
 # args: <protocol> <internal-port> <external-port>
 __prod_stub_set_protocoll() {
        echo -e $BOLD"$PROD_STUB_DISPLAY_NAME protocol setting"$EBOLD
-       echo -e " Using $BOLD http $EBOLD towards $PROD_STUB_DISPLAY_NAME"
+       echo -e " Using $BOLD $1 $EBOLD towards $PROD_STUB_DISPLAY_NAME"
 
        ## Access to Prod stub sim
 
@@ -149,7 +167,6 @@ __prod_stub_set_protocoll() {
 # args:
 __prodstub_export_vars() {
        export PROD_STUB_APP_NAME
-       export PROD_STUB_APP_NAME_ALIAS
        export PROD_STUB_DISPLAY_NAME
 
        export DOCKER_SIM_NWNAME
@@ -181,13 +198,13 @@ start_prod_stub() {
                retcode_p=$?
 
                if [ $retcode_i -ne 0 ] && [ $retcode_p -ne 0 ]; then
-                       echo -e $RED"The $ECS_APP_NAME app is not included as managed nor prestarted in this test script"$ERED
-                       echo -e $RED"The $ECS_APP_NAME will not be started"$ERED
+                       echo -e $RED"The $PROD_STUB_APP_NAME app is not included as managed nor prestarted in this test script"$ERED
+                       echo -e $RED"The $PROD_STUB_APP_NAME will not be started"$ERED
                        exit
                fi
                if [ $retcode_i -eq 0 ] && [ $retcode_p -eq 0 ]; then
-                       echo -e $RED"The $ECS_APP_NAME app is included both as managed and prestarted in this test script"$ERED
-                       echo -e $RED"The $ECS_APP_NAME will not be started"$ERED
+                       echo -e $RED"The $PROD_STUB_APP_NAME app is included both as managed and prestarted in this test script"$ERED
+                       echo -e $RED"The $PROD_STUB_APP_NAME will not be started"$ERED
                        exit
                fi
 
@@ -427,7 +444,7 @@ prodstub_check_jobdata_2() {
        __log_test_fail_general "Template file "$7" for jobdata, does not exist"
         return 1
     fi
-       if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
+       if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
                targetJson="{\"info_job_identity\":\"$3\",\"info_type_identity\":\"$4\",\"target_uri\":\"$5\",\"owner\":\"$6\", \"info_job_data\":$jobfile,\"last_updated\":\"????\"}"
        else
                targetJson="{\"ei_job_identity\":\"$3\",\"ei_type_identity\":\"$4\",\"target_uri\":\"$5\",\"owner\":\"$6\", \"ei_job_data\":$jobfile,\"last_updated\":\"????\"}"