X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Fcontrol_panel_api_functions.sh;h=4d96880b47937965ee47bc33b06bf34bec70f474;hb=83a750fdb5861f39bcb636c672e2eea4a6ec891b;hp=8c0b41f5ea09db9cbaca08a76c900bf9e8635ceb;hpb=330db2ab9b62777a96450527eb1978e15986a0d4;p=nonrtric.git diff --git a/test/common/control_panel_api_functions.sh b/test/common/control_panel_api_functions.sh index 8c0b41f5..4d96880b 100644 --- a/test/common/control_panel_api_functions.sh +++ b/test/common/control_panel_api_functions.sh @@ -174,6 +174,7 @@ start_control_panel() { 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 @@ -255,12 +256,13 @@ start_control_panel() { 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},${CONTROL_PANEL_PATH_POLICY_PREFIX},${CONTROL_PANEL_PATH_ECS_PREFIX}' < $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