X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Fpa_api_functions.sh;h=9d4d1f13605bd517491009a8fc59ded604b2b130;hb=4dd321bda70fab4987c1ea7aa0dffc5e1eb74252;hp=5367060593939b8284dfeeec64f4c54468318662;hpb=a28a4ad261601976c345425692116e5d7250b810;p=nonrtric.git

diff --git a/test/common/pa_api_functions.sh b/test/common/pa_api_functions.sh
index 53670605..9d4d1f13 100644
--- a/test/common/pa_api_functions.sh
+++ b/test/common/pa_api_functions.sh
@@ -103,6 +103,12 @@ __PA_statisics_setup() {
 	fi
 }
 
+# Check application requirements, e.g. helm, the the test needs. Exit 1 if req not satisfied
+# args: -
+__PA_test_requirements() {
+	:
+}
+
 
 #######################################################
 
@@ -149,7 +155,7 @@ use_agent_dmaap_https() {
 # args: <protocol> <internal-port> <external-port>
 __agent_set_protocoll() {
 	echo -e $BOLD"$POLICY_AGENT_DISPLAY_NAME protocol setting"$EBOLD
-	echo -e " Using $BOLD http $EBOLD towards $POLICY_AGENT_DISPLAY_NAME"
+	echo -e " Using $BOLD $1 $EBOLD towards $POLICY_AGENT_DISPLAY_NAME"
 
 	## Access to Dmaap adapter
 
@@ -533,7 +539,11 @@ prepare_consul_config() {
 			ric_id=${ric%.*.*} #extract pod id from full hosthame
 			ric_id=$(echo "$ric_id" | tr '-' '_')
 		else
-			ric_id=$ric
+			if [ $DOCKER_COMPOSE_VERION == "V1" ]; then
+				ric_id=$ric
+			else
+				ric_id=$(echo "$ric" | tr '-' '_')  #ric id still needs underscore as it is different from the container name
+			fi
 		fi
 		echo " Found a1 sim: "$ric_id
 		config_json=$config_json"\n            \"name\": \"$ric_id\","