X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=test%2Fcommon%2Fmr_api_functions.sh;h=3e00ec37ad0916dc6a56361cfc948f2e2fbe0e4a;hb=05bfe48a83b1d7bf719eb94444ffc1377b998273;hp=55badb0069f434e49c897f2fe54a2e2c2ec9edfa;hpb=5feecd881172a3b22041d35443c1f946e7d5f63e;p=nonrtric.git diff --git a/test/common/mr_api_functions.sh b/test/common/mr_api_functions.sh index 55badb00..3e00ec37 100755 --- a/test/common/mr_api_functions.sh +++ b/test/common/mr_api_functions.sh @@ -173,7 +173,7 @@ __DMAAPMR_store_docker_logs() { kubectl logs -n $KUBE_ONAP_NAMESPACE $podname --tail=-1 > $1$2_$podname.log 2>&1 done else - docker logs $MR_DMAAP_APP_NAME > $1$2mr.log 2>&1 + docker logs $MR_DMAAP_APP_NAME > $1$2_mr.log 2>&1 docker logs $MR_KAFKA_APP_NAME > $1$2_mr_kafka.log 2>&1 docker logs $MR_ZOOKEEPER_APP_NAME > $1$2_mr_zookeeper.log 2>&1 fi @@ -629,10 +629,7 @@ start_mr() { fi fi - echo " Current topics:" - curlString="$MR_DMAAP_PATH/topics" - result=$(__do_curl "$curlString") - echo $result | indent2 + dmaap_api_print_topics fi __mr_export_vars @@ -719,6 +716,15 @@ __dmaap_pipeclean() { return 1 } +# Helper function to list the current topics in DMAAP MR +# args: - +dmaap_api_print_topics() { + echo " Current topics:" + curlString="$MR_DMAAP_PATH/topics" + result=$(__do_curl "$curlString") + echo $result | indent2 +} + ### Generic test cases for varaible checking @@ -901,7 +907,7 @@ mr_api_generate_json_payload_file() { return 0 } -# Create tet file for payload +# Create text file for payload # arg: mr_api_generate_text_payload_file() { __log_conf_start $@