X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Fagent_api_functions.sh;h=29e1bf1afad48e2390cb57b5e51a417d17e506f1;hb=530fa60a49e8f870cea442a338b148783fbe2ab7;hp=958f91486bc80e989531c2912a9372c79d10a0b9;hpb=bbd2e9d44475fe20086d1d87a9e9a53a019ae8c8;p=nonrtric.git diff --git a/test/common/agent_api_functions.sh b/test/common/agent_api_functions.sh index 958f9148..29e1bf1a 100644 --- a/test/common/agent_api_functions.sh +++ b/test/common/agent_api_functions.sh @@ -21,196 +21,7 @@ ### API functiond towards the Policy Agent -# Generic function to query the agent via the REST or DMAAP interface. -# Used by all other agent api test functions -# If operation prefix is '_BATCH' the the send and get response is split in two sequences, -# one for sending the requests and one for receiving the response -# but only when using the DMAAP interface -# REST or DMAAP is controlled of the base url of $ADAPTER -# arg: (GET|PUT|POST|DELETE|GET_BATCH|PUT_BATCH|POST_BATCH|DELETE_BATCH []) | (RESPONSE ) -# (Not for test scripts) -__do_curl_to_agent() { - echo "(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG - paramError=0 - - if [ $# -lt 2 ] || [ $# -gt 3 ]; then - paramError=1 - else - timeout="" - oper="" - file='' - httpcode=" -sw %{http_code}" - accept='' - content='' - batch=0 - if [[ $1 == *"_BATCH" ]]; then - batch=1 - fi - if [ $# -gt 2 ]; then - content=" -H Content-Type:application/json" - fi - if [ $1 == "GET" ] || [ $1 == "GET_BATCH" ]; then - oper="GET" - if [ $# -ne 2 ]; then - paramError=1 - fi - elif [ $1 == "PUT" ] || [ $1 == "PUT_BATCH" ]; then - oper="PUT" - if [ $# -eq 3 ]; then - file=" --data-binary @$3" - fi - accept=" -H accept:application/json" - elif [ $1 == "POST" ] || [ $1 == "POST_BATCH" ]; then - oper="POST" - accept=" -H accept:*/*" - if [ $# -ne 2 ]; then - paramError=1 - fi - elif [ $1 == "DELETE" ] || [ $1 == "DELETE_BATCH" ]; then - oper="DELETE" - if [ $# -ne 2 ]; then - paramError=1 - fi - elif [ $1 == "RESPONSE" ]; then - oper="RESPONSE" - if [ $# -ne 2 ]; then - paramError=1 - fi - if ! [ $ADAPTER == $DMAAPBASE ]; then - paramError=1 - fi - else - paramError=1 - fi - fi - - if [ $paramError -eq 1 ]; then - ((RES_CONF_FAIL++)) - echo "-Incorrect number of parameters to __do_curl_agent " $@ >> $HTTPLOG - echo "-Expected: (GET|PUT|POST|DELETE|GET_BATCH|PUT_BATCH|POST_BATCH|DELETE_BATCH []) | (RESPONSE ) []" >> $HTTPLOG - echo "-Returning response 000" >> $HTTPLOG - echo "-000" - return 1 - fi - - if [ $ADAPTER == $RESTBASE ] || [ $ADAPTER == $RESTBASE_SECURE ]; then - url=" "${ADAPTER}${2} - oper=" -X "$oper - curlString="curl -k "${oper}${timeout}${httpcode}${accept}${content}${url}${file} - echo " CMD: "$curlString >> $HTTPLOG - if [ $# -eq 3 ]; then - echo " FILE: $(<$3)" >> $HTTPLOG - fi - - # Do retry for configured response codes, otherwise only one attempt - maxretries=5 - while [ $maxretries -ge 0 ]; do - - let maxretries=maxretries-1 - res=$($curlString) - retcode=$? - if [ $retcode -ne 0 ]; then - echo " RETCODE: "$retcode >> $HTTPLOG - echo "000" - return 1 - fi - retry=0 - echo " RESP: "$res >> $HTTPLOG - status=${res:${#res}-3} - if [ ! -z "${AGENT_RETRY_CODES}" ]; then - for retrycode in $AGENT_RETRY_CODES; do - if [ $retrycode -eq $status ]; then - echo -e $RED" Retrying (according to set codes for retry), got status $status....."$ERED >> $HTTPLOG - sleep 1 - retry=1 - fi - done - fi - if [ $retry -eq 0 ]; then - maxretries=-1 - fi - done - echo $res - return 0 - else - if [ $oper != "RESPONSE" ]; then - requestUrl=$2 - if [ $1 == "PUT" ] && [ $# -eq 3 ]; then - payload="$(cat $3 | tr -d '\n' | tr -d ' ' )" - echo "payload: "$payload >> $HTTPLOG - file=" --data-binary "$payload - fi - #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}" - echo " CMD: "$curlString >> $HTTPLOG - res=$($curlString) - retcode=$? - if [ $retcode -ne 0 ]; then - echo " RETCODE: "$retcode >> $HTTPLOG - echo "000" - return 1 - fi - echo " RESP: "$res >> $HTTPLOG - status=${res:${#res}-3} - if [ $status -ne 200 ]; then - echo "000" - return 1 - fi - cid=${res:0:${#res}-3} - if [[ $batch -eq 1 ]]; then - echo $cid"200" - return 0 - fi - fi - if [ $oper == "RESPONSE" ] || [ $batch -eq 0 ]; then - if [ $oper == "RESPONSE" ]; then - cid=$2 - fi - url=" "${ADAPTER}"/receive-response?correlationid="${cid} - curlString="curl -X GET"${timeout}${httpcode}${url} - echo " CMD: "$curlString >> $HTTPLOG - res=$($curlString) - retcode=$? - if [ $retcode -ne 0 ]; then - echo " RETCODE: "$retcode >> $HTTPLOG - echo "000" - return 1 - fi - echo " RESP: "$res >> $HTTPLOG - status=${res:${#res}-3} - TS=$SECONDS - # wait of the reply from the agent... - while [ $status -eq 204 ]; do - if [ $(($SECONDS - $TS)) -gt 90 ]; then - echo " RETCODE: (timeout after 90s)" >> $HTTPLOG - echo "000" - return 1 - fi - sleep 0.01 - echo " CMD: "$curlString >> $HTTPLOG - res=$($curlString) - if [ $retcode -ne 0 ]; then - echo " RETCODE: "$retcode >> $HTTPLOG - echo "000" - return 1 - fi - echo " RESP: "$res >> $HTTPLOG - status=${res:${#res}-3} - done - if [ $status -eq 200 ]; then - body=${res:0:${#res}-3} - echo $body - return 0 - fi - echo "Status not 200, returning response 000" >> $HTTPLOG - echo "0000" - return 1 - fi - fi -} - +. ../common/api_curl.sh ######################################################### #### Test case functions A1 Policy management service @@ -251,7 +62,7 @@ api_get_policies() { fi if [ $paramError -ne 0 ]; then - __print_err " |NORIC |NOSERVICE |NOTYPE [ NOID | [ EMPTY| ]*]" $@ + __print_err " |NORIC |NOSERVICE |NOTYPE [ NOID | [ EMPTY| ]*]" $@ return 1 fi queryparams="" @@ -274,12 +85,13 @@ api_get_policies() { fi query="/policies"$queryparams - res="$(__do_curl_to_agent GET $query)" + res="$(__do_curl_to_api PA GET $query)" status=${res:${#res}-3} if [ $status -ne $1 ]; then echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED ((RES_FAIL++)) + __check_stop_at_error return 1 fi @@ -296,13 +108,13 @@ api_get_policies() { if [ "$targetJson" != "[" ]; then targetJson=$targetJson"," fi - targetJson=$targetJson"{\"id\":\"${arr[$i]}\",\"lastModified\":\"????\",\"ric\":\"${arr[$i+1]}\",\"service\":\"${arr[$i+2]}\",\"type\":" + targetJson=$targetJson"{\"id\":\"$UUID${arr[$i]}\",\"lastModified\":\"????\",\"ric\":\"${arr[$i+1]}\",\"service\":\"${arr[$i+2]}\",\"type\":" if [ "${arr[$i+3]}" == "EMPTY" ]; then targetJson=$targetJson"\"\"," else targetJson=$targetJson"\"${arr[$i+3]}\"," fi - file=".p.json" + file="./tmp/.p.json" sed 's/XXX/'${arr[$i]}'/g' ${arr[$i+4]} > $file json=$(cat $file) targetJson=$targetJson"\"json\":"$json"}" @@ -316,6 +128,7 @@ api_get_policies() { if [ $res -ne 0 ]; then echo -e $RED" FAIL, returned body not correct"$ERED ((RES_FAIL++)) + __check_stop_at_error return 1 fi fi @@ -339,20 +152,21 @@ api_get_policy() { return 1 fi - query="/policy?id=$2" - res="$(__do_curl_to_agent GET $query)" + query="/policy?id=$UUID$2" + res="$(__do_curl_to_api PA GET $query)" status=${res:${#res}-3} if [ $status -ne $1 ]; then echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED ((RES_FAIL++)) + __check_stop_at_error return 1 fi if [ $# -eq 3 ]; then #Create a policy json to compare with body=${res:0:${#res}-3} - file=".p.json" + file="./tmp/.p.json" sed 's/XXX/'${2}'/g' $3 > $file targetJson=$(< $file) echo "TARGET JSON: $targetJson" >> $HTTPLOG @@ -360,6 +174,7 @@ api_get_policy() { if [ $res -ne 0 ]; then echo -e $RED" FAIL, returned body not correct"$ERED ((RES_FAIL++)) + __check_stop_at_error return 1 fi fi @@ -378,7 +193,7 @@ api_put_policy() { ((RES_TEST++)) if [ $# -lt 7 ] || [ $# -gt 8 ]; then - __print_err " []" $@ + __print_err " |NOTRANSIENT []" $@ return 1 fi @@ -394,7 +209,7 @@ api_put_policy() { file=$7 while [ $count -lt $max ]; do - query="/policy?id=$pid&ric=$ric&service=$2" + query="/policy?id=$UUID$pid&ric=$ric&service=$2" if [ $4 != "NOTYPE" ]; then query=$query"&type=$4" @@ -404,22 +219,22 @@ api_put_policy() { query=$query"&transient=$6" fi - file=".p.json" + file="./tmp/.p.json" sed 's/XXX/'${pid}'/g' $7 > $file - res="$(__do_curl_to_agent PUT $query $file)" + res="$(__do_curl_to_api PA PUT $query $file)" status=${res:${#res}-3} - echo -ne " Creating "$count"("$max")${SAMELINE}" + echo -ne " Executing "$count"("$max")${SAMELINE}" if [ $status -ne $1 ]; then - let pid=$pid+1 - echo " Created "$count"?("$max")" + echo " Executed "$count"?("$max")" echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED ((RES_FAIL++)) + __check_stop_at_error return 1 fi let pid=$pid+1 let count=$count+1 - echo -ne " Created "$count"("$max")${SAMELINE}" + echo -ne " Executed "$count"("$max")${SAMELINE}" done echo "" @@ -453,7 +268,7 @@ api_put_policy_batch() { file=$7 ARR="" while [ $count -lt $max ]; do - query="/policy?id=$pid&ric=$ric&service=$2" + query="/policy?id=$UUID$pid&ric=$ric&service=$2" if [ $4 != "NOTYPE" ]; then query=$query"&type=$4" @@ -463,17 +278,17 @@ api_put_policy_batch() { query=$query"&transient=$6" fi - file=".p.json" + file="./tmp/.p.json" sed 's/XXX/'${pid}'/g' $7 > $file - res="$(__do_curl_to_agent PUT_BATCH $query $file)" + res="$(__do_curl_to_api PA PUT_BATCH $query $file)" status=${res:${#res}-3} - echo -ne " Requested(batch) "$count"("$max")${SAMELINE}" + echo -ne " Requesting(batch) "$count"("$max")${SAMELINE}" if [ $status -ne 200 ]; then - let pid=$pid+1 echo " Requested(batch) "$count"?("$max")" echo -e $RED" FAIL. Exepected status 200 (in request), got "$status $ERED ((RES_FAIL++)) + __check_stop_at_error return 1 fi cid=${res:0:${#res}-3} @@ -487,20 +302,20 @@ api_put_policy_batch() { count=0 for cid in $ARR; do - res="$(__do_curl_to_agent RESPONSE $cid)" + res="$(__do_curl_to_api PA RESPONSE $cid)" status=${res:${#res}-3} - echo -ne " Created(batch) "$count"("$max")${SAMELINE}" + echo -ne " Requesting(batch) "$count"("$max")${SAMELINE}" if [ $status -ne $1 ]; then - let pid=$pid+1 - echo " Created(batch) "$count"?("$max")" + echo " Requested(batch) "$count"?("$max")" echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED ((RES_FAIL++)) + __check_stop_at_error return 1 fi let count=$count+1 - echo -ne " Created(batch) "$count"("$max")${SAMELINE}" + echo -ne " Requested(batch) "$count"("$max")${SAMELINE}" done echo "" @@ -555,19 +370,23 @@ api_put_policy_parallel() { for ((i=1; i<=$pids; i++)) do - echo "" > ".pid${i}.res.txt" - echo $resp_code $urlbase $ric_base $num_rics $start_id $template $count $pids $i > ".pid${i}.txt" + uuid=$UUID + if [ -z "$uuid" ]; then + uuid="NOUUID" + fi + echo "" > "./tmp/.pid${i}.res.txt" + echo $resp_code $urlbase $ric_base $num_rics $uuid $start_id $template $count $pids $i > "./tmp/.pid${i}.txt" echo $i done | xargs -n 1 -I{} -P $pids bash -c '{ arg=$(echo {}) echo " Parallel process $arg started" - tmp=$(< ".pid${arg}.txt") - python3 ../common/create_policies_process.py $tmp > .pid${arg}.res.txt + tmp=$(< "./tmp/.pid${arg}.txt") + python3 ../common/create_policies_process.py $tmp > ./tmp/.pid${arg}.res.txt }' msg="" for ((i=1; i<=$pids; i++)) do - file=".pid${i}.res.txt" + file="./tmp/.pid${i}.res.txt" tmp=$(< $file) if [ -z "$tmp" ]; then echo " Process $i : unknown result (result file empty" @@ -583,7 +402,7 @@ api_put_policy_parallel() { fi done if [ -z $msg ]; then - echo " $(($count*$num_rics)) policies created/updated" + echo " $(($count*$num_rics)) policy request(s) executed" ((RES_PASS++)) echo -e $GREEN" PASS"$EGREEN return 0 @@ -591,6 +410,7 @@ api_put_policy_parallel() { echo -e $RED" FAIL. One of more processes failed to execute" $ERED ((RES_FAIL++)) + __check_stop_at_error return 1 } @@ -617,20 +437,21 @@ api_delete_policy() { pid=$2 while [ $count -lt $max ]; do - query="/policy?id="$pid - res="$(__do_curl_to_agent DELETE $query)" + query="/policy?id="$UUID$pid + res="$(__do_curl_to_api PA DELETE $query)" status=${res:${#res}-3} - echo -ne " Deleting "$count"("$max")${SAMELINE}" + echo -ne " Executing "$count"("$max")${SAMELINE}" if [ $status -ne $1 ]; then - echo " Deleted "$count"?("$max")" + echo " Executed "$count"?("$max")" echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED ((RES_FAIL++)) + __check_stop_at_error return 1 fi let pid=$pid+1 let count=$count+1 - echo -ne " Deleted "$count"("$max")${SAMELINE}" + echo -ne " Executed "$count"("$max")${SAMELINE}" done echo "" @@ -662,16 +483,16 @@ api_delete_policy_batch() { pid=$2 ARR="" while [ $count -lt $max ]; do - query="/policy?id="$pid - res="$(__do_curl_to_agent DELETE_BATCH $query)" + query="/policy?id="$UUID$pid + res="$(__do_curl_to_api PA DELETE_BATCH $query)" status=${res:${#res}-3} - echo -ne " Requested(batch) "$count"("$max")${SAMELINE}" + echo -ne " Requesting(batch) "$count"("$max")${SAMELINE}" if [ $status -ne 200 ]; then - let pid=$pid+1 echo " Requested(batch) "$count"?("$max")" echo -e $RED" FAIL. Exepected status 200 (in request), got "$status $ERED ((RES_FAIL++)) + __check_stop_at_error return 1 fi cid=${res:0:${#res}-3} @@ -686,15 +507,15 @@ api_delete_policy_batch() { count=0 for cid in $ARR; do - res="$(__do_curl_to_agent RESPONSE $cid)" + res="$(__do_curl_to_api PA RESPONSE $cid)" status=${res:${#res}-3} echo -ne " Deleted(batch) "$count"("$max")${SAMELINE}" if [ $status -ne $1 ]; then - let pid=$pid+1 echo " Deleted(batch) "$count"?("$max")" echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED ((RES_FAIL++)) + __check_stop_at_error return 1 fi @@ -736,19 +557,23 @@ api_delete_policy_parallel() { for ((i=1; i<=$pids; i++)) do - echo "" > ".pid${i}.del.res.txt" - echo $resp_code $urlbase $num_rics $start_id $count $pids $i > ".pid${i}.del.txt" + uuid=$UUID + if [ -z "$uuid" ]; then + uuid="NOUUID" + fi + echo "" > "./tmp/.pid${i}.del.res.txt" + echo $resp_code $urlbase $num_rics $uuid $start_id $count $pids $i > "./tmp/.pid${i}.del.txt" echo $i done | xargs -n 1 -I{} -P $pids bash -c '{ arg=$(echo {}) echo " Parallel process $arg started" - tmp=$(< ".pid${arg}.del.txt") - python3 ../common/delete_policies_process.py $tmp > .pid${arg}.del.res.txt + tmp=$(< "./tmp/pid${arg}.del.txt") + python3 ../common/delete_policies_process.py $tmp > ./tmp/pid${arg}.del.res.txt }' msg="" for ((i=1; i<=$pids; i++)) do - file=".pid${i}.del.res.txt" + file="./tmp/.pid${i}.del.res.txt" tmp=$(< $file) if [ -z "$tmp" ]; then echo " Process $i : unknown result (result file empty" @@ -764,7 +589,7 @@ api_delete_policy_parallel() { fi done if [ -z $msg ]; then - echo " $(($count*$num_rics)) deleted" + echo " $(($count*$num_rics)) policy request(s) executed" ((RES_PASS++)) echo -e $GREEN" PASS"$EGREEN return 0 @@ -772,6 +597,7 @@ api_delete_policy_parallel() { echo -e $RED" FAIL. One of more processes failed to execute" $ERED ((RES_FAIL++)) + __check_stop_at_error return 1 } @@ -810,12 +636,13 @@ api_get_policy_ids() { fi query="/policy_ids"$queryparams - res="$(__do_curl_to_agent GET $query)" + res="$(__do_curl_to_api PA GET $query)" status=${res:${#res}-3} if [ $status -ne $1 ]; then echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED ((RES_FAIL++)) + __check_stop_at_error return 1 fi @@ -828,7 +655,7 @@ api_get_policy_ids() { targetJson=$targetJson"," fi if [ $pid != "NOID" ]; then - targetJson=$targetJson"\"$pid\"" + targetJson=$targetJson"\"$UUID$pid\"" fi done @@ -839,6 +666,7 @@ api_get_policy_ids() { if [ $res -ne 0 ]; then echo -e $RED" FAIL, returned body not correct"$ERED ((RES_FAIL++)) + __check_stop_at_error return 1 fi fi @@ -862,12 +690,13 @@ api_get_policy_schema() { fi query="/policy_schema?id=$2" - res="$(__do_curl_to_agent GET $query)" + res="$(__do_curl_to_api PA GET $query)" status=${res:${#res}-3} if [ $status -ne $1 ]; then echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED ((RES_FAIL++)) + __check_stop_at_error return 1 fi @@ -882,6 +711,7 @@ api_get_policy_schema() { if [ $res -ne 0 ]; then echo -e $RED" FAIL, returned body not correct"$ERED ((RES_FAIL++)) + __check_stop_at_error return 1 fi fi @@ -909,12 +739,13 @@ api_get_policy_schemas() { query=$query"?ric="$2 fi - res="$(__do_curl_to_agent GET $query)" + res="$(__do_curl_to_api PA GET $query)" status=${res:${#res}-3} if [ $status -ne $1 ]; then echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED ((RES_FAIL++)) + __check_stop_at_error return 1 fi @@ -940,6 +771,7 @@ api_get_policy_schemas() { if [ $res -ne 0 ]; then echo -e $RED" FAIL, returned body not correct"$ERED ((RES_FAIL++)) + __check_stop_at_error return 1 fi fi @@ -980,14 +812,15 @@ api_get_policy_status() { return 1 fi - query="/policy_status?id="$2 + query="/policy_status?id="$UUID$2 - res="$(__do_curl_to_agent GET $query)" + res="$(__do_curl_to_api PA GET $query)" status=${res:${#res}-3} if [ $status -ne $1 ]; then echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED ((RES_FAIL++)) + __check_stop_at_error return 1 fi @@ -998,6 +831,7 @@ api_get_policy_status() { if [ $res -ne 0 ]; then echo -e $RED" FAIL, returned body not correct"$ERED ((RES_FAIL++)) + __check_stop_at_error return 1 fi @@ -1027,12 +861,13 @@ api_get_policy_types() { query="/policy_types?ric=$2" fi - res="$(__do_curl_to_agent GET $query)" + res="$(__do_curl_to_api PA GET $query)" status=${res:${#res}-3} if [ $status -ne $1 ]; then echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED ((RES_FAIL++)) + __check_stop_at_error return 1 fi @@ -1057,6 +892,7 @@ api_get_policy_types() { if [ $res -ne 0 ]; then echo -e $RED" FAIL, returned body not correct"$ERED ((RES_FAIL++)) + __check_stop_at_error return 1 fi fi @@ -1082,12 +918,13 @@ api_get_status() { return 1 fi query="/status" - res="$(__do_curl_to_agent GET $query)" + res="$(__do_curl_to_api PA GET $query)" status=${res:${#res}-3} if [ $status -ne $1 ]; then echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED ((RES_FAIL++)) + __check_stop_at_error return 1 fi @@ -1114,12 +951,13 @@ api_get_ric() { query="/ric?managedElementId="$2 - res="$(__do_curl_to_agent GET $query)" + res="$(__do_curl_to_api PA GET $query)" status=${res:${#res}-3} if [ $status -ne $1 ]; then echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED ((RES_FAIL++)) + __check_stop_at_error return 1 fi @@ -1128,6 +966,7 @@ api_get_ric() { if [ "$body" != "$3" ]; then echo -e $RED" FAIL, returned body not correct"$ERED ((RES_FAIL++)) + __check_stop_at_error return 1 fi fi @@ -1157,30 +996,33 @@ api_get_rics() { query="/rics?policyType="$2 fi - res="$(__do_curl_to_agent GET $query)" + res="$(__do_curl_to_api PA GET $query)" status=${res:${#res}-3} if [ $status -ne $1 ]; then echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED ((RES_FAIL++)) + __check_stop_at_error return 1 fi if [ $# -gt 2 ]; then body=${res:0:${#res}-3} - res=$(python3 ../common/create_rics_json.py ".tmp_rics.json" "$3" ) + res=$(python3 ../common/create_rics_json.py "./tmp/.tmp_rics.json" "$3" ) if [ $res -ne 0 ]; then echo -e $RED" FAIL, could not create target ric info json"$ERED ((RES_FAIL++)) + __check_stop_at_error return 1 fi - targetJson=$(<.tmp_rics.json) + targetJson=$(<./tmp/.tmp_rics.json) echo "TARGET JSON: $targetJson" >> $HTTPLOG res=$(python3 ../common/compare_json.py "$targetJson" "$body") if [ $res -ne 0 ]; then echo -e $RED" FAIL, returned body not correct"$ERED ((RES_FAIL++)) + __check_stop_at_error return 1 fi fi @@ -1208,15 +1050,16 @@ api_put_service() { query="/service" json="{\"callbackUrl\": \""$4"\",\"keepAliveIntervalSeconds\": \""$3"\",\"serviceName\": \""$2"\"}" - file=".tmp.json" + file="./tmp/.tmp.json" echo "$json" > $file - res="$(__do_curl_to_agent PUT $query $file)" + res="$(__do_curl_to_api PA PUT $query $file)" status=${res:${#res}-3} if [ $status -ne $1 ]; then echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED ((RES_FAIL++)) + __check_stop_at_error return 1 fi @@ -1258,12 +1101,13 @@ api_get_services() { query="/services?name="$2 fi - res="$(__do_curl_to_agent GET $query)" + res="$(__do_curl_to_api PA GET $query)" status=${res:${#res}-3} if [ $status -ne $1 ]; then echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED ((RES_FAIL++)) + __check_stop_at_error return 1 fi @@ -1290,6 +1134,7 @@ api_get_services() { if [ $res -ne 0 ]; then echo -e $RED" FAIL, returned body not correct"$ERED ((RES_FAIL++)) + __check_stop_at_error return 1 fi fi @@ -1313,12 +1158,13 @@ api_get_service_ids() { fi query="/services" - res="$(__do_curl_to_agent GET $query)" + res="$(__do_curl_to_api PA GET $query)" status=${res:${#res}-3} if [ $status -ne $1 ]; then echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED ((RES_FAIL++)) + __check_stop_at_error return 1 fi @@ -1338,6 +1184,7 @@ api_get_service_ids() { if [ $res -ne 0 ]; then echo -e $RED" FAIL, returned body not correct"$ERED ((RES_FAIL++)) + __check_stop_at_error return 1 fi @@ -1360,12 +1207,13 @@ api_delete_services() { fi query="/services?name="$2 - res="$(__do_curl_to_agent DELETE $query)" + res="$(__do_curl_to_api PA DELETE $query)" status=${res:${#res}-3} if [ $status -ne $1 ]; then echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED ((RES_FAIL++)) + __check_stop_at_error return 1 fi @@ -1388,12 +1236,13 @@ api_put_services_keepalive() { fi query="/services/keepalive?name="$2 - res="$(__do_curl_to_agent PUT $query)" + res="$(__do_curl_to_api PA PUT $query)" status=${res:${#res}-3} if [ $status -ne $1 ]; then echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED ((RES_FAIL++)) + __check_stop_at_error return 1 fi