X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Fcp_api_functions.sh;fp=test%2Fcommon%2Fcp_api_functions.sh;h=9d32c370321bb916d50466eadbc8f5a079ae7249;hb=d2aeca8843fe3ffca2e73dec5b64daeef0dda938;hp=f9f689a7cd121dc0012d84f4bfab3b446d3a3fa2;hpb=c8f92e94bb2638aa66a1d7c2ba63375bbfcdc8c9;p=nonrtric.git diff --git a/test/common/cp_api_functions.sh b/test/common/cp_api_functions.sh index f9f689a7..9d32c370 100644 --- a/test/common/cp_api_functions.sh +++ b/test/common/cp_api_functions.sh @@ -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