X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Frc_api_functions.sh;h=bb085d67db9008e17db1e41445f6fcc3cf750568;hb=HEAD;hp=050ddd1afeb92b2e80af56532339db5ce303d110;hpb=712794e78f2c8f1b2aa57ef687deed6bc47c6b10;p=nonrtric.git diff --git a/test/common/rc_api_functions.sh b/test/common/rc_api_functions.sh index 050ddd1a..bb085d67 100644 --- a/test/common/rc_api_functions.sh +++ b/test/common/rc_api_functions.sh @@ -17,7 +17,7 @@ # ============LICENSE_END================================================= # -# This is a script that contains container/service managemnt functions test functions for RAPP Catalogue API +# This is a script that contains container/service management functions test functions for RAPP Catalogue API ################ Test engine functions ################ @@ -25,7 +25,7 @@ # arg: [] (selects staging, snapshot, release etc) # is present only for images with staging, snapshot,release tags __RC_imagesetup() { - __check_and_create_image_var RC "RAPP_CAT_IMAGE" "RAPP_CAT_IMAGE_BASE" "RAPP_CAT_IMAGE_TAG" $1 "$RAPP_CAT_DISPLAY_NAME" + __check_and_create_image_var RC "RAPP_CAT_IMAGE" "RAPP_CAT_IMAGE_BASE" "RAPP_CAT_IMAGE_TAG" $1 "$RAPP_CAT_DISPLAY_NAME" "" } # Pull image from remote repo or use locally built image @@ -55,12 +55,12 @@ __RC_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. __RC_kube_scale_zero_and_wait() { __kube_scale_and_wait_all_resources $KUBE_NONRTRIC_NAMESPACE app "$KUBE_NONRTRIC_NAMESPACE"-rappcatalogueservice } -# 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. __RC_kube_delete_all() { __kube_delete_all_resources $KUBE_NONRTRIC_NAMESPACE autotest RC @@ -68,7 +68,7 @@ __RC_kube_delete_all() { # Store docker logs # This function is called for apps managed by the test script. -# args: +# args: __RC_store_docker_logs() { if [ $RUNMODE == "KUBE" ]; then kubectl $KUBECONF logs -l "autotest=RC" -n $KUBE_NONRTRIC_NAMESPACE --tail=-1 > $1$2_rc.log 2>&1 @@ -84,11 +84,11 @@ __RC_initial_setup() { use_rapp_catalogue_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: - -__RC_statisics_setup() { +__RC_statistics_setup() { if [ $RUNMODE == "KUBE" ]; then echo "RC $RAPP_CAT_APP_NAME $KUBE_NONRTRIC_NAMESPACE" else @@ -168,7 +168,7 @@ start_rapp_catalogue() { __check_included_image "RC" 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 "RC" retcode_p=$?