X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Fhelmmanager_api_functions.sh;h=42d2bca3a84eb7e3bbfb761f120fd2b60c7f8e60;hb=f81090f8f5f1fd1a76bb9feab1f41f03252297c3;hp=455387a9a160c534f66df8dd7ae4d9a40b8def52;hpb=4dd321bda70fab4987c1ea7aa0dffc5e1eb74252;p=nonrtric.git

diff --git a/test/common/helmmanager_api_functions.sh b/test/common/helmmanager_api_functions.sh
index 455387a9..42d2bca3 100644
--- a/test/common/helmmanager_api_functions.sh
+++ b/test/common/helmmanager_api_functions.sh
@@ -57,7 +57,7 @@ __HELMMANAGER_kube_scale_zero() {
 # Scale kubernetes resources to zero and wait until this has been accomplished, if relevant. If not relevant to scale, then do no action.
 # This function is called for prestarted apps not managed by the test script.
 __HELMMANAGER_kube_scale_zero_and_wait() {
-	__kube_scale_and_wait_all_resources $KUBE_NONRTRIC_NAMESPACE app "$KUBE_NONRTRIC_NAMESPACE"-helmmanagerservice
+	__kube_scale_and_wait_all_resources $KUBE_NONRTRIC_NAMESPACE app "$KUBE_NONRTRIC_NAMESPACE"-"$HELM_MANAGER_APP_NAME"
 }
 
 # Delete all kube resouces for the app
@@ -71,7 +71,7 @@ __HELMMANAGER_kube_delete_all() {
 # args: <log-dir> <file-prexix>
 __HELMMANAGER_store_docker_logs() {
 	if [ $RUNMODE == "KUBE" ]; then
-		kubectl  logs -l "autotest=HELMMANAGER" -n $KUBE_NONRTRIC_NAMESPACE --tail=-1 > $1$2_helmmanager.log 2>&1
+		kubectl $KUBECONF  logs -l "autotest=HELMMANAGER" -n $KUBE_NONRTRIC_NAMESPACE --tail=-1 > $1$2_helmmanager.log 2>&1
 	else
 		docker logs $HELM_MANAGER_APP_NAME > $1$2_helmmanager.log 2>&1
 	fi
@@ -196,7 +196,7 @@ start_helm_manager() {
 		if [ $retcode_p -eq 0 ]; then
 			echo -e " Using existing $HELM_MANAGER_APP_NAME deployment and service"
 			echo " Setting $HELM_MANAGER_APP_NAME replicas=1"
-			__kube_scale deployment $HELM_MANAGER_APP_NAME $KUBE_NONRTRIC_NAMESPACE 1
+			__kube_scale sts $HELM_MANAGER_APP_NAME $KUBE_NONRTRIC_NAMESPACE 1
 		fi
 
 		if [ $retcode_i -eq 0 ]; then
@@ -517,7 +517,7 @@ helm_manager_api_exec_add_repo() {
 			return 1
 		fi
 	else
-		retmsg=$(kubectl exec -it $HELM_MANAGER_APP_NAME -n $KUBE_NONRTRIC_NAMESPACE -- helm repo add $1 $2)
+		retmsg=$(kubectl $KUBECONF exec -it $HELM_MANAGER_APP_NAME -n $KUBE_NONRTRIC_NAMESPACE -- helm repo add $1 $2)
 		retcode=$?
 		if [ $retcode -ne 0 ]; then
 			__log_conf_fail_general " Cannot add repo to helm, return code: $retcode, msg: $retmsg"