X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Fagent_api_functions.sh;h=0c2e48a33337f40cf5235fc95cc94a903702fd5e;hb=7682abb5a05160aeb83004a4e56c36e302eded1e;hp=98a8b56a3e25fc877294e3b5804c54e417424d43;hpb=e0b665e3ff544bb78411bdc7f6b3ba2818fdeed4;p=nonrtric.git

diff --git a/test/common/agent_api_functions.sh b/test/common/agent_api_functions.sh
index 98a8b56a..0c2e48a3 100644
--- a/test/common/agent_api_functions.sh
+++ b/test/common/agent_api_functions.sh
@@ -19,6 +19,68 @@
 
 # This is a script that contains management and test functions for Policy Agent
 
+################ Test engine functions ################
+
+# Create the image var used during the test
+# arg: <image-tag-suffix> (selects staging, snapshot, release etc)
+# <image-tag-suffix> is present only for images with staging, snapshot,release tags
+__PA_imagesetup() {
+	__check_and_create_image_var PA "POLICY_AGENT_IMAGE" "POLICY_AGENT_IMAGE_BASE" "POLICY_AGENT_IMAGE_TAG" $1 "$POLICY_AGENT_DISPLAY_NAME"
+}
+
+# Pull image from remote repo or use locally built image
+# arg: <pull-policy-override> <pull-policy-original>
+# <pull-policy-override> Shall be used for images allowing overriding. For example use a local image when test is started to use released images
+# <pull-policy-original> Shall be used for images that does not allow overriding
+# Both var may contain: 'remote', 'remote-remove' or 'local'
+__PA_imagepull() {
+	__check_and_pull_image $1 "$POLICY_AGENT_DISPLAY_NAME" $POLICY_AGENT_APP_NAME POLICY_AGENT_IMAGE
+}
+
+# Build image (only for simulator or interfaces stubs owned by the test environment)
+# arg: <image-tag-suffix> (selects staging, snapshot, release etc)
+# <image-tag-suffix> is present only for images with staging, snapshot,release tags
+__PA_imagebuild() {
+	echo -e $RED" Image for app PA shall never be built"$ERED
+}
+
+# Generate a string for each included image using the app display name and a docker images format string
+# If a custom image repo is used then also the source image from the local repo is listed
+# arg: <docker-images-format-string> <file-to-append>
+__PA_image_data() {
+	echo -e "$POLICY_AGENT_DISPLAY_NAME\t$(docker images --format $1 $POLICY_AGENT_IMAGE)" >>   $2
+	if [ ! -z "$POLICY_AGENT_IMAGE_SOURCE" ]; then
+		echo -e "-- source image --\t$(docker images --format $1 $POLICY_AGENT_IMAGE_SOURCE)" >>   $2
+	fi
+}
+
+# Scale kubernetes resources to zero
+# All resources shall be ordered to be scaled to 0, if relevant. If not relevant to scale, then do no action.
+# This function is called for apps fully managed by the test script
+__PA_kube_scale_zero() {
+	__kube_scale_all_resources $KUBE_NONRTRIC_NAMESPACE autotest PA
+}
+
+# Scale kubernetes resources to zero and wait until this has been accomplished, if relevant. If not relevant to scale, then do no action.
+# This function is called for prestarted apps not managed by the test script.
+__PA_kube_scale_zero_and_wait() {
+	__kube_scale_and_wait_all_resources $KUBE_NONRTRIC_NAMESPACE app nonrtric-policymanagementservice
+}
+
+# Delete all kube resouces for the app
+# This function is called for apps managed by the test script.
+__PA_kube_delete_all() {
+	__kube_delete_all_resources $KUBE_NONRTRIC_NAMESPACE autotest PA
+}
+
+# Store docker logs
+# This function is called for apps managed by the test script.
+# args: <log-dir> <file-prexix>
+__PA_store_docker_logs() {
+	docker logs $POLICY_AGENT_APP_NAME > $1$2_policy-agent.log 2>&1
+}
+
+#######################################################
 
 ## Access to Policy agent
 # Host name may be changed if app started by kube
@@ -88,7 +150,8 @@ use_agent_dmaap_https() {
 }
 
 # Start the policy agent
