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=84ffd4a403baee1b7aa86f9986f0c1659a5a0881;hp=df8a4adfb489268230c4f19b6b3ad1812f8e167b;hpb=483ee33ac3de88385c0eeb3f1ecf3a1bb760db54;p=nonrtric.git

diff --git a/test/common/control_panel_api_functions.sh b/test/common/control_panel_api_functions.sh
index df8a4adf..4d96880b 100644
--- 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