X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Fdmaapadp_api_functions.sh;h=d7e8c0d3362ca8bce902232f5f07bfdc5bb93ef5;hb=f81090f8f5f1fd1a76bb9feab1f41f03252297c3;hp=9b7571f36ee15649a45b90969978d5260fa4994b;hpb=0f6367023720ecc7d7b4b38cbbc4282792172a89;p=nonrtric.git diff --git a/test/common/dmaapadp_api_functions.sh b/test/common/dmaapadp_api_functions.sh index 9b7571f3..d7e8c0d3 100644 --- a/test/common/dmaapadp_api_functions.sh +++ b/test/common/dmaapadp_api_functions.sh @@ -79,7 +79,7 @@ __DMAAPADP_kube_delete_all() { # args: __DMAAPADP_store_docker_logs() { if [ $RUNMODE == "KUBE" ]; then - kubectl logs -l "autotest=DMAAPADP" -n $KUBE_NONRTRIC_NAMESPACE --tail=-1 > $1$2_dmaapadapter.log 2>&1 + kubectl $KUBECONF logs -l "autotest=DMAAPADP" -n $KUBE_NONRTRIC_NAMESPACE --tail=-1 > $1$2_dmaapadapter.log 2>&1 else docker logs $DMAAP_ADP_APP_NAME > $1$2_dmaapadapter.log 2>&1 fi @@ -104,6 +104,12 @@ __DMAAPADP_statisics_setup() { fi } +# Check application requirements, e.g. helm, the the test needs. Exit 1 if req not satisfied +# args: - +__DMAAPADP_test_requirements() { + : +} + ####################################################### # Set http as the protocol to use for all communication to the Dmaap adapter @@ -124,7 +130,7 @@ use_dmaapadp_https() { # args: __dmaapadp_set_protocoll() { echo -e $BOLD"$DMAAP_ADP_DISPLAY_NAME protocol setting"$EBOLD - echo -e " Using $BOLD http $EBOLD towards $DMAAP_ADP_DISPLAY_NAME" + echo -e " Using $BOLD $1 $EBOLD towards $DMAAP_ADP_DISPLAY_NAME" ## Access to Dmaap adapter @@ -185,7 +191,7 @@ __dmaapadp_export_vars() { # paths to other components - export ECS_SERVICE_PATH + export ICS_SERVICE_PATH export DMAAP_ADP_SERVICE_PATH export MR_SERVICE_PATH