Updated function test env with new tests and features

[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..c4ba71c 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