X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Fkubeproxy_api_functions.sh;h=2b1caa1b6b56f52a3ea121f9b9dc948a01110a27;hb=900ceda884f7cd92be20bfb1fb3a424073dc4316;hp=c66e63c81a8923d35f7a9f1181749b8d4f69c8d0;hpb=145762b23535cdffece56c661d9fc0c073cc911e;p=nonrtric.git diff --git a/test/common/kubeproxy_api_functions.sh b/test/common/kubeproxy_api_functions.sh index c66e63c8..2b1caa1b 100644 --- a/test/common/kubeproxy_api_functions.sh +++ b/test/common/kubeproxy_api_functions.sh @@ -17,8 +17,8 @@ # ============LICENSE_END================================================= # -# This is a script that contains container/service managemnt functions for Kube Http Proxy -# This http proxy is to provide full access for the test script to all adressable kube object in a clister +# This is a script that contains container/service management functions for Kube Http Proxy +# This http proxy is to provide full access for the test script to all addressable kube object in a cluster ################ Test engine functions ################ @@ -26,7 +26,7 @@ # arg: (selects staging, snapshot, release etc) # is present only for images with staging, snapshot,release tags __KUBEPROXY_imagesetup() { - __check_and_create_image_var KUBEPROXY "KUBE_PROXY_IMAGE" "KUBE_PROXY_IMAGE_BASE" "KUBE_PROXY_IMAGE_TAG" LOCAL "$KUBE_PROXY_DISPLAY_NAME" + __check_and_create_image_var KUBEPROXY "KUBE_PROXY_IMAGE" "KUBE_PROXY_IMAGE_BASE" "KUBE_PROXY_IMAGE_TAG" LOCAL "$KUBE_PROXY_DISPLAY_NAME" $IMAGE_TARGET_PLATFORM_IMG_TAG } # Pull image from remote repo or use locally built image @@ -44,7 +44,7 @@ __KUBEPROXY_imagepull() { __KUBEPROXY_imagebuild() { cd ../http-https-proxy echo " Building KUBEPROXY - $KUBE_PROXY_DISPLAY_NAME - image: $KUBE_PROXY_IMAGE" - docker build --build-arg NEXUS_PROXY_REPO=$NEXUS_PROXY_REPO -t $KUBE_PROXY_IMAGE . &> .dockererr + docker build $IMAGE_TARGET_PLATFORM_CMD_PARAM --build-arg NEXUS_PROXY_REPO=$NEXUS_PROXY_REPO -t $KUBE_PROXY_IMAGE . &> .dockererr if [ $? -eq 0 ]; then echo -e $GREEN" Build Ok"$EGREEN __retag_and_push_image KUBE_PROXY_IMAGE @@ -78,12 +78,12 @@ __KUBEPROXY_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. +# This function is called for pre-started apps not managed by the test script. __KUBEPROXY_kube_scale_zero_and_wait() { echo -e $RED" KUBEPROXY app is not scaled in this state"$ERED } -# Delete all kube resouces for the app +# Delete all kube resources for the app # This function is called for apps managed by the test script. __KUBEPROXY_kube_delete_all() { __kube_delete_all_resources $KUBE_SIM_NAMESPACE autotest KUBEPROXY @@ -91,7 +91,7 @@ __KUBEPROXY_kube_delete_all() { # Store docker logs # This function is called for apps managed by the test script. -# args: +# args: __KUBEPROXY_store_docker_logs() { if [ $RUNMODE == "KUBE" ]; then kubectl $KUBECONF logs -l "autotest=KUBEPROXY" -n $KUBE_SIM_NAMESPACE --tail=-1 > $1$2_kubeproxy.log 2>&1 @@ -107,11 +107,11 @@ __KUBEPROXY_initial_setup() { use_kube_proxy_http } -# Set app short-name, app name and namespace for logging runtime statistics of kubernets pods or docker containers +# Set app short-name, app name and namespace for logging runtime statistics of kubernetes pods or docker containers # For docker, the namespace shall be excluded -# This function is called for apps managed by the test script as well as for prestarted apps. +# This function is called for apps managed by the test script as well as for pre-started apps. # args: - -__KUBEPROXY_statisics_setup() { +__KUBEPROXY_statistics_setup() { if [ $RUNMODE == "KUBE" ]; then echo "KUBEPROXXY $KUBE_PROXY_APP_NAME $KUBE_SIM_NAMESPACE" else @@ -202,7 +202,7 @@ start_kube_proxy() { __check_included_image "KUBEPROXY" retcode_i=$? - # Check if app shall only be used by the testscipt + # Check if app shall only be used by the test script __check_prestarted_image "KUBEPROXY" retcode_p=$?