X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Fpvccleaner_api_functions.sh;h=4b48e325bd4192fb86f057a2f414771588ba6d2d;hb=46f5295920d6e1909dedc056f5169c14a70f528d;hp=62c2d43db1ba155bdbf9b074c1dc86e411358f80;hpb=6f48adb69090799c74c29204dd2cd1737cc9d6ac;p=nonrtric.git diff --git a/test/common/pvccleaner_api_functions.sh b/test/common/pvccleaner_api_functions.sh index 62c2d43d..4b48e325 100644 --- a/test/common/pvccleaner_api_functions.sh +++ b/test/common/pvccleaner_api_functions.sh @@ -26,7 +26,7 @@ # arg: (selects staging, snapshot, release etc) # is present only for images with staging, snapshot,release tags __PVCCLEANER_imagesetup() { - __check_and_create_image_var PVCCLEANER "PVC_CLEANER_IMAGE" "PVC_CLEANER_IMAGE_BASE" "PVC_CLEANER_IMAGE_TAG" REMOTE_PROXY "$PVC_CLEANER_DISPLAY_NAME" + __check_and_create_image_var PVCCLEANER "PVC_CLEANER_IMAGE" "PVC_CLEANER_IMAGE_BASE" "PVC_CLEANER_IMAGE_TAG" REMOTE_PROXY "$PVC_CLEANER_DISPLAY_NAME" "" } # Pull image from remote repo or use locally built image @@ -63,12 +63,12 @@ __PVCCLEANER_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. __PVCCLEANER_kube_scale_zero_and_wait() { : } -# 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. __PVCCLEANER_kube_delete_all() { : @@ -76,10 +76,10 @@ __PVCCLEANER_kube_delete_all() { # Store docker logs # This function is called for apps managed by the test script. -# args: +# args: __PVCCLEANER_store_docker_logs() { if [ $RUNMODE == "KUBE" ]; then - kubectl logs -l "autotest=PRODSTUB" -A --tail=-1 > $1$2_pvs_cleaner.log 2>&1 + kubectl $KUBECONF logs -l "autotest=PVCCLEANER" -A --tail=-1 > $1$2_pvs_cleaner.log 2>&1 fi } @@ -90,6 +90,20 @@ __PVCCLEANER_initial_setup() { : } +# 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 pre-started apps. +# args: - +__PVCCLEANER_statistics_setup() { + echo "" +} + +# Check application requirements, e.g. helm, the the test needs. Exit 1 if req not satisfied +# args: - +__PVCCLEANER_test_requirements() { + : +} + ####################################################### # This is a system app, all usage in testcase_common.sh \ No newline at end of file