ICS tests with istio and JWTs

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

diff --git a/test/common/ricsim_api_functions.sh b/test/common/ricsim_api_functions.sh
index f433cad..b8af532 100644 (file)
--- a/test/common/ricsim_api_functions.sh
+++ b/test/common/ricsim_api_functions.sh
@@ -72,8 +72,8 @@ __RICSIM_kube_delete_all() {
 # args: <log-dir> <file-prexix>
 __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