Updates of function test for f-release

[nonrtric.git] / test / common / rc_api_functions.sh

diff --git a/test/common/rc_api_functions.sh b/test/common/rc_api_functions.sh
index 537bc0c..b17b6bf 100644 (file)
--- a/test/common/rc_api_functions.sh
+++ b/test/common/rc_api_functions.sh
@@ -34,7 +34,7 @@ __RC_imagesetup() {
 # <pull-policy-original> 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: <protocol> <internal-port> <external-port>
 __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: <sim-param> <target-value> [ timeout ]" $@
+               __print_err "Wrong args to ics_equal, needs two or three args: <sim-param> <target-value> [ timeout ]" $@
        fi
 }