X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Frc_api_functions.sh;h=b17b6bf9e08b3d5bd96577c1a9e112e2fe8a7abb;hb=4719b5c2231929ab0ccc781af9686db7c0b1261e;hp=537bc0c2c326358f6c56919dd1e0fdda4657c5ce;hpb=98ce5dc75fc222dadaf26a8a148788b0367bf6ca;p=nonrtric.git diff --git a/test/common/rc_api_functions.sh b/test/common/rc_api_functions.sh index 537bc0c2..b17b6bf9 100644 --- a/test/common/rc_api_functions.sh +++ b/test/common/rc_api_functions.sh @@ -34,7 +34,7 @@ __RC_imagesetup() { # Shall be used for images that does not allow overriding # Both arg var may contain: 'remote', 'remote-remove' or 'local' __RC_imagepull() { - __check_and_pull_image $1 "$c" $RAPP_CAT_APP_NAME RAPP_CAT_IMAGE + __check_and_pull_image $1 "$RAPP_CAT_DISPLAY_NAME" $RAPP_CAT_APP_NAME RAPP_CAT_IMAGE } # Generate a string for each included image using the app display name and a docker images format string @@ -96,6 +96,12 @@ __RC_statisics_setup() { fi } +# Check application requirements, e.g. helm, the the test needs. Exit 1 if req not satisfied +# args: - +__RC_test_requirements() { + : +} + ####################################################### # Set http as the protocol to use for all communication to the Rapp catalogue @@ -116,7 +122,7 @@ use_rapp_catalogue_https() { # args: __rapp_catalogue_set_protocoll() { echo -e $BOLD"$RAPP_CAT_DISPLAY_NAME protocol setting"$EBOLD - echo -e " Using $BOLD http $EBOLD towards $RAPP_CAT_DISPLAY_NAME" + echo -e " Using $BOLD $1 $EBOLD towards $RAPP_CAT_DISPLAY_NAME" ## Access to Rapp catalogue @@ -234,7 +240,7 @@ rc_equal() { #__var_test RC "$LOCALHOST_HTTP:$RC_EXTERNAL_PORT/" $1 "=" $2 $3 __var_test RC "$RC_SERVICE_PATH/" $1 "=" $2 $3 else - __print_err "Wrong args to ecs_equal, needs two or three args: [ timeout ]" $@ + __print_err "Wrong args to ics_equal, needs two or three args: [ timeout ]" $@ fi }