X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Ftestcase_common.sh;h=194a30728b039ece92cca1379b9df907bd607b55;hb=refs%2Fchanges%2F23%2F9023%2F2;hp=66e6dfac43e5818076c04306d7ada4f6a3cd165a;hpb=2889efe2ff8128ed574d1debd668d1ad88e4681a;p=nonrtric.git

diff --git a/test/common/testcase_common.sh b/test/common/testcase_common.sh
index 66e6dfac..194a3072 100755
--- a/test/common/testcase_common.sh
+++ b/test/common/testcase_common.sh
@@ -26,10 +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>] [--docker-host <docker-host-url>] [--docker-proxy <host-or-ip>]"
 }
 
 if [ $# -eq 1 ] && [ "$1" == "help" ]; then
@@ -54,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. "
@@ -66,6 +68,9 @@ if [ $# -eq 1 ] && [ "$1" == "help" ]; then
 	echo "--endpoint-stats      -  Collect endpoint statistics"
 	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
@@ -101,11 +106,6 @@ TEST_ENV_VAR_FILE_OVERRIDE=""
 
 echo "Test case started as: ${BASH_SOURCE[$i+1]} "$@
 
-#Localhost constants
-LOCALHOST_NAME="localhost"
-LOCALHOST_HTTP="http://localhost"
-LOCALHOST_HTTPS="https://localhost"
-
 # Var to hold 'auto' in case containers shall be stopped when test case ends
 AUTO_CLEAN=""
 
@@ -124,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
@@ -136,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/^/ /'; }
@@ -268,9 +270,17 @@ DELETE_KUBE_NAMESPACES=0
 #Var to control if containers shall be delete before test setup
 DELETE_CONTAINERS=0
 
-#Var to configure kubectl from a config file.
+#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.
@@ -450,7 +460,7 @@ __collect_endpoint_stats_image_info() {
 		return
 	fi
 	ENDPOINT_STAT_FILE=$TESTLOGS/$ATC/imageinfo_$ATC_$1".log"
-	echo $POLICY_AGENT_IMAGE > $ENDPOINT_STAT_FILE
+	echo $A1PMS_IMAGE > $ENDPOINT_STAT_FILE
 }
 
 #Var for measuring execution time
@@ -674,6 +684,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;
@@ -833,10 +868,17 @@ while [ $paramerror -eq 0 ] && [ $foundparm -eq 0 ]; do
 				fi
 			else
 			    if [ -f  $1 ]; then
-					KUBECONF="--kubeconfig $1"
-					echo "Option set - Kubeconfig path: "$1
-					shift;
-					foundparm=0
+					if [ ! -z "$KUBECONF" ]; then
+						paramerror=1
+						if [ -z "$paramerror_str" ]; then
+							paramerror_str="Only one of --kubeconfig/--kubecontext can be set"
+						fi
+					else
+						KUBECONF="--kubeconfig $1"
+						echo "Option set - Kubeconfig path: "$1
+						shift;
+						foundparm=0
+					fi
 				else
 					paramerror=1
 					if [ -z "$paramerror_str" ]; then
@@ -846,6 +888,29 @@ while [ $paramerror -eq 0 ] && [ $foundparm -eq 0 ]; do
 			fi
 		fi
 	fi
+	if [ $paramerror -eq 0 ]; then
+		if [ "$1" == "--kubecontext" ]; then
+			shift;
+			if [ -z "$1" ]; then
+				paramerror=1
+				if [ -z "$paramerror_str" ]; then
+					paramerror_str="No context-name found for : '--kubecontext'"
+				fi
+			else
+				if [ ! -z "$KUBECONF" ]; then
+					paramerror=1
+					if [ -z "$paramerror_str" ]; then
+						paramerror_str="Only one of --kubeconfig or --kubecontext can be set"
+					fi
+				else
+					KUBECONF="--context $1"
+					echo "Option set - Kubecontext name: "$1
+					shift;
+					foundparm=0
+				fi
+			fi
+		fi
+	fi
 	if [ $paramerror -eq 0 ]; then
 		if [ "$1" == "--host-path-dir" ]; then
 			shift;
@@ -856,6 +921,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
@@ -878,6 +992,9 @@ if [ $paramerror -eq 1 ]; then
 	exit 1
 fi
 
+LOCALHOST_HTTP="http://$LOCALHOST_NAME"
+LOCALHOST_HTTPS="https://$LOCALHOST_NAME"
+
 # sourcing the selected env variables for the test case
 if [ -f "$TEST_ENV_VAR_FILE" ]; then
 	echo -e $BOLD"Sourcing env vars from: "$TEST_ENV_VAR_FILE$EBOLD
@@ -1022,27 +1139,25 @@ fi
 echo " docker is installed and using versions:"
 echo  "  $(docker version --format 'Client version {{.Client.Version}} Server version {{.Server.Version}}')"
 
-tmp=$(which docker-compose)
-if [ $? -ne 0 ] || [ -z "$tmp" ]; then
-	if [ $RUNMODE == "DOCKER" ]; then
+if [ $RUNMODE == "DOCKER" ]; then
+	tmp=$(which docker-compose)
+	if [ $? -ne 0 ] || [ -z "$tmp" ]; then
 		echo -e $RED"docker-compose is required to run the test environment, pls install"$ERED
 		exit 1
+	else
+		tmp=$(docker-compose version)
+		echo " docker-compose installed and using version $tmp"
+		if [[ "$tmp" == *'v2'* ]]; then
+			DOCKER_COMPOSE_VERSION="V2"
+		fi
 	fi
 fi
-tmp=$(docker-compose version --short)
-echo " docker-compose installed and using version $tmp"
-if [[ "$tmp" == *'v2'* ]]; then
-	DOCKER_COMPOSE_VERION="V2"
-fi
-
-tmp=$(which kubectl)
-if [ $? -ne 0 ] || [ -z tmp ]; then
-	if [ $RUNMODE == "KUBE" ]; then
+if [ $RUNMODE == "KUBE" ]; then
+	tmp=$(which kubectl)
+	if [ $? -ne 0 ] || [ -z tmp ]; then
 		echo -e $RED"kubectl is required to run the test environment in kubernetes mode, pls install"$ERED
 		exit 1
-	fi
-else
-	if [ $RUNMODE == "KUBE" ]; then
+	else
 		echo " kubectl is installed and using versions:"
 		echo $(kubectl $KUBECONF version --short=true) | indent2
 		res=$(kubectl $KUBECONF cluster-info 2>&1)
@@ -1162,7 +1277,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
@@ -1342,6 +1457,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
@@ -1743,8 +1864,8 @@ setup_testenvironment() {
 			echo -e " Pulling remote snapshot or staging images my in some case result in pulling newer image versions outside the control of the test engine"
 			export KUBE_IMAGE_PULL_POLICY="Always"
 		fi
-		CLUSTER_IP=$(kubectl $KUBECONF config view -o jsonpath={.clusters[0].cluster.server} | awk -F[/:] '{print $4}')
-		echo -e $YELLOW" The cluster hostname/ip is: $CLUSTER_IP"$EYELLOW
+		#CLUSTER_IP=$(kubectl $KUBECONF config view -o jsonpath={.clusters[0].cluster.server} | awk -F[/:] '{print $4}')
+		#echo -e $YELLOW" The cluster hostname/ip is: $CLUSTER_IP"$EYELLOW
 
 		echo "================================================================================="
 		echo "================================================================================="
@@ -1824,27 +1945,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"
@@ -1865,12 +1990,16 @@ print_result() {
 		echo "0" > "$AUTOTEST_HOME/.result$ATC.txt"
 		echo "0" > "$TESTLOGS/$ATC/.result$ATC.txt"
 	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)
@@ -2260,7 +2389,7 @@ __kube_delete_all_resources() {
 	namespace=$1
 	labelname=$2
 	labelid=$3
-	resources="deployments replicaset statefulset services pods configmaps persistentvolumeclaims persistentvolumes serviceaccounts clusterrolebindings"
+	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"
@@ -2273,7 +2402,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
@@ -2343,7 +2472,7 @@ __kube_create_namespace() {
 			echo "  Message: $(<./tmp/kubeerr)"
 			return 1
 		else
-			kubectl $KUBECONF label ns $1 autotest=engine
+			kubectl $KUBECONF label ns $1 autotest=engine > /dev/null
 			echo -e " Creating namespace $1 $GREEN$BOLD OK $EBOLD$EGREEN"
 		fi
 	else
@@ -2376,7 +2505,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() {
@@ -2394,7 +2523,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)
@@ -2629,6 +2773,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 ""
 }
 
@@ -2640,14 +2795,14 @@ clean_environment() {
 		__clean_kube
 		if [ $PRE_CLEAN -eq 1 ]; then
 			echo " Cleaning docker resouces to free up resources, may take time..."
-			../common/clean_docker.sh 2>&1 /dev/null
+			../common/clean_docker.sh 2>&1 > /dev/null
 			echo ""
 		fi
 	else
 		__clean_containers
 		if [ $PRE_CLEAN -eq 1 ]; then
 			echo " Cleaning kubernetes resouces to free up resources, may take time..."
-			../common/clean_kube.sh $KUBECONF 2>&1 /dev/null
+			../common/clean_kube.sh $KUBECONF 2>&1 > /dev/null
 			echo ""
 		fi
 	fi
@@ -2751,7 +2906,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"
@@ -2824,7 +2979,7 @@ __check_service_start() {
 	echo -ne " Container $BOLD${appname}$EBOLD starting${SAMELINE}"
 
 
-	pa_st=false
+	a1pmsst=false
 	echo -ne " Waiting for ${ENTITY} ${appname} service status...${SAMELINE}"
 	TSTART=$SECONDS
 	loop_ctr=0
@@ -2837,7 +2992,7 @@ __check_service_start() {
 			fi
 			echo -ne " Waiting for {ENTITY} $BOLD${appname}$EBOLD service status on ${3}, result: $result${SAMELINE}"
 	   		echo -ne " The ${ENTITY} $BOLD${appname}$EBOLD$GREEN is alive$EGREEN, responds to service status:$GREEN $result $EGREEN on ${url} after $(($SECONDS-$TSTART)) seconds"
-	   		pa_st=true
+	   		a1pmsst=true
 	   		break
 	 	else
 		 	TS_TMP=$SECONDS
@@ -2853,7 +3008,7 @@ __check_service_start() {
 		let loop_ctr=loop_ctr+1
 	done
 
-	if [ "$pa_st" = "false"  ]; then
+	if [ "$a1pmsst" = "false"  ]; then
 		((RES_CONF_FAIL++))
 		echo -e $RED" The ${ENTITY} ${appname} did not respond to service status on ${url} in $(($SECONDS-$TSTART)) seconds"$ERED
 		return 1
@@ -2885,7 +3040,7 @@ __check_container_logs() {
 
 	#tmp=$(docker ps | grep $appname)
 	tmp=$(docker ps -q --filter name=$appname) #get the container id
-	if [ -z "$tmp" ]; then  #Only check logs for running Policy Agent apps
+	if [ -z "$tmp" ]; then  #Only check logs for running A1PMS apps
 		echo " "$dispname" is not running, no check made"
 		return
 	fi
@@ -2963,6 +3118,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
@@ -2976,7 +3132,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=$?
@@ -3000,9 +3206,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