Test env updates

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

diff --git a/test/common/control_panel_api_functions.sh b/test/common/control_panel_api_functions.sh
index df8a4ad..4d96880 100644 (file)
--- a/test/common/control_panel_api_functions.sh
+++ b/test/common/control_panel_api_functions.sh
@@ -155,7 +155,7 @@ start_control_panel() {
 
                if [ $retcode_i -eq 0 ]; then
 
-                       echo -e " Creating $CP_APP_NAME app and expose service"
+                       echo -e " Creating $CONTROL_PANEL_APP_NAME app and expose service"
 
                        #Export all vars needed for service and deployment
                        export CONTROL_PANEL_APP_NAME
@@ -172,6 +172,9 @@ start_control_panel() {
 
                        export NGW_DOMAIN_NAME=$NRT_GATEWAY_APP_NAME.$KUBE_NONRTRIC_NAMESPACE.svc.cluster.local  # suffix needed for nginx name resolution
                        export NRT_GATEWAY_EXTERNAL_PORT
+                       export CONTROL_PANEL_PATH_POLICY_PREFIX
+                       export CONTROL_PANEL_PATH_ECS_PREFIX
+                       export CONTROL_PANEL_PATH_ECS_PREFIX2
 
                        export CP_NGINX_RESOLVER=$CONTROL_PANEL_NGINX_KUBE_RESOLVER
 
@@ -251,12 +254,15 @@ start_control_panel() {
                export CONTROL_PANEL_CONFIG_FILE
                export CONTROL_PANEL_DISPLAY_NAME
                export NGW_DOMAIN_NAME=$NRT_GATEWAY_APP_NAME
+               export CONTROL_PANEL_PATH_POLICY_PREFIX
+               export CONTROL_PANEL_PATH_ECS_PREFIX
+               export CONTROL_PANEL_PATH_ECS_PREFIX2
 
                export CP_NGINX_RESOLVER=$CONTROL_PANEL_NGINX_DOCKER_RESOLVER
 
                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},${ECS_EXTERNAL_SECURE_PORT},${POLICY_AGENT_DOMAIN_NAME},${ECS_DOMAIN_NAME}' < $1 > $dest_file
+               envsubst '${NGW_DOMAIN_NAME},${CP_NGINX_RESOLVER},${NRT_GATEWAY_EXTERNAL_PORT},${POLICY_AGENT_EXTERNAL_SECURE_PORT},${ECS_EXTERNAL_SECURE_PORT},${POLICY_AGENT_DOMAIN_NAME},${ECS_DOMAIN_NAME},${CONTROL_PANEL_PATH_POLICY_PREFIX},${CONTROL_PANEL_PATH_ECS_PREFIX} ,${CONTROL_PANEL_PATH_ECS_PREFIX2}' < $1 > $dest_file
 
                __start_container $CONTROL_PANEL_COMPOSE_DIR "" NODOCKERARGS 1 $CONTROL_PANEL_APP_NAME