X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Fgateway_api_functions.sh;h=59bdb67a6e78e46301d7d1ecb2e04526c58823bb;hb=a893ee0669b7820fdb30af24b213ea69956377e1;hp=d8f2cf1aca31c313772aa657dd680575dc579f97;hpb=520b912bce8eebb3e272c9ccfa3378b01dfd200b;p=nonrtric.git diff --git a/test/common/gateway_api_functions.sh b/test/common/gateway_api_functions.sh index d8f2cf1a..59bdb67a 100644 --- a/test/common/gateway_api_functions.sh +++ b/test/common/gateway_api_functions.sh @@ -35,7 +35,7 @@ __NGW_imagesetup() { # Shall be used for images that does not allow overriding # Both var may contain: 'remote', 'remote-remove' or 'local' __NGW_imagepull() { - __check_and_pull_image $1 "$NRT_GATEWAY_DISPLAY_NAME" $NRT_GATEWAY_APP_NAME $NRT_GATEWAY_IMAGE + __check_and_pull_image $1 "$NRT_GATEWAY_DISPLAY_NAME" $NRT_GATEWAY_APP_NAME NRT_GATEWAY_IMAGE } # Build image (only for simulator or interfaces stubs owned by the test environment) @@ -46,9 +46,13 @@ __NGW_imagebuild() { } # Generate a string for each included image using the app display name and a docker images format string +# If a custom image repo is used then also the source image from the local repo is listed # arg: __NGW_image_data() { echo -e "$NRT_GATEWAY_DISPLAY_NAME\t$(docker images --format $1 $NRT_GATEWAY_IMAGE)" >> $2 + if [ ! -z "$NRT_GATEWAY_IMAGE_SOURCE" ]; then + echo -e "-- source image --\t$(docker images --format $1 $NRT_GATEWAY_IMAGE_SOURCE)" >> $2 + fi } # Scale kubernetes resources to zero @@ -188,7 +192,7 @@ start_gateway() { if [ $retcode_i -eq 0 ]; then - echo -e " Creating $NGW_APP_NAME app and expose service" + echo -e " Creating $NRT_GATEWAY_APP_NAME app and expose service" #Export all vars needed for service and deployment export NRT_GATEWAY_APP_NAME