X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Ftestcase_common.sh;h=b13b479f013303cf2b3182d7ce116a9eceb9875e;hb=1c7c5fc52d531205e3bd639fc4f2189c49f296cc;hp=d16ee6ec7a25fce2e82df2c8be0d75a3016fa010;hpb=2918bef3d237c99e6cf7e9c1ab1722781128617b;p=nonrtric.git

diff --git a/test/common/testcase_common.sh b/test/common/testcase_common.sh
index d16ee6ec..b13b479f 100755
--- a/test/common/testcase_common.sh
+++ b/test/common/testcase_common.sh
@@ -26,11 +26,11 @@
 __print_args() {
 	echo "Args: remote|remote-remove docker|kube --env-file <environment-filename> [release] [auto-clean] [--stop-at-error] "
 	echo "      [--ricsim-prefix <prefix> ] [--use-local-image <app-nam>+]  [--use-snapshot-image <app-nam>+]"
-	echo "      [--use-staging-image <app-nam>+] [--use-release-image <app-nam>+] [--image-repo <repo-address>]"
+	echo "      [--use-staging-image <app-nam>+] [--use-release-image <app-nam>+] [--use-external-image <app-nam>+] [--image-repo <repo-address>]"
 	echo "      [--repo-policy local|remote] [--cluster-timeout <timeout-in seconds>] [--print-stats]"
 	echo "      [--override <override-environment-filename>] [--pre-clean] [--gen-stats] [--delete-namespaces]"
 	echo "      [--delete-containers] [--endpoint-stats] [--kubeconfig <config-file>] [--host-path-dir <local-host-dir>]"
-	echo "      [--kubecontext <context-name>]"
+	echo "      [--kubecontext <context-name>] [--docker-host <docker-host-url>] [--docker-proxy <host-or-ip>]"
 }
 
 if [ $# -eq 1 ] && [ "$1" == "help" ]; then
@@ -55,6 +55,7 @@ if [ $# -eq 1 ] && [ "$1" == "help" ]; then
 	echo "--use-snapshot-image  -  The script will use images from the nexus snapshot repo for the supplied apps, space separated list of app short names"
 	echo "--use-staging-image   -  The script will use images from the nexus staging repo for the supplied apps, space separated list of app short names"
 	echo "--use-release-image   -  The script will use images from the nexus release repo for the supplied apps, space separated list of app short names"
+	echo "--use-external-image   - The script will use images from the external (non oran/onap) repo for the supplied apps, space separated list of app short names"
 	echo "--image-repo          -  Url to optional image repo. Only locally built images will be re-tagged and pushed to this repo"
 	echo "--repo-policy         -  Policy controlling which images to re-tag and push if param --image-repo is set. Default is 'local'"
 	echo "--cluster-timeout     -  Optional timeout for cluster where it takes time to obtain external ip/host-name. Timeout in seconds. "
@@ -68,6 +69,8 @@ if [ $# -eq 1 ] && [ "$1" == "help" ]; then
 	echo "--kubeconfig          -  Configure kubectl to use cluster specific cluster config file"
 	echo "--host-path-dir       -  (Base-)path on local-hostmounted to all VMs (nodes), for hostpath volumes in kube"
 	echo "--kubecontext         -  Configure kubectl to use a certain context, e.g 'minikube'"
+	echo "--docker-host         -  Configure docker to use docker in e.g. a VM"
+	echo "--docker-proxy        -  Configure ip/host to docker when docker is running in a VM"
 	echo ""
 	echo "List of app short names supported: "$APP_SHORT_NAMES
 	exit 0
@@ -121,6 +124,8 @@ USE_STAGING_IMAGES=""
 # Var to hold the app names to use remote release images for
 USE_RELEASE_IMAGES=""
 
+# Var to hold the app names to use external release images for
+USE_EXTERNAL_IMAGES=""
 
 # Use this var (STOP_AT_ERROR=1 in the test script) for debugging/trouble shooting to take all logs and exit at first FAIL test case
 STOP_AT_ERROR=0
@@ -133,7 +138,7 @@ IMAGE_CATEGORY="DEV"
 #Var to indicate docker-compose version, V1 or V2
 #V1 names replicated containers <proj-name>_<service-name>_<index>
 #V2 names replicated containers <proj-name>-<service-name>-<index>
-DOCKER_COMPOSE_VERION="V1"
+DOCKER_COMPOSE_VERSION="V1"
 
 # Function to indent cmd output with one space
 indent1() { sed 's/^/ /'; }
@@ -242,6 +247,9 @@ echo "1" > "$TESTLOGS/$ATC/.result$ATC.txt"
 TCLOG=$TESTLOGS/$ATC/TC.log
 exec &>  >(tee ${TCLOG})
 
+echo $(date) > $TESTLOGS/$ATC/endpoint_tc_start.log
+echo "Test failed" > $TESTLOGS/$ATC/endpoint_tc_end.log  # Will be overritten if test is ok
+
 #Variables for counting tests as well as passed and failed tests
 RES_TEST=0
 RES_PASS=0
@@ -268,6 +276,14 @@ DELETE_CONTAINERS=0
 #Var to configure kubectl from a config file or context
 KUBECONF=""
 
+#Localhost, may be set to another host/ip by cmd parameter
+LOCALHOST_NAME="localhost"
+
+#Reseting vars related to token/keys used by kubeproxy when istio is enabled
+#The vars are populated if istio is used in the testcase
+KUBE_PROXY_CURL_JWT=""
+KUBE_PROXY_ISTIO_JWKS_KEYS=""
+
 #Var pointing to dir mounted to each kubernetes node (master and workers)
 #Persistent volumes using "hostpath" are allocated beneath the point.
 #Typically it is a dir on local host mounted to each VM running the master and worker.
@@ -671,6 +687,31 @@ while [ $paramerror -eq 0 ] && [ $foundparm -eq 0 ]; do
 			fi
 		fi
 	fi
+	if [ $paramerror -eq 0 ]; then
+		if [ "$1" == "--use-external-image" ]; then
+			USE_EXTERNAL_IMAGES=""
+			shift
+			while [ $# -gt 0 ] && [[ "$1" != "--"* ]]; do
+				USE_EXTERNAL_IMAGES=$USE_EXTERNAL_IMAGES" "$1
+				if [[ "$AVAILABLE_IMAGES_OVERRIDE" != *"$1"* ]]; then
+					paramerror=1
+					if [ -z "$paramerror_str" ]; then
+						paramerror_str="App name $1 is not available for release override for flag: '--use-external-image'"
+					fi
+				fi
+				shift;
+			done
+			foundparm=0
+			if [ -z "$USE_EXTERNAL_IMAGES" ]; then
+				paramerror=1
+				if [ -z "$paramerror_str" ]; then
+					paramerror_str="No app name found for flag: '--use-use-external-image'"
+				fi
+			else
+				echo "Option set - Overriding with external images for app(s):"$USE_EXTERNAL_IMAGES
+			fi
+		fi
+	fi
 	if [ $paramerror -eq 0 ]; then
 		if [ "$1" == "--image-repo" ]; then
 			shift;
@@ -883,6 +924,55 @@ while [ $paramerror -eq 0 ] && [ $foundparm -eq 0 ]; do
 				fi
 			else
 				HOST_PATH_BASE_DIR=$1
+				echo "Option set - Host path for kube set to: "$1
+				shift
+				foundparm=0
+			fi
+		fi
+	fi
+	if [ $paramerror -eq 0 ]; then
+		if [ "$1" == "--docker-host" ]; then
+			shift;
+			if [ -z "$1" ]; then
+				paramerror=1
+				if [ -z "$paramerror_str" ]; then
+					paramerror_str="No url found for : '--docker-host'"
+				fi
+			else
+				export DOCKER_HOST="$1"
+				echo "Option set - DOCKER_HOST set to: "$1
+				shift
+				foundparm=0
+			fi
+		fi
+	fi
+	if [ $paramerror -eq 0 ]; then
+		if [ "$1" == "--docker-host" ]; then
+			shift;
+			if [ -z "$1" ]; then
+				paramerror=1
+				if [ -z "$paramerror_str" ]; then
+					paramerror_str="No url found for : '--docker-host'"
+				fi
+			else
+				export DOCKER_HOST="$1"
+				echo "Option set - DOCKER_HOST set to: "$1
+				shift
+				foundparm=0
+			fi
+		fi
+	fi
+	if [ $paramerror -eq 0 ]; then
+		if [ "$1" == "--docker-proxy" ]; then
+			shift;
+			if [ -z "$1" ]; then
+				paramerror=1
+				if [ -z "$paramerror_str" ]; then
+					paramerror_str="No ip/host found for : '--docker-proxy'"
+				fi
+			else
+				export LOCALHOST_NAME=$1
+				echo "Option set - docker proxy set to: "$1
 				shift
 				foundparm=0
 			fi
@@ -905,11 +995,6 @@ if [ $paramerror -eq 1 ]; then
 	exit 1
 fi
 
-#Localhost constants
-LOCALHOST_NAME="localhost"
-# if [ ! -z "$DOCKER_HOST" ]; then
-# 	LOCALHOST_NAME=$(echo $DOCKER_HOST | awk -F[/:] '{print $4}' )
-# fi
 LOCALHOST_HTTP="http://$LOCALHOST_NAME"
 LOCALHOST_HTTPS="https://$LOCALHOST_NAME"
 
@@ -1063,10 +1148,10 @@ if [ $RUNMODE == "DOCKER" ]; then
 		echo -e $RED"docker-compose is required to run the test environment, pls install"$ERED
 		exit 1
 	else
-		tmp=$(docker-compose version --short)
+		tmp=$(docker-compose version)
 		echo " docker-compose installed and using version $tmp"
 		if [[ "$tmp" == *'v2'* ]]; then
-			DOCKER_COMPOSE_VERION="V2"
+			DOCKER_COMPOSE_VERSION="V2"
 		fi
 	fi
 fi
@@ -1195,7 +1280,7 @@ __check_and_create_image_var() {
 		if [ "$5" == "REMOTE_RELEASE_ORAN" ]; then
 			image=$NEXUS_RELEASE_REPO_ORAN$image
 		fi
-		#No nexus repo added for local images, tag: LOCAL
+		#No nexus repo added for local images, tag: LOCAL and other tags
 		tmp=$tmp$image"\t"
 	fi
 	if [ -z $tag ]; then
@@ -1375,6 +1460,12 @@ __check_image_override() {
 			((CTR++))
 		fi
 	done
+	for im in $USE_EXTERNAL_IMAGES; do
+		if [ "$1" == "$im" ]; then
+			suffix="EXTERNAL"
+			((CTR++))
+		fi
+	done
 	echo $suffix
 	if [ $CTR -gt 1 ]; then
 		exit 1
@@ -1857,27 +1948,31 @@ print_result() {
 		echo "Runtime statistics collected in file: "$TESTLOGS/$ATC/stat_data.csv
 		echo ""
 	fi
-
+	TMP_FLAG_FAIL_PASS=0
 	total=$((RES_PASS+RES_FAIL))
 	if [ $RES_TEST -eq 0 ]; then
+		TMP_FLAG_FAIL_PASS=1
 		echo -e "\033[1mNo tests seem to have been executed. Check the script....\033[0m"
  		echo -e "\033[31m\033[1m ___  ___ ___ ___ ___ _____   ___ _   ___ _   _   _ ___ ___ \033[0m"
  		echo -e "\033[31m\033[1m/ __|/ __| _ \_ _| _ \_   _| | __/_\ |_ _| | | | | | _ \ __|\033[0m"
 		echo -e "\033[31m\033[1m\__ \ (__|   /| ||  _/ | |   | _/ _ \ | || |_| |_| |   / _| \033[0m"
  		echo -e "\033[31m\033[1m|___/\___|_|_\___|_|   |_|   |_/_/ \_\___|____\___/|_|_\___|\033[0m"
 	elif [ $total != $RES_TEST ]; then
+		TMP_FLAG_FAIL_PASS=1
 		echo -e "\033[1mTotal number of tests does not match the sum of passed and failed tests. Check the script....\033[0m"
 		echo -e "\033[31m\033[1m ___  ___ ___ ___ ___ _____   ___ _   ___ _   _   _ ___ ___ \033[0m"
 		echo -e "\033[31m\033[1m/ __|/ __| _ \_ _| _ \_   _| | __/_\ |_ _| | | | | | _ \ __|\033[0m"
 		echo -e "\033[31m\033[1m\__ \ (__|   /| ||  _/ | |   | _/ _ \ | || |_| |_| |   / _| \033[0m"
  		echo -e "\033[31m\033[1m|___/\___|_|_\___|_|   |_|   |_/_/ \_\___|____\___/|_|_\___|\033[0m"
 	elif [ $RES_CONF_FAIL -ne 0 ]; then
+		TMP_FLAG_FAIL_PASS=1
 		echo -e "\033[1mOne or more configurations has failed. Check the script log....\033[0m"
 		echo -e "\033[31m\033[1m ___  ___ ___ ___ ___ _____   ___ _   ___ _   _   _ ___ ___ \033[0m"
 		echo -e "\033[31m\033[1m/ __|/ __| _ \_ _| _ \_   _| | __/_\ |_ _| | | | | | _ \ __|\033[0m"
 		echo -e "\033[31m\033[1m\__ \ (__|   /| ||  _/ | |   | _/ _ \ | || |_| |_| |   / _| \033[0m"
  		echo -e "\033[31m\033[1m|___/\___|_|_\___|_|   |_|   |_/_/ \_\___|____\___/|_|_\___|\033[0m"
 	elif [ $RES_PASS = $RES_TEST ]; then
+		TMP_FLAG_FAIL_PASS=0
 		echo -e "All tests \033[32m\033[1mPASS\033[0m"
 		echo -e "\033[32m\033[1m  ___  _   ___ ___ \033[0m"
 		echo -e "\033[32m\033[1m | _ \/_\ / __/ __| \033[0m"
@@ -1897,13 +1992,18 @@ print_result() {
 		#Create file with OK exit code
 		echo "0" > "$AUTOTEST_HOME/.result$ATC.txt"
 		echo "0" > "$TESTLOGS/$ATC/.result$ATC.txt"
+		echo $(date) > $TESTLOGS/$ATC/endpoint_tc_end.log
 	else
+		TMP_FLAG_FAIL_PASS=1
 		echo -e "One or more tests with status  \033[31m\033[1mFAIL\033[0m "
 		echo -e "\033[31m\033[1m  ___ _   ___ _    \033[0m"
 		echo -e "\033[31m\033[1m | __/_\ |_ _| |   \033[0m"
 		echo -e "\033[31m\033[1m | _/ _ \ | || |__ \033[0m"
 		echo -e "\033[31m\033[1m |_/_/ \_\___|____|\033[0m"
 		echo ""
+	fi
+
+	if [ $TMP_FLAG_FAIL_PASS -ne 0 ]; then
 		# Update test suite counter
 		if [ -f .tmp_tcsuite_fail_ctr ]; then
 			tmpval=$(< .tmp_tcsuite_fail_ctr)
@@ -2293,7 +2393,7 @@ __kube_delete_all_resources() {
 	namespace=$1
 	labelname=$2
 	labelid=$3
-	resources="deployments replicaset statefulset services pods configmaps persistentvolumeclaims persistentvolumes serviceaccounts clusterrolebindings secrets"
+	resources="deployments replicaset statefulset services pods configmaps persistentvolumeclaims persistentvolumes serviceaccounts clusterrolebindings secrets authorizationpolicies requestauthentications"
 	deleted_resourcetypes=""
 	for restype in $resources; do
 		ns_flag="-n $namespace"
@@ -2306,7 +2406,7 @@ __kube_delete_all_resources() {
 			ns_flag=""
 			ns_text=""
 		fi
-		result=$(kubectl $KUBECONF get $restype $ns_flag -o jsonpath='{.items[?(@.metadata.labels.'$labelname'=="'$labelid'")].metadata.name}')
+		result=$(kubectl $KUBECONF get $restype $ns_flag -o jsonpath='{.items[?(@.metadata.labels.'$labelname'=="'$labelid'")].metadata.name}' 2> /dev/null)
 		if [ $? -eq 0 ] && [ ! -z "$result" ]; then
 			deleted_resourcetypes=$deleted_resourcetypes" "$restype
 			for resid in $result; do
@@ -2409,7 +2509,7 @@ __kube_delete_namespace() {
 	return 0
 }
 
-# Removes a namespace
+# Removes and re-create a namespace
 # args: <namespace>
 # (Not for test scripts)
 clean_and_create_namespace() {
@@ -2427,7 +2527,22 @@ clean_and_create_namespace() {
 	if [ $? -ne 0 ]; then
 		return 1
 	fi
+}
 
+# Add/remove label on non-namespaced kube object
+# args: <api> <instance> <label>
+# (Not for test scripts)
+__kube_label_non_ns_instance() {
+	kubectl $KUBECONF label $1 $2 "$3" 1> /dev/null 2> ./tmp/kubeerr
+	return $?
+}
+
+# Add/remove label on namespaced kube object
+# args: <api> <instance> <namespace> <label>
+# (Not for test scripts)
+__kube_label_ns_instance() {
+	kubectl $KUBECONF label $1 $2 -n $3 "$4" 1> /dev/null 2> ./tmp/kubeerr
+	return $?
 }
 
 # Find the host ip of an app (using the service resource)
@@ -2662,6 +2777,17 @@ __clean_kube() {
 		fi
 	done
 
+	# Remove istio label on namespaces
+	test_env_namespaces=$(kubectl $KUBECONF get ns  --no-headers -o custom-columns=":metadata.name" -l autotest=engine -l istio-injection=enabled) #Get list of ns created by the test env
+	if [ $? -ne 0 ]; then
+		echo " Cannot get list of namespaces...continues.."
+	else
+		for test_env_ns in $test_env_namespaces; do
+			echo " Removing istio label on ns: "$test_env_ns
+			__kube_label_non_ns_instance ns $test_env_ns "istio-injection-"
+		done
+	fi
+
 	echo ""
 }
 
@@ -2784,7 +2910,7 @@ __start_container() {
 
 	envsubst < $compose_file > "gen_"$compose_file
 	compose_file="gen_"$compose_file
-	if [ $DOCKER_COMPOSE_VERION == "V1" ]; then
+	if [ $DOCKER_COMPOSE_VERSION == "V1" ]; then
 		docker_compose_cmd="docker-compose"
 	else
 		docker_compose_cmd="docker compose"
@@ -2996,6 +3122,7 @@ store_logs() {
 ## Generic curl
 ###############
 # Generic curl function, assumes all 200-codes are ok
+# Used proxy, set
 # args: <valid-curl-args-including full url>
 # returns: <returned response (without respose code)>  or "<no-response-from-server>" or "<not found, <http-code>>""
 # returns: The return code is 0 for ok and 1 for not ok
@@ -3009,7 +3136,57 @@ __do_curl() {
 			proxyflag=" --proxy-insecure --proxy $KUBE_PROXY_PATH"
 		fi
 	fi
-	curlString="curl -skw %{http_code} $proxyflag $@"
+
+	if [ ! -z "$KUBE_PROXY_CURL_JWT" ]; then
+		jwt="-H "\""Authorization: Bearer $KUBE_PROXY_CURL_JWT"\"
+		curlString="curl -skw %{http_code} $proxyflag $@"
+		echo " CMD: $curlString $jwt" >> $HTTPLOG
+		res=$($curlString -H "Authorization: Bearer $KUBE_PROXY_CURL_JWT")
+		retcode=$?
+	else
+		curlString="curl -skw %{http_code} $proxyflag $@"
+		echo " CMD: $curlString" >> $HTTPLOG
+		res=$($curlString)
+		retcode=$?
+	fi
+	echo " RESP: $res" >> $HTTPLOG
+	echo " RETCODE: $retcode" >> $HTTPLOG
+	if [ $retcode -ne 0 ]; then
+		echo "<no-response-from-server>"
+		return 1
+	fi
+	http_code="${res:${#res}-3}"
+	if [ ${#res} -eq 3 ]; then
+		if [ $http_code -lt 200 ] || [ $http_code -gt 299 ]; then
+			echo "<no-response-from-server>"
+			return 1
+		else
+			return 0
+		fi
+	else
+		if [ $http_code -lt 200 ] || [ $http_code -gt 299 ]; then
+			echo "<not found, resp:${http_code}>"
+			return 1
+		fi
+		if [ $# -eq 2 ]; then
+  			echo "${res:0:${#res}-3}" | xargs
+		else
+  			echo "${res:0:${#res}-3}"
+		fi
+
+		return 0
+	fi
+
+}
+
+# Generic curl function, assumes all 200-codes are ok
+# Uses no proxy, even if it is set
+# args: <valid-curl-args-including full url>
+# returns: <returned response (without respose code)>  or "<no-response-from-server>" or "<not found, <http-code>>""
+# returns: The return code is 0 for ok and 1 for not ok
+__do_curl_no_proxy() {
+	echo ${FUNCNAME[1]} "line: "${BASH_LINENO[1]} >> $HTTPLOG
+	curlString="curl -skw %{http_code} $@"
 	echo " CMD: $curlString" >> $HTTPLOG
 	res=$($curlString)
 	retcode=$?
@@ -3033,9 +3210,9 @@ __do_curl() {
 			return 1
 		fi
 		if [ $# -eq 2 ]; then
-  			echo "${res:0:${#res}-3}" | xargs
+			echo "${res:0:${#res}-3}" | xargs
 		else
-  			echo "${res:0:${#res}-3}"
+			echo "${res:0:${#res}-3}"
 		fi
 
 		return 0