X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Fricsim_api_functions.sh;h=b8af5323b4f33fb3c2cfeedd40f58608a081276e;hb=93a604b82da289316908c9bfff8380877aaf89e5;hp=2953eb0a8424d062ff7d394404e50f633ee31a1a;hpb=1b732d17463fad74721391b3a87a2a12172da63c;p=nonrtric.git diff --git a/test/common/ricsim_api_functions.sh b/test/common/ricsim_api_functions.sh index 2953eb0a..b8af5323 100644 --- a/test/common/ricsim_api_functions.sh +++ b/test/common/ricsim_api_functions.sh @@ -72,8 +72,8 @@ __RICSIM_kube_delete_all() { # args: __RICSIM_store_docker_logs() { if [ $RUNMODE == "KUBE" ]; then - for podname in $(kubectl get pods -n $KUBE_A1SIM_NAMESPACE -l "autotest=RICSIM" -o custom-columns=":metadata.name"); do - kubectl logs -n $KUBE_A1SIM_NAMESPACE $podname --tail=-1 > $1$2_$podname.log 2>&1 + for podname in $(kubectl $KUBECONF get pods -n $KUBE_A1SIM_NAMESPACE -l "autotest=RICSIM" -o custom-columns=":metadata.name"); do + kubectl $KUBECONF logs -n $KUBE_A1SIM_NAMESPACE $podname --tail=-1 > $1$2_$podname.log 2>&1 done else @@ -241,7 +241,7 @@ start_ric_simulators() { export RIC_SIM_INTERNAL_PORT export RIC_SIM_INTERNAL_SECURE_PORT - echo -e " Creating $POLICY_AGENT_APP_NAME app and expose service" + echo -e " Creating $RIC_SIM_PREFIX app and expose service" #Check if nonrtric namespace exists, if not create it __kube_create_namespace $KUBE_A1SIM_NAMESPACE @@ -253,7 +253,7 @@ start_ric_simulators() { # Create app input_yaml=$SIM_GROUP"/"$RIC_SIM_COMPOSE_DIR"/"app.yaml - output_yaml=$PWD/tmp/pa_${1}_app.yaml + output_yaml=$PWD/tmp/ric_${1}_app.yaml __kube_create_instance app $RIC_SIM_SET_NAME $input_yaml $output_yaml #Using only instance from index 1 to keep compatability with docker @@ -286,7 +286,7 @@ start_ric_simulators() { export DOCKER_SIM_NWNAME export RIC_SIM_DISPLAY_NAME - docker_args="--no-recreate --scale $RICSIM_COMPOSE_SERVICE_NAME=$2" + docker_args=" --scale $RICSIM_COMPOSE_SERVICE_NAME=$2" #Create a list of contsiner names #Will be __