-# args: (kube only) PROXY|NOPROXY <config-file> [ <data-file>]
+# args: (docker) PROXY|NOPROXY <config-file>
+# args: (kube) PROXY|NOPROXY <config-file> [ <data-file>]
 # (Function for test scripts)
 start_policy_agent() {
 	echo -e $BOLD"Starting $POLICY_AGENT_DISPLAY_NAME"$EBOLD
@@ -143,9 +206,15 @@ start_policy_agent() {
 			if [ $1 == "PROXY" ]; then
 				AGENT_HTTP_PROXY_CONFIG_PORT=$HTTP_PROXY_CONFIG_PORT  #Set if proxy is started
 				AGENT_HTTP_PROXY_CONFIG_HOST_NAME=$HTTP_PROXY_CONFIG_HOST_NAME #Set if proxy is started
+				if [ $AGENT_HTTP_PROXY_CONFIG_PORT -eq 0 ] || [ -z "$AGENT_HTTP_PROXY_CONFIG_HOST_NAME" ]; then
+					echo -e $YELLOW" Warning: HTTP PROXY will not be configured, proxy app not started"$EYELLOW
+				else
+					echo " Configured with http proxy"
+				fi
 			else
 				AGENT_HTTP_PROXY_CONFIG_PORT=0
 				AGENT_HTTP_PROXY_CONFIG_HOST_NAME=""
+				echo " Configured without http proxy"
 			fi
 			export AGENT_HTTP_PROXY_CONFIG_PORT
 			export AGENT_HTTP_PROXY_CONFIG_HOST_NAME
@@ -221,13 +290,20 @@ start_policy_agent() {
 		export POLICY_AGENT_CONFIG_MOUNT_PATH
 		export POLICY_AGENT_CONFIG_FILE
 		export POLICY_AGENT_PKG_NAME
+		export POLICY_AGENT_DISPLAY_NAME
 
 		if [ $1 == "PROXY" ]; then
 			AGENT_HTTP_PROXY_CONFIG_PORT=$HTTP_PROXY_CONFIG_PORT  #Set if proxy is started
 			AGENT_HTTP_PROXY_CONFIG_HOST_NAME=$HTTP_PROXY_CONFIG_HOST_NAME #Set if proxy is started
+			if [ $AGENT_HTTP_PROXY_CONFIG_PORT -eq 0 ] || [ -z "$AGENT_HTTP_PROXY_CONFIG_HOST_NAME" ]; then
+				echo -e $YELLOW" Warning: HTTP PROXY will not be configured, proxy app not started"$EYELLOW
+			else
+				echo " Configured with http proxy"
+			fi
 		else
 			AGENT_HTTP_PROXY_CONFIG_PORT=0
 			AGENT_HTTP_PROXY_CONFIG_HOST_NAME=""
+			echo " Configured without http proxy"
 		fi
 		export AGENT_HTTP_PROXY_CONFIG_PORT
 		export AGENT_HTTP_PROXY_CONFIG_HOST_NAME
@@ -236,7 +312,7 @@ start_policy_agent() {
 
 		envsubst < $2 > $dest_file
 
-		__start_container $POLICY_AGENT_COMPOSE_DIR NODOCKERARGS 1 $POLICY_AGENT_APP_NAME
+		__start_container $POLICY_AGENT_COMPOSE_DIR "" NODOCKERARGS 1 $POLICY_AGENT_APP_NAME
 
 		__check_service_start $POLICY_AGENT_APP_NAME $PA_PATH$POLICY_AGENT_ALIVE_URL
 	fi
@@ -244,12 +320,14 @@ start_policy_agent() {
 	return 0
 }
 
+# Load the the appl config for the agent into a config map
 agent_load_config() {
 	echo -e $BOLD"Agent - load config from "$EBOLD$1
 	data_json=$PWD/tmp/$POLICY_AGENT_DATA_FILE
 	cp $1 $data_json
 	output_yaml=$PWD/tmp/pa_cfd.yaml
 	__kube_create_configmap $POLICY_AGENT_APP_NAME"-data" $KUBE_NONRTRIC_NAMESPACE autotest PA $data_json $output_yaml
+	echo ""
 }
 
 
@@ -295,6 +373,13 @@ use_agent_retries() {
 	return
 }
 
+# Check the agent logs for WARNINGs and ERRORs
+# args: -
+# (Function for test scripts)
+check_policy_agent_logs() {
+	__check_container_logs "Policy Agent" $POLICY_AGENT_APP_NAME $POLICY_AGENT_LOGPATH WARN ERR
+}
+
 #########################################################
 #### Test case functions A1 Policy management service
 #########################################################
@@ -308,7 +393,7 @@ api_equal() {
 	if [ $# -eq 2 ] || [ $# -eq 3 ]; then
 		if [[ $1 == "json:"* ]]; then
 			if [ "$PMS_VERSION" == "V2" ]; then
-				__var_test "Policy Agent" $PA_PATH"/v2/" $1 "=" $2 $3
+				__var_test "Policy Agent" $PA_PATH$PMS_API_PREFIX"/v2/" $1 "=" $2 $3
 			else
 				__var_test "Policy Agent" $PA_PATH"/" $1 "=" $2 $3
 			fi
@@ -819,7 +904,7 @@ api_put_policy_parallel() {
 	pids=$1; shift;
 
 	#if [ $PA_ADAPTER != $RESTBASE ] && [ $PA_ADAPTER != $RESTBASE_SECURE ]; then
-	if [ $__ADAPTER_TYPE != "REST" ]; then
+	if [ $PA_ADAPTER_TYPE != "REST" ]; then
 		echo " Info - api_put_policy_parallel uses only the agent REST interface - create over dmaap in parallel is not supported"
 		echo " Info - will execute over agent REST"
 	fi
@@ -827,7 +912,7 @@ api_put_policy_parallel() {
 		if [ $serv == "NOSERVICE" ]; then
 			serv=""
 		fi
-		query="/v2/policies"
+		query="$PMS_API_PREFIX/v2/policies"
 	else
 		if [ $serv == "NOSERVICE" ]; then
 			serv=""
@@ -845,6 +930,13 @@ api_put_policy_parallel() {
 
 	urlbase=${PA_ADAPTER}${query}
 
+	httpproxy="NOPROXY"
+	if [ $RUNMODE == "KUBE" ]; then
+		if [ ! -z "$KUBE_PROXY_PATH" ]; then
+			httpproxy=$KUBE_PROXY_PATH
+		fi
+	fi
+
 	for ((i=1; i<=$pids; i++))
 	do
 		uuid=$UUID
@@ -853,9 +945,9 @@ api_put_policy_parallel() {
 		fi
 		echo "" > "./tmp/.pid${i}.res.txt"
 		if [ "$PMS_VERSION" == "V2" ]; then
-			echo $resp_code $urlbase $ric_base $num_rics $uuid $start_id $serv $type $transient $noti $template $count $pids $i > "./tmp/.pid${i}.txt"
+			echo $resp_code $urlbase $ric_base $num_rics $uuid $start_id $serv $type $transient $noti $template $count $pids $i $httpproxy > "./tmp/.pid${i}.txt"
 		else
-			echo $resp_code $urlbase $ric_base $num_rics $uuid $start_id $template $count $pids $i > "./tmp/.pid${i}.txt"
+			echo $resp_code $urlbase $ric_base $num_rics $uuid $start_id $template $count $pids $i $httpproxy > "./tmp/.pid${i}.txt"
 		fi
 		echo $i
 	done  | xargs -n 1 -I{} -P $pids bash -c '{
@@ -1020,19 +1112,26 @@ api_delete_policy_parallel() {
 	pids=$1; shift;
 
 	#if [ $PA_ADAPTER != $RESTBASE ] && [ $PA_ADAPTER != $RESTBASE_SECURE ]; then
-	if [ $__ADAPTER_TYPE != "REST" ]; then
+	if [ $PA_ADAPTER_TYPE != "REST" ]; then
 		echo " Info - api_delete_policy_parallel uses only the agent REST interface - create over dmaap in parallel is not supported"
 		echo " Info - will execute over agent REST"
 	fi
 
 	if [ "$PMS_VERSION" == "V2" ]; then
-		query="/v2/policies/"
+		query="$PMS_API_PREFIX/v2/policies/"
 	else
 		query="/policy"
 	fi
 
 	urlbase=${PA_ADAPTER}${query}
 
+	httpproxy="NOPROXY"
+	if [ $RUNMODE == "KUBE" ]; then
+		if [ ! -z "$KUBE_PROXY_PATH" ]; then
+			httpproxy=$KUBE_PROXY_PATH
+		fi
+	fi
+
 	for ((i=1; i<=$pids; i++))
 	do
 		uuid=$UUID
@@ -1040,7 +1139,7 @@ api_delete_policy_parallel() {
 			uuid="NOUUID"
 		fi
 		echo "" > "./tmp/.pid${i}.del.res.txt"
-		echo $resp_code $urlbase $num_rics $uuid $start_id $count $pids $i > "./tmp/.pid${i}.del.txt"
+		echo $resp_code $urlbase $num_rics $uuid $start_id $count $pids $i $httpproxy> "./tmp/.pid${i}.del.txt"
 		echo $i
 	done  | xargs -n 1 -I{} -P $pids bash -c '{
 		arg=$(echo {})