X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Ftestcase_common.sh;h=d8b359b365b692fa5a576dd661b950dceea32cfb;hb=05bfe48a83b1d7bf719eb94444ffc1377b998273;hp=b47413a63700fda1d596bdf203ab976c6efab71d;hpb=79e37003f5c94bfe12d197727dd31334e50397a6;p=nonrtric.git

diff --git a/test/common/testcase_common.sh b/test/common/testcase_common.sh
index b47413a6..d8b359b3 100755
--- a/test/common/testcase_common.sh
+++ b/test/common/testcase_common.sh
@@ -128,6 +128,11 @@ STOP_AT_ERROR=0
 # Applies only to images defined in the test-env files with image names and tags defined as XXXX_RELEASE
 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"
+
 # Function to indent cmd output with one space
 indent1() { sed 's/^/ /'; }
 
@@ -661,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
@@ -774,7 +779,11 @@ 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"
+		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"
@@ -783,34 +792,44 @@ echo -e $BOLD"Auto adding included apps"$EBOLD
 	done
 echo ""
 
+echo -e $BOLD"Test environment info"$EBOLD
 
 # Check needed installed sw
+
+tmp=$(which bash)
+if [ $? -ne 0 ] || [ -z "$tmp" ]; then
+	echo -e $RED"bash is required to run the test environment, pls install"$ERED
+	exit 1
+fi
+echo " bash is installed and using version:"
+echo "$(bash --version)" | indent2
+
 tmp=$(which python3)
-if [ $? -ne 0 ] || [ -z tmp ]; then
+if [ $? -ne 0 ] || [ -z "$tmp" ]; then
 	echo -e $RED"python3 is required to run the test environment, pls install"$ERED
 	exit 1
 fi
+echo " python3 is installed and using version: $(python3 --version)"
+
 tmp=$(which docker)
-if [ $? -ne 0 ] || [ -z tmp ]; then
+if [ $? -ne 0 ] || [ -z "$tmp" ]; then
 	echo -e $RED"docker is required to run the test environment, pls install"$ERED
 	exit 1
 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 [ $? -ne 0 ] || [ -z "$tmp" ]; then
 	if [ $RUNMODE == "DOCKER" ]; then
 		echo -e $RED"docker-compose is required to run the test environment, pls install"$ERED
 		exit 1
 	fi
 fi
-if [ $RUNMODE == "DOCKER" ]; then
-	tmp=$(docker-compose version | grep -i 'docker' | grep -i 'compose' | grep -i 'version')
-	if [[ "$tmp" == *'v2'* ]]; then
-		echo -e $RED"docker-compose is using docker-compose version 2"$ERED
-		echo -e $RED"The test environment only support version 1"$ERED
-		echo -e $RED"Disable version 2 by cmd 'docker-compose disable-v2' and re-run the script "$ERED
-		exit 1
-	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)
@@ -821,6 +840,8 @@ if [ $? -ne 0 ] || [ -z tmp ]; then
 	fi
 else
 	if [ $RUNMODE == "KUBE" ]; then
+		echo " kubectl is installed and using versions:"
+		echo $(kubectl version --short=true) | indent2
 		res=$(kubectl cluster-info 2>&1)
 		if [ $? -ne 0 ]; then
 			echo -e "$BOLD$RED############################################# $ERED$EBOLD"
@@ -852,6 +873,8 @@ else
 	fi
 fi
 
+echo ""
+
 echo -e $BOLD"Checking configured image setting for this test case"$EBOLD
 
 #Temp var to check for image variable name errors
@@ -1251,10 +1274,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
@@ -1707,6 +1730,10 @@ __clean_containers() {
 	for imagename in $APP_SHORT_NAMES; do
 		docker ps -a --filter "label=nrttest_app=$imagename"  --filter "network=$DOCKER_SIM_NWNAME" --format ' {{.Label "nrttest_dp"}}\n{{.Label "nrttest_app"}}\n{{.Names}}' >> $running_contr_file
 	done
+	running_contr_file_empty="No docker containers running, started by previous test execution"
+	if [ -s $running_contr_file ]; then
+		running_contr_file_empty=""
+	fi
 
 	# Kill all containers started by the test env - to speed up shut down
     docker kill $(docker ps -a  --filter "label=nrttest_app" --format '{{.Names}}') &> /dev/null
@@ -1754,37 +1781,41 @@ __clean_containers() {
 		tab_heading3="$tab_heading3"" "
 	done
 
-	echo " $tab_heading1$tab_heading2$tab_heading3"" Actions"
-	cntr=0
-	while read p; do
-		if (( $cntr % 3 == 0 ));then
-			row=""
-			heading=$p
-			heading_len=$tab_heading1_len
-		fi
-		if (( $cntr % 3 == 1));then
-			heading=$p
-			heading_len=$tab_heading2_len
-		fi
-		if (( $cntr % 3 == 2));then
-			contr=$p
-			heading=$p
-			heading_len=$tab_heading3_len
-		fi
-		while (( ${#heading} < $heading_len)); do
-			heading="$heading"" "
-		done
-		row=$row$heading
-		if (( $cntr % 3 == 2));then
-			echo -ne $row$SAMELINE
-			echo -ne " $row ${GREEN}stopping...${EGREEN}${SAMELINE}"
-			docker stop $(docker ps -qa --filter name=${contr} --filter network=$DOCKER_SIM_NWNAME) &> /dev/null
-			echo -ne " $row ${GREEN}stopped removing...${EGREEN}${SAMELINE}"
-			docker rm --force $(docker ps -qa --filter name=${contr} --filter network=$DOCKER_SIM_NWNAME) &> /dev/null
-			echo -e  " $row ${GREEN}stopped removed     ${EGREEN}"
-		fi
-		let cntr=cntr+1
-	done <$running_contr_file
+	if [ ! -z "$running_contr_file_empty" ]; then
+		echo $running_contr_file_empty | indent1
+	else
+		echo " $tab_heading1$tab_heading2$tab_heading3"" Actions"
+		cntr=0
+		while read p; do
+			if (( $cntr % 3 == 0 ));then
+				row=""
+				heading=$p
+				heading_len=$tab_heading1_len
+			fi
+			if (( $cntr % 3 == 1));then
+				heading=$p
+				heading_len=$tab_heading2_len
+			fi
+			if (( $cntr % 3 == 2));then
+				contr=$p
+				heading=$p
+				heading_len=$tab_heading3_len
+			fi
+			while (( ${#heading} < $heading_len)); do
+				heading="$heading"" "
+			done
+			row=$row$heading
+			if (( $cntr % 3 == 2));then
+				echo -ne $row$SAMELINE
+				echo -ne " $row ${GREEN}stopping...${EGREEN}${SAMELINE}"
+				docker stop $(docker ps -qa --filter name=${contr} --filter network=$DOCKER_SIM_NWNAME) &> /dev/null
+				echo -ne " $row ${GREEN}stopped removing...${EGREEN}${SAMELINE}"
+				docker rm --force $(docker ps -qa --filter name=${contr} --filter network=$DOCKER_SIM_NWNAME) &> /dev/null
+				echo -e  " $row ${GREEN}stopped removed     ${EGREEN}"
+			fi
+			let cntr=cntr+1
+		done <$running_contr_file
+	fi
 
 	echo ""