X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Fcontroller_api_functions.sh;h=4d568d76703f516b5fe2395b4669711728bf93e8;hb=7b36db6ef1b31daa41e115b7f199bb04f1cd0725;hp=e33c61907c1b183b04b1d8e4c2e2ea043e198154;hpb=ad0477833fe6a8270f274e17f73022a2d881f074;p=nonrtric.git diff --git a/test/common/controller_api_functions.sh b/test/common/controller_api_functions.sh index e33c6190..4d568d76 100644 --- a/test/common/controller_api_functions.sh +++ b/test/common/controller_api_functions.sh @@ -41,9 +41,10 @@ __do_curl_to_controller() { body=$(echo "$3" | sed 's/"/\\"/g') json='{"input":{"near-rt-ric-url":"'$2'","body":"'"$body"'"}}' fi - echo "$json" > .sdnc.payload.json - echo " FILE: $json" >> $HTTPLOG - curlString="curl -skw %{http_code} -X POST $SDNC_HTTPX://$SDNC_USER:$SDNC_PWD@localhost:$SDNC_LOCAL_PORT$SDNC_API_URL$1 -H accept:application/json -H Content-Type:application/json --data-binary @.sdnc.payload.json" + payload="./tmp/.sdnc.payload.json" + echo "$json" > $payload + echo " FILE ($payload) : $json" >> $HTTPLOG + curlString="curl -skw %{http_code} -X POST $SDNC_HTTPX://$SDNC_USER:$SDNC_PWD@localhost:$SDNC_LOCAL_PORT$SDNC_API_URL$1 -H accept:application/json -H Content-Type:application/json --data-binary @$payload" echo " CMD: "$curlString >> $HTTPLOG res=$($curlString) retcode=$? @@ -62,8 +63,9 @@ __do_curl_to_controller() { fi body=${res:0:${#res}-3} echo " JSON: "$body >> $HTTPLOG - echo "$body" > .sdnc-reply.json - res=$(python3 ../common/extract_sdnc_reply.py .sdnc-reply.json) + reply="./tmp/.sdnc-reply.json" + echo "$body" > $reply + res=$(python3 ../common/extract_sdnc_reply.py $reply) echo " EXTRACED BODY+CODE: "$res >> $HTTPLOG echo "$res" return 0 @@ -73,16 +75,14 @@ __do_curl_to_controller() { # arg: (OSC [ []* ]) | ( STD [ []* ] ) # (Function for test scripts) controller_api_get_A1_policy_ids() { - echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD - echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG - ((RES_TEST++)) + __log_test_start $@ paramError=1 if [ $# -gt 3 ] && [ $2 == "OSC" ]; then - url="http://$3:$RIC_SIM_INTERNAL_PORT/a1-p/policytypes/$4/policies" + url="$RIC_SIM_HTTPX://$3:$RIC_SIM_PORT/a1-p/policytypes/$4/policies" paramError=0 elif [ $# -gt 2 ] && [ $2 == "STD" ]; then - url="http://$3:$RIC_SIM_INTERNAL_PORT/A1-P/v1/policies" + url="$RIC_SIM_HTTPX://$3:$RIC_SIM_PORT/A1-P/v1/policies" paramError=0 fi @@ -95,17 +95,13 @@ controller_api_get_A1_policy_ids() { retcode=$? status=${res:${#res}-3} - if [ $? -ne 0 ]; then - echo -e $RED" FAIL. Exepected status "$1", got "$status "(likely remote server error)"$ERED - ((RES_FAIL++)) - __check_stop_at_error + if [ $retcode -ne 0 ]; then + __log_test_fail_status_code $1 $retcode "(likely remote server error)" return 1 fi if [ $status -ne $1 ]; then - echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED - ((RES_FAIL++)) - __check_stop_at_error + __log_test_fail_status_code $1 $status return 1 fi body=${res:0:${#res}-3} @@ -128,14 +124,11 @@ controller_api_get_A1_policy_ids() { 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 + __log_test_fail_body return 1 fi - ((RES_PASS++)) - echo -e $GREEN" PASS"$EGREEN + __log_test_pass return 0 } @@ -144,13 +137,11 @@ controller_api_get_A1_policy_ids() { # arg: OSC [] # (Function for test scripts) controller_api_get_A1_policy_type() { - echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD - echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG - ((RES_TEST++)) + __log_test_start $@ paramError=1 if [ $# -gt 3 ] && [ $2 == "OSC" ]; then - url="http://$3:$RIC_SIM_INTERNAL_PORT/a1-p/policytypes/$4" + url="$RIC_SIM_HTTPX://$3:$RIC_SIM_PORT/a1-p/policytypes/$4" paramError=0 fi @@ -163,17 +154,13 @@ controller_api_get_A1_policy_type() { retcode=$? status=${res:${#res}-3} - if [ $? -ne 0 ]; then - echo -e $RED" FAIL. Exepected status "$1", got "$status "(likely remote server error)"$ERED - ((RES_FAIL++)) - __check_stop_at_error + if [ $retcode -ne 0 ]; then + __log_test_fail_status_code $1 $retcode "(likely remote server error)" return 1 fi if [ $status -ne $1 ]; then - echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED - ((RES_FAIL++)) - __check_stop_at_error + __log_test_fail_status_code $1 $status return 1 fi body=${res:0:${#res}-3} @@ -187,15 +174,12 @@ controller_api_get_A1_policy_type() { 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 + __log_test_fail_body return 1 fi fi - ((RES_PASS++)) - echo -e $GREEN" PASS"$EGREEN + __log_test_pass return 0 } @@ -203,16 +187,14 @@ controller_api_get_A1_policy_type() { # arg: (STD ) | (OSC ) # (Function for test scripts) controller_api_delete_A1_policy() { - echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD - echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG - ((RES_TEST++)) + __log_test_start $@ paramError=1 if [ $# -eq 5 ] && [ $2 == "OSC" ]; then - url="http://$3:$RIC_SIM_INTERNAL_PORT/a1-p/policytypes/$4/policies/$UUID$5" + url="$RIC_SIM_HTTPX://$3:$RIC_SIM_PORT/a1-p/policytypes/$4/policies/$UUID$5" paramError=0 elif [ $# -eq 4 ] && [ $2 == "STD" ]; then - url="http://$3:$RIC_SIM_INTERNAL_PORT/A1-P/v1/policies/$UUID$4" + url="$RIC_SIM_HTTPX://$3:$RIC_SIM_PORT/A1-P/v1/policies/$UUID$4" paramError=0 fi @@ -225,22 +207,17 @@ controller_api_delete_A1_policy() { retcode=$? status=${res:${#res}-3} - if [ $? -ne 0 ]; then - echo -e $RED" FAIL. Exepected status "$1", got "$status "(likely remote server error)"$ERED - ((RES_FAIL++)) - __check_stop_at_error + if [ $retcode -ne 0 ]; then + __log_test_fail_status_code $1 $retcode "(likely remote server error)" return 1 fi if [ $status -ne $1 ]; then - echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED - ((RES_FAIL++)) - __check_stop_at_error + __log_test_fail_status_code $1 $status return 1 fi - ((RES_PASS++)) - echo -e $GREEN" PASS"$EGREEN + __log_test_pass return 0 } @@ -248,18 +225,16 @@ controller_api_delete_A1_policy() { # arg: (STD ) | (OSC ) # (Function for test scripts) controller_api_put_A1_policy() { - echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD - echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG - ((RES_TEST++)) + __log_test_start $@ paramError=1 if [ $# -eq 6 ] && [ $2 == "OSC" ]; then - url="http://$3:$RIC_SIM_INTERNAL_PORT/a1-p/policytypes/$4/policies/$UUID$5" + url="$RIC_SIM_HTTPX://$3:$RIC_SIM_PORT/a1-p/policytypes/$4/policies/$UUID$5" body=$(sed 's/XXX/'${5}'/g' $6) paramError=0 elif [ $# -eq 5 ] && [ $2 == "STD" ]; then - url="http://$3:$RIC_SIM_INTERNAL_PORT/A1-P/v1/policies/$UUID$4" + url="$RIC_SIM_HTTPX://$3:$RIC_SIM_PORT/A1-P/v1/policies/$UUID$4" body=$(sed 's/XXX/'${4}'/g' $5) paramError=0 fi @@ -273,22 +248,17 @@ controller_api_put_A1_policy() { retcode=$? status=${res:${#res}-3} - if [ $? -ne 0 ]; then - echo -e $RED" FAIL. Exepected status "$1", got "$status "(likely remote server error)"$ERED - ((RES_FAIL++)) - __check_stop_at_error + if [ $retcode -ne 0 ]; then + __log_test_fail_status_code $1 $retcode "(likely remote server error)" return 1 fi if [ $status -ne $1 ]; then - echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED - ((RES_FAIL++)) - __check_stop_at_error + __log_test_fail_status_code $1 $status return 1 fi - ((RES_PASS++)) - echo -e $GREEN" PASS"$EGREEN + __log_test_pass return 0 } @@ -297,14 +267,12 @@ controller_api_put_A1_policy() { # arg: (STD []) | (OSC ) # (Function for test scripts) controller_api_get_A1_policy_status() { - echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD - echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG - ((RES_TEST++)) + __log_test_start $@ targetJson="" paramError=1 if [ $# -ge 5 ] && [ $2 == "OSC" ]; then - url="http://$3:$RIC_SIM_INTERNAL_PORT/a1-p/policytypes/$4/policies/$UUID$5/status" + url="$RIC_SIM_HTTPX://$3:$RIC_SIM_PORT/a1-p/policytypes/$4/policies/$UUID$5/status" if [ $# -gt 5 ]; then targetJson="{\"instance_status\":\"$6\"" targetJson=$targetJson",\"has_been_deleted\":\"$7\"" @@ -312,7 +280,7 @@ controller_api_get_A1_policy_status() { fi paramError=0 elif [ $# -ge 4 ] && [ $2 == "STD" ]; then - url="http://$3:$RIC_SIM_INTERNAL_PORT/A1-P/v1/policies/$UUID$4/status" + url="$RIC_SIM_HTTPX://$3:$RIC_SIM_PORT/A1-P/v1/policies/$UUID$4/status" if [ $# -gt 4 ]; then targetJson="{\"enforceStatus\":\"$5\"" if [ $# -eq 6 ]; then @@ -332,17 +300,13 @@ controller_api_get_A1_policy_status() { retcode=$? status=${res:${#res}-3} - if [ $? -ne 0 ]; then - echo -e $RED" FAIL. Exepected status "$1", got "$status "(likely remote server error)"$ERED - ((RES_FAIL++)) - __check_stop_at_error + if [ $retcode -ne 0 ]; then + __log_test_fail_status_code $1 $retcode "(likely remote server error)" return 1 fi if [ $status -ne $1 ]; then - echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED - ((RES_FAIL++)) - __check_stop_at_error + __log_test_fail_status_code $1 $status return 1 fi @@ -353,14 +317,11 @@ controller_api_get_A1_policy_status() { 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 + __log_test_fail_body return 1 fi fi - ((RES_PASS++)) - echo -e $GREEN" PASS"$EGREEN + __log_test_pass return 0 } \ No newline at end of file