X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Ftestcase_common.sh;h=0a2539131ff1a70ba14a5411513d18a75b9fd530;hb=c453edfb85fd5efe64f7b1a6cc4892f5d66cbc0c;hp=e1c90d6473cff483df9279078ac904c9696dd430;hpb=3deeefa87a81f8724520ce0e3a55d88a5d328204;p=nonrtric.git

diff --git a/test/common/testcase_common.sh b/test/common/testcase_common.sh
index e1c90d64..0a253913 100755
--- a/test/common/testcase_common.sh
+++ b/test/common/testcase_common.sh
@@ -666,7 +666,7 @@ while [ $paramerror -eq 0 ] && [ $foundparm -eq 0 ]; do
 	if [ $paramerror -eq 0 ]; then
 		if [ "$1" == "--print-stats" ]; then
 			PRINT_CURRENT_STATS=1
-			echo "Option set - Print stats"
+			echo "Option set - Print stats after every test-case and config"
 			shift;
 			foundparm=0
 		fi
@@ -756,6 +756,7 @@ fi
 
 echo ""
 # auto adding system apps
+__added_apps=""
 echo -e $BOLD"Auto adding system apps"$EBOLD
 if [ $RUNMODE == "KUBE" ]; then
 	INCLUDED_IMAGES=$INCLUDED_IMAGES" "$TESTENV_KUBE_SYSTEM_APPS
@@ -768,22 +769,39 @@ if [ ! -z "$TMP_APPS" ]; then
 	for iapp in "$TMP_APPS"; do
 		file_pointer=$(echo $iapp | tr '[:upper:]' '[:lower:]')
 		file_pointer="../common/"$file_pointer"_api_functions.sh"
-		echo " Auto-adding system app $iapp.  Sourcing $file_pointer"
+	    padded_iapp=$iapp
+		while [ ${#padded_iapp} -lt 16 ]; do
+			padded_iapp=$padded_iapp" "
+		done
+		echo " Auto-adding system app   $padded_iapp  Sourcing $file_pointer"
 		. $file_pointer
+		__added_apps=" $iapp "$__added_apps
 	done
 else
 	echo " None"
 fi
 
+if [ $RUNMODE == "KUBE" ]; then
+	TMP_APPS=$INCLUDED_IMAGES" "$KUBE_PRESTARTED_IMAGES
+else
+	TMP_APPS=$INCLUDED_IMAGES
+fi
+
 echo -e $BOLD"Auto adding included apps"$EBOLD
-	for iapp in $INCLUDED_IMAGES; do
-		file_pointer=$(echo $iapp | tr '[:upper:]' '[:lower:]')
-		file_pointer="../common/"$file_pointer"_api_functions.sh"
-		echo " Auto-adding included app $iapp.  Sourcing $file_pointer"
-		. $file_pointer
-		if [ ! -f "$file_pointer" ]; then
-			echo " Include file $file_pointer for app $iapp does not exist"
-			exit 1
+	for iapp in $TMP_APPS; do
+		if [[ "$__added_apps" != *"$iapp"* ]]; then
+			file_pointer=$(echo $iapp | tr '[:upper:]' '[:lower:]')
+			file_pointer="../common/"$file_pointer"_api_functions.sh"
+			padded_iapp=$iapp
+			while [ ${#padded_iapp} -lt 16 ]; do
+				padded_iapp=$padded_iapp" "
+			done
+			echo " Auto-adding included app $padded_iapp  Sourcing $file_pointer"
+			. $file_pointer
+			if [ ! -f "$file_pointer" ]; then
+				echo " Include file $file_pointer for app $iapp does not exist"
+				exit 1
+			fi
 		fi
 	done
 echo ""
@@ -1270,10 +1288,10 @@ setup_testenvironment() {
 				IMAGE_SUFFIX="none"
 			fi
 			# A function name is created from the app short name
-			# for example app short name 'ECS' -> produce the function
-			# name __ECS_imagesetup
+			# for example app short name 'ICS' -> produce the function
+			# name __ICS_imagesetup
 			# This function is called and is expected to exist in the imported
-			# file for the ecs test functions
+			# file for the ics test functions
 			# The resulting function impl will call '__check_and_create_image_var' function
 			# with appropriate parameters
 			# If the image suffix is none, then the component decides the suffix
@@ -2241,6 +2259,7 @@ __kube_clean_pvc() {
 	export PVC_CLEANER_NAMESPACE=$2
 	export PVC_CLEANER_CLAIMNAME=$3
 	export PVC_CLEANER_RM_PATH=$4
+	export PVC_CLEANER_APP_NAME
 	input_yaml=$SIM_GROUP"/"$PVC_CLEANER_COMPOSE_DIR"/"pvc-cleaner.yaml
 	output_yaml=$PWD/tmp/$2-pvc-cleaner.yaml