Merge "Update O-RU Fronthaul Recovery apex version"

[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 5188a45..ef99ee1 100644 (file)
--- a/test/common/dmaapmed_api_functions.sh
+++ b/test/common/dmaapmed_api_functions.sh
@@ -104,6 +104,12 @@ __DMAAPMED_statisics_setup() {
        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
@@ -124,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
 
@@ -159,7 +165,7 @@ __dmaapmed_export_vars() {
 
        export DMAAP_MED_DATA_MOUNT_PATH
        export DMAAP_MED_HOST_MNT_DIR
-       export DMAAP_MED_DATA_FILE
+       export DMAAP_MED_CONTR_DATA_FILE
        export DMAAP_MED_DATA_CONFIGMAP_NAME=$DMAAP_MED_APP_NAME"-data"
 
        if [ $1 == "PROXY" ]; then
@@ -177,11 +183,13 @@ __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)
        export MR_SERVICE_PATH
+       export MR_KAFKA_SERVICE_PATH
+
 }
 
 # Start the Dmaap mediator
@@ -227,7 +235,7 @@ start_dmaapmed() {
                        __dmaapmed_export_vars $1
 
                        # Create config map for data
-                       data_json=$PWD/tmp/$DMAAP_MED_DATA_FILE
+                       data_json=$PWD/tmp/$DMAAP_MED_CONTR_DATA_FILE
                        if [ $# -lt 2 ]; then
                                #create empty dummy file
                                echo "{}" > $data_json
@@ -262,7 +270,7 @@ start_dmaapmed() {
 
                __dmaapmed_export_vars $1
 
-               dest_file=$SIM_GROUP/$DMAAP_MED_COMPOSE_DIR/$DMAAP_MED_HOST_MNT_DIR/$DMAAP_MED_DATA_FILE
+               dest_file=$SIM_GROUP/$DMAAP_MED_COMPOSE_DIR/$DMAAP_MED_HOST_MNT_DIR/$DMAAP_MED_CONTR_DATA_FILE
 
                envsubst < $2 > $dest_file