X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Fmr_api_functions.sh;h=977c3da8c8425829d84a257c3d277470de4fe868;hb=refs%2Fchanges%2F33%2F9733%2F1;hp=122b4124c1225a6bdc08eb8221fedbcd9a4e6e1b;hpb=e60d04ec982c4ccb833226624ff5c3e3f311097a;p=nonrtric.git

diff --git a/test/common/mr_api_functions.sh b/test/common/mr_api_functions.sh
index 122b4124..977c3da8 100755
--- a/test/common/mr_api_functions.sh
+++ b/test/common/mr_api_functions.sh
@@ -158,7 +158,7 @@ __DMAAPMR_kube_delete_all() {
 # args: <log-dir> <file-prexix>
 __MR_store_docker_logs() {
 	if [ $RUNMODE == "KUBE" ]; then
-		kubectl  logs -l "autotest=MR" -n $KUBE_ONAP_NAMESPACE --tail=-1 > $1$2_mr_stub.log 2>&1
+		kubectl $KUBECONF  logs -l "autotest=MR" -n $KUBE_ONAP_NAMESPACE --tail=-1 > $1$2_mr_stub.log 2>&1
 	else
 		docker logs $MR_STUB_APP_NAME > $1$2_mr_stub.log 2>&1
 	fi
@@ -169,8 +169,8 @@ __MR_store_docker_logs() {
 # args: <log-dir> <file-prexix>
 __DMAAPMR_store_docker_logs() {
 	if [ $RUNMODE == "KUBE" ]; then
-		for podname in $(kubectl get pods -n $KUBE_ONAP_NAMESPACE -l "autotest=DMAAPMR" -o custom-columns=":metadata.name"); do
-			kubectl logs -n $KUBE_ONAP_NAMESPACE $podname --tail=-1 > $1$2_$podname.log 2>&1
+		for podname in $(kubectl $KUBECONF get pods -n $KUBE_ONAP_NAMESPACE -l "autotest=DMAAPMR" -o custom-columns=":metadata.name"); do
+			kubectl $KUBECONF logs -n $KUBE_ONAP_NAMESPACE $podname --tail=-1 > $1$2_$podname.log 2>&1
 		done
 	else
 		docker logs $MR_DMAAP_APP_NAME > $1$2_mr.log 2>&1
@@ -316,7 +316,7 @@ __mr_set_protocoll() {
 		MR_ZOOKEEPER_SERVICE_PATH=$MR_ZOOKEEPER_APP_NAME":"$MR_ZOOKEEPER_PORT
 	fi
 
-	# For directing calls from script to e.g.PMS via message rounter
+	# For directing calls from script to e.g.A1PMS via message rounter
 	# These cases shall always go though the  mr-stub
 	MR_ADAPTER_HTTP="http://"$MR_STUB_APP_NAME":"$2
 	MR_ADAPTER_HTTPS="https://"$MR_STUB_APP_NAME":"$4
@@ -345,7 +345,7 @@ __mr_set_protocoll() {
 			MR_ZOOKEEPER_SERVICE_PATH=$MR_ZOOKEEPER_APP_NAME"."$KUBE_ONAP_NAMESPACE":"$MR_ZOOKEEPER_PORT
 		fi
 
-		# For directing calls from script to e.g.PMS, via message rounter
+		# For directing calls from script to e.g.A1PMS, via message rounter
 		# These calls shall always go though the  mr-stub
 		MR_ADAPTER_HTTP="http://"$MR_STUB_APP_NAME.$KUBE_ONAP_NAMESPACE":"$3
 		MR_ADAPTER_HTTPS="https://"$MR_STUB_APP_NAME.$KUBE_ONAP_NAMESPACE":"$5