X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Fmr_api_functions.sh;h=3e00ec37ad0916dc6a56361cfc948f2e2fbe0e4a;hb=aa73209488503ee51db068c6143c7d4ec298a036;hp=20021316d8b0c000872b6587f4c0568c85d4b55c;hpb=a28a4ad261601976c345425692116e5d7250b810;p=nonrtric.git

diff --git a/test/common/mr_api_functions.sh b/test/common/mr_api_functions.sh
index 20021316..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
@@ -273,7 +273,7 @@ use_mr_https() {
 # args: <protocol> <internal-port> <external-port> <internal-secure-port> <external-secure-port>
 __mr_set_protocoll() {
 	echo -e $BOLD"$MR_STUB_DISPLAY_NAME and $MR_DMAAP_DISPLAY_NAME protocol setting"$EBOLD
-	echo -e " Using $BOLD http $EBOLD towards $MR_STUB_DISPLAY_NAME and $MR_DMAAP_DISPLAY_NAME"
+	echo -e " Using $BOLD $1 $EBOLD towards $MR_STUB_DISPLAY_NAME and $MR_DMAAP_DISPLAY_NAME"
 
 	## Access to Dmaap mediator
 
@@ -372,6 +372,9 @@ __dmaapmr_export_vars() {
 
 	export MR_KAFKA_SERVICE_PATH
 	export MR_ZOOKEEPER_SERVICE_PATH
+
+	export MR_KAFKA_KUBE_NODE_PORT
+	export MR_KAFKA_DOCKER_LOCALHOST_PORT
 }
 
 # Export env vars for config files, docker compose and kube resources
@@ -509,6 +512,9 @@ start_mr() {
 
 			__check_service_start $MR_DMAAP_APP_NAME $MR_DMAAP_PATH$MR_DMAAP_ALIVE_URL
 
+			echo " Kafka TCP node port $MR_KAFKA_KUBE_NODE_PORT"
+
+
 			if [ $# -gt 0 ]; then
 				if [ $(($#%3)) -eq 0 ]; then
 					while [ $# -gt 0 ]; do
@@ -608,6 +614,8 @@ start_mr() {
 
 			__check_service_start $MR_DMAAP_APP_NAME $MR_DMAAP_PATH$MR_DMAAP_ALIVE_URL
 
+			echo " Kafka TCP node port $MR_KAFKA_DOCKER_LOCALHOST_PORT"
+
 			if [ $# -gt 0 ]; then
 				if [ $(($#%3)) -eq 0 ]; then
 					while [ $# -gt 0 ]; do
@@ -621,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
@@ -711,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
 
@@ -893,7 +907,7 @@ mr_api_generate_json_payload_file() {
 	return 0
 }
 
-# Create tet file for payload
+# Create text file for payload
 # arg: <size-in-kb> <filename>
 mr_api_generate_text_payload_file() {
 	__log_conf_start $@