X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Fecs_api_functions.sh;h=5ad1b98e67a9262813b928e65c5a4f624ae0c8c8;hb=a0e0e5c38053553393b341ccdd22e794babfafeb;hp=3edb88d2f98bc65b2f11e98a02385fdd66ee06dc;hpb=c675b454a3434d690695a7336700f78a51579400;p=nonrtric.git

diff --git a/test/common/ecs_api_functions.sh b/test/common/ecs_api_functions.sh
index 3edb88d2..5ad1b98e 100644
--- a/test/common/ecs_api_functions.sh
+++ b/test/common/ecs_api_functions.sh
@@ -185,7 +185,8 @@ start_ecs() {
 		if [ $retcode_p -eq 0 ]; then
 			echo -e " Using existing $ECS_APP_NAME deployment and service"
 			echo " Setting ECS replicas=1"
-			__kube_scale deployment $ECS_APP_NAME $KUBE_NONRTRIC_NAMESPACE 1
+			res_type=$(__kube_get_resource_type $ECS_APP_NAME $KUBE_NONRTRIC_NAMESPACE)
+			__kube_scale $res_type $ECS_APP_NAME $KUBE_NONRTRIC_NAMESPACE 1
 		fi
 
 		# Check if app shall be fully managed by the test script
@@ -366,7 +367,8 @@ stop_ecs() {
 		__check_prestarted_image "ECS"
 		if [ $? -eq 0 ]; then
 			echo -e $YELLOW" Persistency may not work for app $ECS_APP_NAME in multi-worker node config when running it as a prestarted app"$EYELLOW
-			__kube_scale deployment $ECS_APP_NAME $KUBE_NONRTRIC_NAMESPACE 0
+			res_type=$(__kube_get_resource_type $ECS_APP_NAME $KUBE_NONRTRIC_NAMESPACE)
+			__kube_scale $res_type $ECS_APP_NAME $KUBE_NONRTRIC_NAMESPACE 0
 			return 0
 		fi
 
@@ -403,7 +405,8 @@ start_stopped_ecs() {
 		__check_prestarted_image "ECS"
 		if [ $? -eq 0 ]; then
 			echo -e $YELLOW" Persistency may not work for app $ECS_APP_NAME in multi-worker node config when running it as a prestarted app"$EYELLOW
-			__kube_scale deployment $ECS_APP_NAME $KUBE_NONRTRIC_NAMESPACE 1
+			res_type=$(__kube_get_resource_type $ECS_APP_NAME $KUBE_NONRTRIC_NAMESPACE)
+			__kube_scale $res_type $ECS_APP_NAME $KUBE_NONRTRIC_NAMESPACE 1
 			__check_service_start $ECS_APP_NAME $ECS_PATH$ECS_ALIVE_URL
 			return 0
 		fi
@@ -2056,6 +2059,7 @@ ecs_api_idc_get_type() {
 }
 
 # API Test function: GET /data-consumer/v1/info-jobs/{infoJobId}/status
+# This test only status during an optional timeout. No test of the list of producers
 # args: <response-code> <job-id> [<status> [<timeout>]]
 # (Function for test scripts)
 ecs_api_idc_get_job_status() {
@@ -2120,6 +2124,103 @@ ecs_api_idc_get_job_status() {
 	return 0
 }
 
+# API Test function: GET /data-consumer/v1/info-jobs/{infoJobId}/status
+# This function test status and the list of producers with and optional timeout
+# args: <response-code> <job-id> [<status> EMPTYPROD|( <prod-count> <producer-id>+ ) [<timeout>]]
+# (Function for test scripts)
+ecs_api_idc_get_job_status2() {
+
+	__log_test_start $@
+	param_error=0
+	if [ $# -lt 2 ]; then
+		param_error=1
+	fi
+	args=("$@")
+	timeout=0
+	if [ $# -gt 2 ]; then
+		if [ $# -lt 4 ]; then
+			param_error=1
+		fi
+		targetJson="{\"info_job_status\": \"$3\""
+		if [ "$4" == "EMPTYPROD" ]; then
+			targetJson=$targetJson",\"producers\": []}"
+			if [ $# -gt 4 ]; then
+				timeout=$5
+			fi
+		else
+			targetJson=$targetJson",\"producers\": ["
+			if [ $# -eq $(($4+5)) ]; then
+				idx=$(($4+4))
+				timeout=${args[$idx]}
+			fi
+			for ((ecs_i = 0 ; ecs_i < $4 ; ecs_i++)); do
+				idx=$(($ecs_i+4))
+				if [ $ecs_i -gt 0 ]; then
+					targetJson=$targetJson","
+				fi
+				targetJson=$targetJson"\""${args[$idx]}"\""
+			done
+			targetJson=$targetJson"]}"
+		fi
+	fi
+
+	if [ $param_error -ne 0 ]; then
+		__print_err "<response-code> <job-id> [<status> EMPTYPROD|( <prod-count> <producer-id>+ ) [<timeout>]]" $@
+		return 1
+	fi
+
+	query="/data-consumer/v1/info-jobs/$2/status"
+
+	start=$SECONDS
+	for (( ; ; )); do
+		res="$(__do_curl_to_api ECS GET $query)"
+		status=${res:${#res}-3}
+
+		if [ $# -gt 2 ]; then
+			duration=$((SECONDS-start))
+			echo -ne " Response=${status} after ${duration} seconds, waiting for ${3} ${SAMELINE}"
+			if [ $duration -gt $timeout ]; then
+				echo ""
+				duration=-1  #Last iteration
+			fi
+		else
+			duration=-1 #single test, no wait
+		fi
+
+		if [ $status -ne $1 ]; then
+			if [ $duration -eq -1 ]; then
+				__log_test_fail_status_code $1 $status
+				return 1
+			fi
+		fi
+		if [ $# -gt 2 ] && [ $status -eq $1 ]; then
+			body=${res:0:${#res}-3}
+			echo " TARGET JSON: $targetJson" >> $HTTPLOG
+			res=$(python3 ../common/compare_json.py "$targetJson" "$body")
+
+			if [ $res -ne 0 ]; then
+				if [ $duration -eq -1 ]; then
+					__log_test_fail_body
+					return 1
+				fi
+			else
+				duration=-1  #Goto pass
+			fi
+		fi
+		if [ $duration -eq -1 ]; then
+			if [ $# -eq 4 ]; then
+				echo ""
+			fi
+			__log_test_pass
+			return 0
+		else
+			sleep 1
+		fi
+	done
+
+	__log_test_pass
+	return 0
+}
 
 ##########################################
 ####          Reset jobs              ####
@@ -2185,7 +2286,13 @@ ecs_api_admin_reset() {
 ecs_kube_pvc_reset() {
 	__log_test_start $@
 
-	__kube_clean_pvc $ECS_APP_NAME nonrtric enrichmentservice-pvc /var/enrichment-coordinator-service/database
+	pvc_name=$(kubectl get pvc -n nonrtric  --no-headers -o custom-columns=":metadata.name" | grep enrichment)
+	if [ -z "$pvc_name" ]; then
+		pvc_name=enrichmentservice-pvc
+	fi
+	echo " Trying to reset pvc: "$pvc_name
+
+	__kube_clean_pvc $ECS_APP_NAME nonrtric $pvc_name /var/enrichment-coordinator-service/database
 
 	__log_test_pass
 	return 0