X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Fcp_api_functions.sh;h=9d32c370321bb916d50466eadbc8f5a079ae7249;hb=f81090f8f5f1fd1a76bb9feab1f41f03252297c3;hp=295e16ab6180e06b181a0adfa22e52b506494e85;hpb=79e37003f5c94bfe12d197727dd31334e50397a6;p=nonrtric.git

diff --git a/test/common/cp_api_functions.sh b/test/common/cp_api_functions.sh
index 295e16ab..9d32c370 100644
--- 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
@@ -104,6 +104,12 @@ __CP_statisics_setup() {
 	fi
 }
 
+# Check application requirements, e.g. helm, the the test needs. Exit 1 if req not satisfied
+# args: -
+__CP_test_requirements() {
+	:
+}
+
 #######################################################
 
 
@@ -129,7 +135,7 @@ use_control_panel_https() {
 # args: <protocol> <internal-port> <external-port>
 __control_panel_set_protocoll() {
 	echo -e $BOLD"$CONTROL_PANEL_DISPLAY_NAME protocol setting"$EBOLD
-	echo -e " Using $BOLD http $EBOLD towards $CONTROL_PANEL_DISPLAY_NAME"
+	echo -e " Using $BOLD $1 $EBOLD towards $CONTROL_PANEL_DISPLAY_NAME"
 
 	CP_SERVICE_PATH=$1"://"$CONTROL_PANEL_APP_NAME":"$2
 	if [ $RUNMODE == "KUBE" ]; then
@@ -160,21 +166,21 @@ __control_panel_export_vars() {
 	export CP_PROXY_CONFIGMAP_NAME=$CONTROL_PANEL_APP_NAME"-proxy"
 
 	export CONTROL_PANEL_PATH_POLICY_PREFIX
-	export CONTROL_PANEL_PATH_ECS_PREFIX
-	export CONTROL_PANEL_PATH_ECS_PREFIX2
+	export CONTROL_PANEL_PATH_ICS_PREFIX
+	export CONTROL_PANEL_PATH_ICS_PREFIX2
 
 	export NRT_GATEWAY_APP_NAME
 	export NRT_GATEWAY_EXTERNAL_PORT
 
-	export POLICY_AGENT_EXTERNAL_SECURE_PORT
-	export ECS_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 ECS_DOMAIN_NAME=$ECS_APP_NAME
+		export A1PMS_DOMAIN_NAME=$A1PMS_APP_NAME
+		export ICS_DOMAIN_NAME=$ICS_APP_NAME
 
 		export NGW_DOMAIN_NAME=$NRT_GATEWAY_APP_NAME
 		export CP_NGINX_RESOLVER=$CONTROL_PANEL_NGINX_DOCKER_RESOLVER
@@ -270,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},${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
+		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