X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Fcp_api_functions.sh;h=9d32c370321bb916d50466eadbc8f5a079ae7249;hb=refs%2Fchanges%2F28%2F10128%2F1;hp=992fd68ab188902848ffdee3e511fcdf7c2af724;hpb=534a1fe8136ed8d72615707008bdd6061d1df2fe;p=nonrtric.git

diff --git a/test/common/cp_api_functions.sh b/test/common/cp_api_functions.sh
index 992fd68a..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() {
+	:
+}
+
 #######################################################
 
 
@@ -166,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
@@ -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},${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