Merge "Small change installation guide A1 Controller"

[nonrtric.git] / test / common / controller_api_functions.sh

diff --git a/test/common/controller_api_functions.sh b/test/common/controller_api_functions.sh
index 25de2a9..daab47c 100644 (file)
--- a/test/common/controller_api_functions.sh
+++ b/test/common/controller_api_functions.sh
@@ -41,9 +41,9 @@ __do_curl_to_controller() {
         body=$(echo "$3" | sed 's/"/\\"/g')
         json='{"input":{"near-rt-ric-url":"'$2'","body":"'"$body"'"}}'
     fi
-    echo "$json" > .sndc.payload.json
+    echo "$json" > .sdnc.payload.json
     echo "  FILE: $json"  >> $HTTPLOG
-    curlString="curl -sw %{http_code} -X POST http://$SDNC_USER:$SDNC_PWD@localhost:$SDNC_EXTERNAL_PORT$SDNC_API_URL$1 -H accept:application/json -H Content-Type:application/json --data-binary @.sndc.payload.json"
+    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"
     echo "  CMD: "$curlString >> $HTTPLOG
     res=$($curlString)
     retcode=$?
@@ -61,6 +61,7 @@ __do_curl_to_controller() {
         return 1
     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)
     echo "  EXTRACED BODY+CODE: "$res >> $HTTPLOG
@@ -97,12 +98,14 @@ controller_api_get_A1_policy_ids() {
     if [ $? -ne 0 ]; then
                echo -e $RED" FAIL. Exepected status "$1", got "$status "(likely remote server error)"$ERED
                ((RES_FAIL++))
+               __check_stop_at_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
                return 1
        fi
     body=${res:0:${#res}-3}
@@ -127,6 +130,7 @@ controller_api_get_A1_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
 
@@ -162,12 +166,14 @@ controller_api_get_A1_policy_type() {
     if [ $? -ne 0 ]; then
                echo -e $RED" FAIL. Exepected status "$1", got "$status "(likely remote server error)"$ERED
                ((RES_FAIL++))
+               __check_stop_at_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
                return 1
        fi
     body=${res:0:${#res}-3}
@@ -183,6 +189,7 @@ controller_api_get_A1_policy_type() {
                if [ $res -ne 0 ]; then
                        echo -e $RED" FAIL, returned body not correct"$ERED
                        ((RES_FAIL++))
+                       __check_stop_at_error
                        return 1
                fi
        fi
@@ -221,12 +228,14 @@ controller_api_delete_A1_policy() {
     if [ $? -ne 0 ]; then
                echo -e $RED" FAIL. Exepected status "$1", got "$status "(likely remote server error)"$ERED
                ((RES_FAIL++))
+               __check_stop_at_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
                return 1
        fi
 
@@ -267,12 +276,14 @@ controller_api_put_A1_policy() {
     if [ $? -ne 0 ]; then
                echo -e $RED" FAIL. Exepected status "$1", got "$status "(likely remote server error)"$ERED
                ((RES_FAIL++))
+               __check_stop_at_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
                return 1
        fi
 
@@ -324,12 +335,14 @@ controller_api_get_A1_policy_status() {
     if [ $? -ne 0 ]; then
                echo -e $RED" FAIL. Exepected status "$1", got "$status "(likely remote server error)"$ERED
                ((RES_FAIL++))
+               __check_stop_at_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
                return 1
        fi
 
@@ -342,6 +355,7 @@ controller_api_get_A1_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
        fi