X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Fprodstub_api_functions.sh;h=6b7a3d8876cdb99b5eb44d8a94671cfd43043677;hb=refs%2Fchanges%2F45%2F6045%2F1;hp=ae3f193ba692d6141e8ccd3f6ffad5667d6a5cf8;hpb=483ee33ac3de88385c0eeb3f1ecf3a1bb760db54;p=nonrtric.git diff --git a/test/common/prodstub_api_functions.sh b/test/common/prodstub_api_functions.sh index ae3f193b..6b7a3d88 100644 --- a/test/common/prodstub_api_functions.sh +++ b/test/common/prodstub_api_functions.sh @@ -35,7 +35,7 @@ __PRODSTUB_imagesetup() { # Shall be used for images that does not allow overriding # Both var may contain: 'remote', 'remote-remove' or 'local' __PRODSTUB_imagepull() { - echo -e $RED"Image for app PRODSTUB shall never be pulled from remove repo"$ERED + echo -e $RED"Image for app PRODSTUB shall never be pulled from remote repo"$ERED } # Build image (only for simulator or interfaces stubs owned by the test environment) @@ -270,7 +270,11 @@ __execute_curl_to_prodstub() { proxyflag="" if [ $RUNMODE == "KUBE" ]; then if [ ! -z "$KUBE_PROXY_PATH" ]; then - proxyflag=" --proxy $KUBE_PROXY_PATH" + if [ $KUBE_PROXY_HTTPX == "http" ]; then + proxyflag=" --proxy $KUBE_PROXY_PATH" + else + proxyflag=" --proxy-insecure --proxy $KUBE_PROXY_PATH" + fi fi fi echo " CMD: $3 $proxyflag" >> $HTTPLOG @@ -414,7 +418,7 @@ prodstub_check_jobdata() { jobfile=$(cat $7) jobfile=$(echo "$jobfile" | sed "s/XXXX/$3/g") else - _log_test_fail_general "Template file "$7" for jobdata, does not exist" + __log_test_fail_general "Template file "$7" for jobdata, does not exist" return 1 fi targetJson="{\"ei_job_identity\":\"$3\",\"ei_type_identity\":\"$4\",\"target_uri\":\"$5\",\"owner\":\"$6\", \"ei_job_data\":$jobfile}" @@ -440,7 +444,7 @@ prodstub_check_jobdata_2() { jobfile=$(cat $7) jobfile=$(echo "$jobfile" | sed "s/XXXX/$3/g") else - _log_test_fail_general "Template file "$7" for jobdata, does not exist" + __log_test_fail_general "Template file "$7" for jobdata, does not exist" return 1 fi targetJson="{\"ei_job_identity\":\"$3\",\"ei_type_identity\":\"$4\",\"target_uri\":\"$5\",\"owner\":\"$6\", \"ei_job_data\":$jobfile,\"last_updated\":\"????\"}"