X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Fcr_api_functions.sh;h=a29d010f8a09cbcc63e3ce17380e5bf9bf01bbef;hb=refs%2Fchanges%2F62%2F8262%2F1;hp=a12b69e9ebc588647f634cb26cf358371cf9f25d;hpb=542d2dbfd8df1fcb011fea3d69d539c5c5fe3667;p=nonrtric.git

diff --git a/test/common/cr_api_functions.sh b/test/common/cr_api_functions.sh
index a12b69e9..a29d010f 100644
--- a/test/common/cr_api_functions.sh
+++ b/test/common/cr_api_functions.sh
@@ -94,8 +94,8 @@ __CR_kube_delete_all() {
 # args: <log-dir> <file-prexix>
 __CR_store_docker_logs() {
 	if [ $RUNMODE == "KUBE" ]; then
-		for podname in $(kubectl get pods -n $KUBE_SIM_NAMESPACE -l "autotest=CR" -o custom-columns=":metadata.name"); do
-			kubectl logs -n $KUBE_SIM_NAMESPACE $podname --tail=-1 > $1$2_$podname.log 2>&1
+		for podname in $(kubectl $KUBECONF get pods -n $KUBE_SIM_NAMESPACE -l "autotest=CR" -o custom-columns=":metadata.name"); do
+			kubectl $KUBECONF logs -n $KUBE_SIM_NAMESPACE $podname --tail=-1 > $1$2_$podname.log 2>&1
 		done
 	else
 		crs=$(docker ps --filter "name=$CR_APP_NAME" --filter "network=$DOCKER_SIM_NWNAME" --filter "status=running" --format {{.Names}})
@@ -122,7 +122,7 @@ __CR_statisics_setup() {
 			CR_INSTANCE_KUBE=$(($CR_INSTANCE-1))
 			echo -n " CR-$CR_INSTANCE_KUBE $CR_APP_NAME-$CR_INSTANCE_KUBE $KUBE_SIM_NAMESPACE "
 		else
-			if [ $DOCKER_COMPOSE_VERION == "V1" ]; then
+			if [ $DOCKER_COMPOSE_VERSION == "V1" ]; then
 				echo -n " CR_$CR_INSTANCE ${CR_APP_NAME}_cr_$CR_INSTANCE "
 			else
 				echo -n " CR_$CR_INSTANCE ${CR_APP_NAME}-cr-$CR_INSTANCE "
@@ -171,7 +171,7 @@ __cr_set_protocoll() {
 	for ((CR_INSTANCE=0; CR_INSTANCE<$MAX_CR_APP_COUNT; CR_INSTANCE++ )); do
 		CR_DOCKER_INSTANCE=$(($CR_INSTANCE+1))
 		# CR_SERVICE_PATH is the base path to cr
-		if [ $DOCKER_COMPOSE_VERION == "V1" ]; then
+		if [ $DOCKER_COMPOSE_VERSION == "V1" ]; then
 			__CR_SERVICE_PATH=$1"://"$CR_APP_NAME"_cr_"${CR_DOCKER_INSTANCE}":"$2  # docker access, container->container and script->container via proxy
 		else
 			__CR_SERVICE_PATH=$1"://"$CR_APP_NAME"-cr-"${CR_DOCKER_INSTANCE}":"$2  # docker access, container->container and script->container via proxy
@@ -299,7 +299,7 @@ start_cr() {
 		app_data=""
 		cntr=1
 		while [ $cntr -le $CR_APP_COUNT ]; do
-			if [ $DOCKER_COMPOSE_VERION == "V1" ]; then
+			if [ $DOCKER_COMPOSE_VERSION == "V1" ]; then
 				app=$CR_APP_NAME"_cr_"$cntr
 			else
 				app=$CR_APP_NAME"-cr-"$cntr
@@ -315,7 +315,7 @@ start_cr() {
 		cntr=1   #Counter for docker instance, starts on 1
 		cntr2=0  #Couter for env var name, starts with 0 to be compablible with kube
 		while [ $cntr -le $CR_APP_COUNT ]; do
-			if [ $DOCKER_COMPOSE_VERION == "V1" ]; then
+			if [ $DOCKER_COMPOSE_VERSION == "V1" ]; then
 				app=$CR_APP_NAME"_cr_"$cntr
 			else
 				app=$CR_APP_NAME"-cr-"$cntr
@@ -454,13 +454,13 @@ cr_delay_callback() {
 	return 0
 }
 
-# CR API: Check the contents of all current ric sync events for one id from PMS
+# CR API: Check the contents of all current ric sync events for one id from A1PMS
 # <response-code> <cr-path-id> <id> [ EMPTY | ( <ric-id> )+ ]
 # (Function for test scripts)
 cr_api_check_all_sync_events() {
 	__log_test_start $@
 
-	if [ "$PMS_VERSION" != "V2" ]; then
+	if [ "$A1PMS_VERSION" != "V2" ]; then
 		__log_test_fail_not_supported
 		return 1
 	fi