X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Fngw_api_functions.sh;h=a1e614533708c27ecccaefed3d5ebb2c4f638848;hb=d2aeca8843fe3ffca2e73dec5b64daeef0dda938;hp=d8f1707bacbd5e467ed16163773757abfff4b3df;hpb=09e21f39a3ffcfc2063110bcad028014b0056398;p=nonrtric.git

diff --git a/test/common/ngw_api_functions.sh b/test/common/ngw_api_functions.sh
index d8f1707b..a1e61453 100644
--- a/test/common/ngw_api_functions.sh
+++ b/test/common/ngw_api_functions.sh
@@ -79,7 +79,7 @@ __NGW_kube_delete_all() {
 # args: <log-dir> <file-prexix>
 __NGW_store_docker_logs() {
 	if [ $RUNMODE == "KUBE" ]; then
-		kubectl  logs -l "autotest=NGW" -n $KUBE_NONRTRIC_NAMESPACE --tail=-1 > $1$2_gateway.log 2>&1
+		kubectl $KUBECONF  logs -l "autotest=NGW" -n $KUBE_NONRTRIC_NAMESPACE --tail=-1 > $1$2_gateway.log 2>&1
 	else
 		docker logs $NRT_GATEWAY_APP_NAME > $1$2_gateway.log 2>&1
 	fi
@@ -104,6 +104,12 @@ __NGW_statisics_setup() {
 	fi
 }
 
+# Check application requirements, e.g. helm, the the test needs. Exit 1 if req not satisfied
+# args: -
+__NGW_test_requirements() {
+	:
+}
+
 #######################################################
 
 
@@ -128,7 +134,7 @@ use_gateway_https() {
 # args: <protocol> <internal-port> <external-port>
 __gateway_set_protocoll() {
 	echo -e $BOLD"$NRT_GATEWAY_DISPLAY_NAME protocol setting"$EBOLD
-	echo -e " Using $BOLD http $EBOLD towards $NRT_GATEWAY_DISPLAY_NAME"
+	echo -e " Using $BOLD $1 $EBOLD towards $NRT_GATEWAY_DISPLAY_NAME"
 
 	## Access to nonrtric gateway
 
@@ -198,13 +204,13 @@ __gateway_export_vars() {
 	export NRT_GATEWAY_COMPOSE_DIR
 
 	if [ $RUNMODE == "KUBE" ]; then
-		export POLICY_AGENT_EXTERNAL_SECURE_PORT
-		export ECS_EXTERNAL_SECURE_PORT
-		export POLICY_AGENT_DOMAIN_NAME=$POLICY_AGENT_APP_NAME.$KUBE_NONRTRIC_NAMESPACE
-		export ECS_DOMAIN_NAME=$ECS_APP_NAME.$KUBE_NONRTRIC_NAMESPACE
+		export A1PMS_EXTERNAL_SECURE_PORT
+		export ICS_EXTERNAL_SECURE_PORT
+		export A1PMS_DOMAIN_NAME=$A1PMS_APP_NAME.$KUBE_NONRTRIC_NAMESPACE
+		export ICS_DOMAIN_NAME=$ICS_APP_NAME.$KUBE_NONRTRIC_NAMESPACE
 	else
-		export POLICY_AGENT_DOMAIN_NAME=$POLICY_AGENT_APP_NAME
-		export ECS_DOMAIN_NAME=$ECS_APP_NAME
+		export A1PMS_DOMAIN_NAME=$A1PMS_APP_NAME
+		export ICS_DOMAIN_NAME=$ICS_APP_NAME
 	fi
 }
 
@@ -297,16 +303,16 @@ start_gateway() {
 }
 
 
-# API Test function: V2 GET /status towards PMS
+# API Test function: V2 GET /status towards A1PMS
 # args: <response-code>
 # (Function for test scripts)
-gateway_pms_get_status() {
+gateway_a1pms_get_status() {
 	__log_test_start $@
     if [ $# -ne 1 ]; then
 		__print_err "<response-code>" $@
 		return 1
 	fi
-	query=$PMS_API_PREFIX"/v2/status"
+	query=$A1PMS_API_PREFIX"/v2/status"
     res="$(__do_curl_to_api NGW GET $query)"
     status=${res:${#res}-3}
 
@@ -319,11 +325,11 @@ gateway_pms_get_status() {
 	return 0
 }
 
-# API Test function: GET /ei-producer/v1/eitypes towards ECS
+# API Test function: GET /ei-producer/v1/eitypes towards ICS
 # Note: This is just to test service response
 # args: <response-code>
 # (Function for test scripts)
-gateway_ecs_get_types() {
+gateway_ics_get_types() {
 	__log_test_start $@
     if [ $# -ne 1 ]; then
 		__print_err "<response-code>" $@