X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Fagent_api_functions.sh;h=8ec8fdbca01e696779e9571a3c23b74a6b24f30d;hb=5d97a401dc1e26f64ad57daab90f924da9c12c64;hp=312eacb55906aa65f6c6d7a51edbc16fa357ea23;hpb=acdd3f361ff7af58b0276789cc5148180a06e552;p=nonrtric.git diff --git a/test/common/agent_api_functions.sh b/test/common/agent_api_functions.sh index 312eacb5..8ec8fdbc 100644 --- a/test/common/agent_api_functions.sh +++ b/test/common/agent_api_functions.sh @@ -21,171 +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 -# REST or DMAAP is controlled of the base url of $ADAPTER -# arg: GET|PUT|POST|DELETE [] -# (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='' - - if [ $# -gt 2 ]; then - content=" -H Content-Type:application/json" - fi - if [ $1 == "GET" ]; then - oper="GET" - if [ $# -ne 2 ];then - paramError=1 - fi - elif [ $1 == "PUT" ]; then - oper="PUT" - if [ $# -eq 3 ]; then - file=" --data-binary @$3" - fi - accept=" -H accept:application/json" - elif [ $1 == "POST" ]; then - oper="POST" - accept=" -H accept:*/*" - if [ $# -ne 2 ];then - paramError=1 - fi - elif [ $1 == "DELETE" ]; then - oper="DELETE" - if [ $# -ne 2 ];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 []" >> $HTTPLOG - echo "-Returning response 000" >> $HTTPLOG - echo "-000" - return 1 - fi - - if [ $ADAPTER == $RESTBASE ]; then - url=" "${ADAPTER}${2} - oper=" -X "$oper - curlString="curl"${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 - 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=$(python -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} - 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 1 - 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 -} - +. ../common/api_curl.sh ######################################################### #### Test case functions A1 Policy management service @@ -226,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="" @@ -249,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 @@ -271,7 +108,7 @@ 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 @@ -286,11 +123,12 @@ api_get_policies() { targetJson=$targetJson"]" echo "TARGET JSON: $targetJson" >> $HTTPLOG - res=$(python ../common/compare_json.py "$targetJson" "$body" "id") + 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 @@ -314,13 +152,14 @@ 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 @@ -331,10 +170,11 @@ api_get_policy() { sed 's/XXX/'${2}'/g' $3 > $file targetJson=$(< $file) echo "TARGET JSON: $targetJson" >> $HTTPLOG - res=$(python ../common/compare_json.py "$targetJson" "$body") + 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 @@ -345,15 +185,15 @@ api_get_policy() { } # API Test function: PUT /policy -# args: [] +# args: [] # (Function for test scripts) api_put_policy() { echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG ((RES_TEST++)) - if [ $# -lt 6 ] || [ $# -gt 7 ]; then - __print_err " []" $@ + if [ $# -lt 7 ] || [ $# -gt 8 ]; then + __print_err " |NOTRANSIENT []" $@ return 1 fi @@ -361,39 +201,40 @@ api_put_policy() { count=0 max=1 - if [ $# -eq 7 ]; then - max=$7 + if [ $# -eq 8 ]; then + max=$8 fi pid=$5 - file=$6 + 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="/policy?id=$pid&ric=$ric&service=$2" - else - query="/policy?id=$pid&ric=$ric&service=$2&type=$4" + if [ $4 != "NOTYPE" ]; then + query=$query"&type=$4" + fi + + if [ $6 != NOTRANSIENT ]; then + query=$query"&transient=$6" fi file=".p.json" - sed 's/XXX/'${pid}'/g' $6 > $file - res="$(__do_curl_to_agent PUT $query $file)" + sed 's/XXX/'${pid}'/g' $7 > $file + res="$(__do_curl_to_api PA PUT $query $file)" status=${res:${#res}-3} - echo -ne " Creating "$count"("$max")\033[0K\r" - + 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")\033[0K\r" + echo -ne " Executed "$count"("$max")${SAMELINE}" done echo "" @@ -402,6 +243,176 @@ api_put_policy() { return 0 } +# API Test function: PUT /policy to run in batch +# args: [] +# (Function for test scripts) +api_put_policy_batch() { + echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD + echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG + ((RES_TEST++)) + + if [ $# -lt 7 ] || [ $# -gt 8 ]; then + __print_err " []" $@ + return 1 + fi + + ric=$3 + count=0 + max=1 + + if [ $# -eq 8 ]; then + max=$8 + fi + + pid=$5 + file=$7 + ARR="" + while [ $count -lt $max ]; do + query="/policy?id=$UUID$pid&ric=$ric&service=$2" + + if [ $4 != "NOTYPE" ]; then + query=$query"&type=$4" + fi + + if [ $6 != NOTRANSIENT ]; then + query=$query"&transient=$6" + fi + + file=".p.json" + sed 's/XXX/'${pid}'/g' $7 > $file + res="$(__do_curl_to_api PA PUT_BATCH $query $file)" + status=${res:${#res}-3} + echo -ne " Requesting(batch) "$count"("$max")${SAMELINE}" + + if [ $status -ne 200 ]; then + 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} + ARR=$ARR" "$cid + let pid=$pid+1 + let count=$count+1 + echo -ne " Requested(batch) "$count"("$max")${SAMELINE}" + done + + echo "" + count=0 + for cid in $ARR; do + + res="$(__do_curl_to_api PA RESPONSE $cid)" + status=${res:${#res}-3} + echo -ne " Requesting(batch) "$count"("$max")${SAMELINE}" + + if [ $status -ne $1 ]; then + 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 " Requested(batch) "$count"("$max")${SAMELINE}" + done + + echo "" + + ((RES_PASS++)) + echo -e $GREEN" PASS"$EGREEN + return 0 +} + +# API Test function: PUT /policy to run in i parallel for a number of rics +# args: +# (Function for test scripts) +api_put_policy_parallel() { + echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD + echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG + ((RES_TEST++)) + + if [ $# -ne 10 ]; then + __print_err " " $@ + return 1 + fi + resp_code=$1; shift; + serv=$1; shift + ric_base=$1; shift; + num_rics=$1; shift; + type=$1; shift; + start_id=$1; shift; + transient=$1; shift; + template=$1; shift; + count=$1; shift; + pids=$1; shift; + + if [ $ADAPTER != $RESTBASE ] && [ $ADAPTER != $RESTBASE_SECURE ]; then + echo " Info - api_put_policy_parallel uses only the agent REST interface - create over dmaap in parallel is not supported" + echo " Info - will execute over agent REST" + fi + + if [ $serv == "NOSERVICE" ]; then + serv="" + fi + query="/policy?service=$serv" + + if [ $type != "NOTYPE" ]; then + query=$query"&type=$type" + fi + + if [ $transient != NOTRANSIENT ]; then + query=$query"&transient=$transient" + fi + + urlbase=${ADAPTER}${query} + + for ((i=1; i<=$pids; i++)) + do + uuid=$UUID + if [ -z "$uuid" ]; then + uuid="NOUUID" + fi + echo "" > ".pid${i}.res.txt" + echo $resp_code $urlbase $ric_base $num_rics $uuid $start_id $template $count $pids $i > ".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 + }' + msg="" + for ((i=1; i<=$pids; i++)) + do + file=".pid${i}.res.txt" + tmp=$(< $file) + if [ -z "$tmp" ]; then + echo " Process $i : unknown result (result file empty" + msg="failed" + else + res=${tmp:0:1} + if [ $res == "0" ]; then + echo " Process $i : OK" + else + echo " Process $i : failed - "${tmp:1} + msg="failed" + fi + fi + done + if [ -z $msg ]; then + echo " $(($count*$num_rics)) policy request(s) executed" + ((RES_PASS++)) + echo -e $GREEN" PASS"$EGREEN + return 0 + fi + + echo -e $RED" FAIL. One of more processes failed to execute" $ERED + ((RES_FAIL++)) + __check_stop_at_error + return 1 +} # API Test function: DELETE /policy # args: [count] @@ -426,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")\033[0K\r" + 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")\033[0K\r" + echo -ne " Executed "$count"("$max")${SAMELINE}" done echo "" @@ -448,6 +460,147 @@ api_delete_policy() { return 0 } +# API Test function: DELETE /policy to run in batch +# args: [count] +# (Function for test scripts) +api_delete_policy_batch() { + echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD + echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG + ((RES_TEST++)) + + if [ $# -lt 2 ] || [ $# -gt 3 ]; then + __print_err " [count]" $@ + return 1 + fi + + count=0 + max=1 + + if [ $# -eq 3 ]; then + max=$3 + fi + + pid=$2 + ARR="" + while [ $count -lt $max ]; do + query="/policy?id="$UUID$pid + res="$(__do_curl_to_api PA DELETE_BATCH $query)" + status=${res:${#res}-3} + echo -ne " Requesting(batch) "$count"("$max")${SAMELINE}" + + if [ $status -ne 200 ]; then + 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} + ARR=$ARR" "$cid + let pid=$pid+1 + let count=$count+1 + echo -ne " Requested(batch) "$count"("$max")${SAMELINE}" + done + + echo "" + + count=0 + for cid in $ARR; do + + res="$(__do_curl_to_api PA RESPONSE $cid)" + status=${res:${#res}-3} + echo -ne " Deleted(batch) "$count"("$max")${SAMELINE}" + + if [ $status -ne $1 ]; then + echo " Deleted(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 " Deleted(batch) "$count"("$max")${SAMELINE}" + done + + ((RES_PASS++)) + echo -e $GREEN" PASS"$EGREEN + return 0 +} + +# API Test function: DELETE /policy to run in i parallel for a number of rics +# args: +# (Function for test scripts) +api_delete_policy_parallel() { + echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD + echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG + ((RES_TEST++)) + + if [ $# -ne 5 ]; then + __print_err " " $@ + return 1 + fi + resp_code=$1; shift; + num_rics=$1; shift; + start_id=$1; shift; + count=$1; shift; + pids=$1; shift; + + if [ $ADAPTER != $RESTBASE ] && [ $ADAPTER != $RESTBASE_SECURE ]; then + echo " Info - api_delete_policy_parallel uses only the agent REST interface - create over dmaap in parallel is not supported" + echo " Info - will execute over agent REST" + fi + + query="/policy" + + urlbase=${ADAPTER}${query} + + for ((i=1; i<=$pids; i++)) + do + uuid=$UUID + if [ -z "$uuid" ]; then + uuid="NOUUID" + fi + echo "" > ".pid${i}.del.res.txt" + echo $resp_code $urlbase $num_rics $uuid $start_id $count $pids $i > ".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 + }' + msg="" + for ((i=1; i<=$pids; i++)) + do + file=".pid${i}.del.res.txt" + tmp=$(< $file) + if [ -z "$tmp" ]; then + echo " Process $i : unknown result (result file empty" + msg="failed" + else + res=${tmp:0:1} + if [ $res == "0" ]; then + echo " Process $i : OK" + else + echo " Process $i : failed - "${tmp:1} + msg="failed" + fi + fi + done + if [ -z $msg ]; then + echo " $(($count*$num_rics)) policy request(s) executed" + ((RES_PASS++)) + echo -e $GREEN" PASS"$EGREEN + return 0 + fi + + echo -e $RED" FAIL. One of more processes failed to execute" $ERED + ((RES_FAIL++)) + __check_stop_at_error + return 1 +} + # API Test function: GET /policy_ids # args: |NORIC |NOSERVICE |NOTYPE ([> $HTTPLOG - res=$(python ../common/compare_json.py "$targetJson" "$body") + 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 @@ -535,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 @@ -550,11 +706,12 @@ api_get_policy_schema() { targetJson=$(< $3) echo "TARGET JSON: $targetJson" >> $HTTPLOG - res=$(python ../common/compare_json.py "$targetJson" "$body") + 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 @@ -582,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 @@ -602,17 +760,18 @@ api_get_policy_schemas() { if [ $file == "NOFILE" ]; then targetJson=$targetJson"{}" else - targetJson=$targetJson$(< $3) + targetJson=$targetJson$(< $file) fi done targetJson=$targetJson"]" echo "TARGET JSON: $targetJson" >> $HTTPLOG - res=$(python ../common/compare_json.py "$targetJson" "$body") + 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 @@ -653,24 +812,26 @@ 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 echo "TARGET JSON: $targetJson" >> $HTTPLOG body=${res:0:${#res}-3} - res=$(python ../common/compare_json.py "$targetJson" "$body") + 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 @@ -700,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 @@ -725,11 +887,12 @@ api_get_policy_types() { targetJson=$targetJson"]" echo "TARGET JSON: $targetJson" >> $HTTPLOG - res=$(python ../common/compare_json.py "$targetJson" "$body") + 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 @@ -755,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 @@ -787,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 @@ -801,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 @@ -830,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=$(python ../common/create_rics_json.py ".tmp_rics.json" "$3" ) + res=$(python3 ../common/create_rics_json.py ".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) echo "TARGET JSON: $targetJson" >> $HTTPLOG - res=$(python ../common/compare_json.py "$targetJson" "$body") + 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 @@ -884,12 +1053,13 @@ api_put_service() { file=".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 @@ -905,7 +1075,6 @@ api_get_services() { echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG ((RES_TEST++)) - #Number of accepted parameters: 1, 2, 4, 7, 10, 13,... paramError=1 if [ $# -eq 1 ]; then @@ -932,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 @@ -960,10 +1130,11 @@ api_get_services() { done targetJson=$targetJson"]" echo "TARGET JSON: $targetJson" >> $HTTPLOG - res=$(python ../common/compare_json.py "$targetJson" "$body" "serviceName") + 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 @@ -987,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 @@ -1007,11 +1179,12 @@ api_get_service_ids() { targetJson=$targetJson"]" echo "TARGET JSON: $targetJson" >> $HTTPLOG - res=$(python ../common/compare_json.py "$targetJson" "$body" "serviceName") + 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 @@ -1034,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 @@ -1062,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