X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Fa1pms_api_functions.sh;fp=test%2Fcommon%2Fa1pms_api_functions.sh;h=e0650347dc0ca21652c1c484ac5787275938f495;hb=931e03479a552777755d805972428f8691c5dc1c;hp=9da4db54a25c02b3594fca84a6ead9db649623a0;hpb=81fddf01a0168c124775b38920e1532aed13fdfe;p=nonrtric.git

diff --git a/test/common/a1pms_api_functions.sh b/test/common/a1pms_api_functions.sh
index 9da4db54..e0650347 100644
--- a/test/common/a1pms_api_functions.sh
+++ b/test/common/a1pms_api_functions.sh
@@ -543,22 +543,16 @@ prepare_a1pms_config() {
 			echo $YELLOW"Warning: No rics found for the configuration"$EYELLOW
 		fi
 	else
+	    rics=$(docker ps --filter "name=$RIC_SIM_PREFIX" --filter "network=$DOCKER_SIM_NWNAME" --filter "label=a1sim" --filter "status=running" --format {{.Names}})
 		oranrics=$(docker ps --filter "name=$RIC_SIM_PREFIX" --filter "network=$DOCKER_SIM_NWNAME" --filter "label=orana1sim" --filter "status=running" --format {{.Names}})
-		if [ $? -ne 0 ] || [ -z "$oranrics" ]; then
-			echo -e $RED" FAIL - the names of the running RIC Simulator cannot be retrieved." $ERED
+
+		rics="$rics $oranrics"
+
+		if [ $? -ne 0 ] || [ -z "$rics" ]; then
+			echo -e $RED" FAIL - the names of the running RIC Simulator or ORAN RIC cannot be retrieved." $ERED
 			((RES_CONF_FAIL++))
-			return 1
+			exit 1
 		fi
-		
-		rics=$(docker ps --filter "name=$RIC_SIM_PREFIX" --filter "network=$DOCKER_SIM_NWNAME" --filter "label=a1sim" --filter "status=running" --format {{.Names}})
-		if [[ "$oranrics" == "" ]]; then	
-			if [ $? -ne 0 ] || [ -z "$rics" ]; then
-				echo -e $RED" FAIL - the names of the running RIC Simulator cannot be retrieved." $ERED
-				((RES_CONF_FAIL++))
-				return 1
-			fi
-		fi
-		rics="$rics $oranrics"
 	fi
 	cntr=0
 	for ric in $rics; do