Merge "Updates of function test for f-release"

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

diff --git a/test/common/dmaapmed_api_functions.sh b/test/common/dmaapmed_api_functions.sh
index 16e1ad7..8ed0169 100644 (file)
--- a/test/common/dmaapmed_api_functions.sh
+++ b/test/common/dmaapmed_api_functions.sh
@@ -92,6 +92,24 @@ __DMAAPMED_initial_setup() {
        use_dmaapmed_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: -
+__DMAAPMED_statisics_setup() {
+       if [ $RUNMODE == "KUBE" ]; then
+               echo "DMAAPMED $DMAAP_MED_APP_NAME $KUBE_NONRTRIC_NAMESPACE"
+       else
+               echo "DMAAPMED $DMAAP_MED_APP_NAME"
+       fi
+}
+
+# Check application requirements, e.g. helm, the the test needs. Exit 1 if req not satisfied
+# args: -
+__DMAAPMED_test_requirements() {
+       :
+}
+
 #######################################################
 
 # Set http as the protocol to use for all communication to the Dmaap mediator
@@ -112,7 +130,7 @@ use_dmaapmed_https() {
 # args: <protocol> <internal-port> <external-port>
 __dmaapmed_set_protocoll() {
        echo -e $BOLD"$DMAAP_MED_DISPLAY_NAME protocol setting"$EBOLD
-       echo -e " Using $BOLD http $EBOLD towards $DMAAP_MED_DISPLAY_NAME"
+       echo -e " Using $BOLD $1 $EBOLD towards $DMAAP_MED_DISPLAY_NAME"
 
        ## Access to Dmaap mediator
 
@@ -165,7 +183,7 @@ __dmaapmed_export_vars() {
        fi
 
        # paths to other components
-       export ECS_SERVICE_PATH
+       export ICS_SERVICE_PATH
 
        export DMAAP_MED_CONF_SELF_HOST=$(echo $DMAAP_MED_SERVICE_PATH | cut -d: -f1-2)
        export DMAAP_MED_CONF_SELF_PORT=$(echo $DMAAP_MED_SERVICE_PATH | cut -d: -f3)