X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Fagent_api_functions.sh;h=2091d65a56afa0bef73857e2341ed2ddc42e8a5a;hb=6f86ab364ac739951556bf2d5bf70429b518de47;hp=550ace0e7be5b91ddac5bd4240ac56d634de7129;hpb=e704d116cf5d97ca5faad93c536901f3351df93f;p=nonrtric.git diff --git a/test/common/agent_api_functions.sh b/test/common/agent_api_functions.sh index 550ace0e..2091d65a 100644 --- a/test/common/agent_api_functions.sh +++ b/test/common/agent_api_functions.sh @@ -76,7 +76,7 @@ __do_curl_to_agent() { if [ $# -ne 2 ]; then paramError=1 fi - if ! [ $ADAPTER == $DMAAPBASE ]; then + if [ $ADAPTER == $RESTBASE ] || [ $ADAPTER == $RESTBASE_SECURE ]; then paramError=1 fi else @@ -143,7 +143,7 @@ __do_curl_to_agent() { #urlencode the request url since it will be carried by send-request url requestUrl=$(python3 -c "from __future__ import print_function; import urllib.parse, sys; print(urllib.parse.quote(sys.argv[1]))" "$2") url=" "${ADAPTER}"/send-request?url="${requestUrl}"&operation="${oper} - curlString="curl -X POST${timeout}${httpcode}${content}${url}${file}" + curlString="curl -k -X POST${timeout}${httpcode}${content}${url}${file}" echo " CMD: "$curlString >> $HTTPLOG res=$($curlString) retcode=$? @@ -169,7 +169,7 @@ __do_curl_to_agent() { cid=$2 fi url=" "${ADAPTER}"/receive-response?correlationid="${cid} - curlString="curl -X GET"${timeout}${httpcode}${url} + curlString="curl -k -X GET"${timeout}${httpcode}${url} echo " CMD: "$curlString >> $HTTPLOG res=$($curlString) retcode=$? @@ -382,7 +382,7 @@ api_put_policy() { ((RES_TEST++)) if [ $# -lt 7 ] || [ $# -gt 8 ]; then - __print_err " []" $@ + __print_err " |NOTRANSIENT []" $@ return 1 fi