New test profile

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

diff --git a/test/common/cp_api_functions.sh b/test/common/cp_api_functions.sh
index 803184a..9d32c37 100644 (file)
--- a/test/common/cp_api_functions.sh
+++ b/test/common/cp_api_functions.sh
@@ -79,7 +79,7 @@ __CP_kube_delete_all() {
 # args: <log-dir> <file-prexix>
 __CP_store_docker_logs() {
        if [ $RUNMODE == "KUBE" ]; then
-               kubectl  logs -l "autotest=CP" -n $KUBE_NONRTRIC_NAMESPACE --tail=-1 > $1$2_control-panel.log 2>&1
+               kubectl $KUBECONF  logs -l "autotest=CP" -n $KUBE_NONRTRIC_NAMESPACE --tail=-1 > $1$2_control-panel.log 2>&1
        else
                docker logs $CONTROL_PANEL_APP_NAME > $1$2_control-panel.log 2>&1
        fi
@@ -172,14 +172,14 @@ __control_panel_export_vars() {
        export NRT_GATEWAY_APP_NAME
        export NRT_GATEWAY_EXTERNAL_PORT
 
-       export POLICY_AGENT_EXTERNAL_SECURE_PORT
+       export A1PMS_EXTERNAL_SECURE_PORT
        export ICS_EXTERNAL_SECURE_PORT
 
        if [ $RUNMODE == "KUBE" ]; then
                export NGW_DOMAIN_NAME=$NRT_GATEWAY_APP_NAME.$KUBE_NONRTRIC_NAMESPACE.svc.cluster.local  # suffix needed for nginx name resolution
                export CP_NGINX_RESOLVER=$CONTROL_PANEL_NGINX_KUBE_RESOLVER
        else
-               export POLICY_AGENT_DOMAIN_NAME=$POLICY_AGENT_APP_NAME
+               export A1PMS_DOMAIN_NAME=$A1PMS_APP_NAME
                export ICS_DOMAIN_NAME=$ICS_APP_NAME
 
                export NGW_DOMAIN_NAME=$NRT_GATEWAY_APP_NAME
@@ -276,7 +276,7 @@ start_control_panel() {
 
                dest_file=$SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_HOST_MNT_DIR/$CONTROL_PANEL_CONFIG_FILE
 
-               envsubst '${NGW_DOMAIN_NAME},${CP_NGINX_RESOLVER},${NRT_GATEWAY_EXTERNAL_PORT},${POLICY_AGENT_EXTERNAL_SECURE_PORT},${ICS_EXTERNAL_SECURE_PORT},${POLICY_AGENT_DOMAIN_NAME},${ICS_DOMAIN_NAME},${CONTROL_PANEL_PATH_POLICY_PREFIX},${CONTROL_PANEL_PATH_ICS_PREFIX} ,${CONTROL_PANEL_PATH_ICS_PREFIX2}' < $1 > $dest_file
+               envsubst '${NGW_DOMAIN_NAME},${CP_NGINX_RESOLVER},${NRT_GATEWAY_EXTERNAL_PORT},${A1PMS_EXTERNAL_SECURE_PORT},${ICS_EXTERNAL_SECURE_PORT},${A1PMS_DOMAIN_NAME},${ICS_DOMAIN_NAME},${CONTROL_PANEL_PATH_POLICY_PREFIX},${CONTROL_PANEL_PATH_ICS_PREFIX} ,${CONTROL_PANEL_PATH_ICS_PREFIX2}' < $1 > $dest_file
 
                __start_container $CONTROL_PANEL_COMPOSE_DIR "" NODOCKERARGS 1 $CONTROL_PANEL_APP_NAME