Creating an FTC for RICMEDIATOR

[nonrtric.git] / test / common / a1pms_api_functions.sh

diff --git a/test/common/a1pms_api_functions.sh b/test/common/a1pms_api_functions.sh
index bdf363e..9da4db5 100644 (file)
--- a/test/common/a1pms_api_functions.sh
+++ b/test/common/a1pms_api_functions.sh
@@ -543,18 +543,21 @@ 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}})
-               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
                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 "$rics" ]; then
+               if [ $? -ne 0 ] || [ -z "$oranrics" ]; then
                        echo -e $RED" FAIL - the names of the running RIC Simulator cannot be retrieved." $ERED
                        ((RES_CONF_FAIL++))
                        return 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