Code Review / nonrtric.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Merge "Update Release Notes for Bronze"
[nonrtric.git] / test / common / agent_api_functions.sh
diff --git a/test/common/agent_api_functions.sh b/test/common/agent_api_functions.sh
index 958f914..1e1077b 100644 (file)
--- a/test/common/agent_api_functions.sh
+++ b/test/common/agent_api_functions.sh
@@ -251,7 +251,7 @@ api_get_policies() {
        fi
 
     if [ $paramError -ne 0 ]; then
-        __print_err "<response-code> <ric-id>|NORIC <service-id>|NOSERVICE <policy-ype-id>|NOTYPE [ NOID | [<policy-id> <ric-id> <service-id> EMPTY|<policy-type-id> <template-file>]*]" $@
+        __print_err "<response-code> <ric-id>|NORIC <service-id>|NOSERVICE <policy-type-id>|NOTYPE [ NOID | [<policy-id> <ric-id> <service-id> EMPTY|<policy-type-id> <template-file>]*]" $@
         return 1
     fi
        queryparams=""
@@ -280,6 +280,7 @@ api_get_policies() {
        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,7 +297,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
@@ -316,6 +317,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,13 +341,14 @@ api_get_policy() {
         return 1
     fi
 
-       query="/policy?id=$2"
+       query="/policy?id=$UUID$2"
        res="$(__do_curl_to_agent 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
 
@@ -360,6 +363,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 +382,7 @@ api_put_policy() {
        ((RES_TEST++))
 
     if [ $# -lt 7 ] || [ $# -gt 8 ]; then
-        __print_err "<response-code> <service-name> <ric-id> <policytype-id> <policy-id> <transient> <template-file> [<count>]" $@
+        __print_err "<response-code> <service-name> <ric-id> <policytype-id> <policy-id> <transient>|NOTRANSIENT <template-file> [<count>]" $@
         return 1
     fi
 
@@ -394,7 +398,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"
@@ -410,10 +414,10 @@ api_put_policy() {
        status=${res:${#res}-3}
                echo -ne " Creating "$count"("$max")${SAMELINE}"
                if [ $status -ne $1 ]; then
-                       let pid=$pid+1
                        echo " Created "$count"?("$max")"
                        echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
                        ((RES_FAIL++))
+                       __check_stop_at_error
                        return 1
                fi
 
@@ -453,7 +457,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"
@@ -470,10 +474,10 @@ api_put_policy_batch() {
                echo -ne " Requested(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}
@@ -492,10 +496,10 @@ api_put_policy_batch() {
                echo -ne " Created(batch) "$count"("$max")${SAMELINE}"
 
                if [ $status -ne $1 ]; then
-                       let pid=$pid+1
                        echo " Created(batch) "$count"?("$max")"
                        echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
                        ((RES_FAIL++))
+                       __check_stop_at_error
                        return 1
                fi
 
@@ -555,8 +559,12 @@ api_put_policy_parallel() {
 
        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 $start_id $template $count $pids $i > ".pid${i}.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 {})
@@ -591,6 +599,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,7 +626,7 @@ api_delete_policy() {
        pid=$2
 
        while [ $count -lt $max ]; do
-               query="/policy?id="$pid
+               query="/policy?id="$UUID$pid
                res="$(__do_curl_to_agent DELETE $query)"
                status=${res:${#res}-3}
                echo -ne " Deleting "$count"("$max")${SAMELINE}"
@@ -626,6 +635,7 @@ api_delete_policy() {
                        echo " Deleted "$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
@@ -662,16 +672,16 @@ api_delete_policy_batch() {
        pid=$2
        ARR=""
        while [ $count -lt $max ]; do
-               query="/policy?id="$pid
+               query="/policy?id="$UUID$pid
                res="$(__do_curl_to_agent DELETE_BATCH $query)"
                status=${res:${#res}-3}
                echo -ne " Requested(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}
@@ -691,10 +701,10 @@ api_delete_policy_batch() {
                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,8 +746,12 @@ api_delete_policy_parallel() {
 
        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 $start_id $count $pids $i > ".pid${i}.del.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 {})
@@ -772,6 +786,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
 }
 
@@ -816,6 +831,7 @@ api_get_policy_ids() {
        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 +844,7 @@ api_get_policy_ids() {
                                targetJson=$targetJson","
                        fi
                        if [ $pid != "NOID" ]; then
-                               targetJson=$targetJson"\"$pid\""
+                               targetJson=$targetJson"\"$UUID$pid\""
                        fi
                done
 
@@ -839,6 +855,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
@@ -868,6 +885,7 @@ api_get_policy_schema() {
        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 +900,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
@@ -915,6 +934,7 @@ api_get_policy_schemas() {
        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 +960,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,7 +1001,7 @@ 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)"
     status=${res:${#res}-3}
@@ -988,6 +1009,7 @@ api_get_policy_status() {
        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 +1020,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
 
@@ -1033,6 +1056,7 @@ api_get_policy_types() {
        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 +1081,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
@@ -1088,6 +1113,7 @@ api_get_status() {
        if [ $status -ne $1 ]; then
                echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
                ((RES_FAIL++))
+               __check_stop_at_error
                return 1
        fi
 
@@ -1120,6 +1146,7 @@ api_get_ric() {
        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 +1155,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
@@ -1163,6 +1191,7 @@ api_get_rics() {
        if [ $status -ne $1 ]; then
                echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
                ((RES_FAIL++))
+               __check_stop_at_error
                return 1
        fi
 
@@ -1172,6 +1201,7 @@ api_get_rics() {
                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
 
@@ -1181,6 +1211,7 @@ api_get_rics() {
                if [ $res -ne 0 ]; then
                        echo -e $RED" FAIL, returned body not correct"$ERED
                        ((RES_FAIL++))
+                       __check_stop_at_error
                        return 1
                fi
        fi
@@ -1217,6 +1248,7 @@ api_put_service() {
        if [ $status -ne $1 ]; then
                echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
                ((RES_FAIL++))
+               __check_stop_at_error
                return 1
        fi
 
@@ -1264,6 +1296,7 @@ api_get_services() {
        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 +1323,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
@@ -1319,6 +1353,7 @@ api_get_service_ids() {
        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 +1373,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
 
@@ -1366,6 +1402,7 @@ api_delete_services() {
        if [ $status -ne $1 ]; then
                echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
                ((RES_FAIL++))
+               __check_stop_at_error
                return 1
        fi
 
@@ -1394,6 +1431,7 @@ api_put_services_keepalive() {
        if [ $status -ne $1 ]; then
                echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
                ((RES_FAIL++))
+               __check_stop_at_error
                return 1
        fi
 
Parent repository for the O-RAN SC Non Real-Time RIC (NONRTRIC) project.