Merge "Updates to test env and A1function test"

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

diff --git a/test/common/ricsimulator_api_functions.sh b/test/common/ricsimulator_api_functions.sh
index f4cbc02..67a398e 100644 (file)
--- a/test/common/ricsimulator_api_functions.sh
+++ b/test/common/ricsimulator_api_functions.sh
@@ -22,19 +22,16 @@
 
 
 # Excute a curl cmd towards a ricsimulator and check the response code.
-# args: <expected-response-code> <curl-cmd-string> [<file>]
+# args: <expected-response-code> <curl-cmd-string>
 __execute_curl_to_sim() {
        echo ${FUNCNAME[1]} "line: "${BASH_LINENO[1]} >> $HTTPLOG
        echo " CMD: $2" >> $HTTPLOG
-       if [ $# -eq 3 ]; then
-               echo " FILE: $(<$3)"  >> $HTTPLOG
-       fi
        res="$($2)"
        echo " RESP: $res" >> $HTTPLOG
        retcode=$?
     if [ $retcode -ne 0 ]; then
                echo " RETCODE: "$retcode
-        echo -e $RED"  ERROR - fatal error when executing curl."$ERED
+        echo -e $RED" FAIL - fatal error when executing curl."$ERED
         return 1
     fi
     status=${res:${#res}-3}
@@ -42,7 +39,7 @@ __execute_curl_to_sim() {
         echo -e $GREEN" OK"$EGREEN
         return 0
     fi
-    echo -e $RED"  ERROR - expected http response: "$1" but got http response: "$status $ERED
+    echo -e $RED" FAIL - expected http response: "$1" but got http response: "$status $ERED
     return 1
 }
 
@@ -82,6 +79,27 @@ sim_print() {
        echo -e $BOLD"INFO(${BASH_LINENO[0]}): $app, $2 = $(__do_curl $RIC_SIM_LOCALHOST$port/counter/$2)"$EBOLD
 }
 
+# Tests if a variable value in the RIC simulator contains the target string and and optional timeout
+# Arg: <ric-id> <variable-name> <target-value> - This test set pass or fail depending on if the variable contains
+# the target or not.
+# Arg: <ric-id> <variable-name> <target-value> <timeout-in-sec>  - This test waits up to the timeout seconds
+# before setting pass or fail depending on if the variable value contains the target
+# value or not.
+# (Function for test scripts)
+sim_contains_str() {
+
+       if [ $# -eq 3 ] || [ $# -eq 4 ]; then
+               app=$1
+               port=$(__find_sim_port $app)
+               __var_test $app "$RIC_SIM_LOCALHOST$port/counter/" $2 "contain_str" $3 $4
+               return 0
+       else
+               ((RES_CONF_FAIL++))
+               __print_err "needs three or four args: <ric-id> <sim-param> <target-value> [ timeout ]"
+               return 1
+       fi
+}
+
 # Simulator API: Put a policy type in a ric
 # args: <response-code> <ric-id> <policy-type-id> <policy-type-file>
 # (Function for test scripts)
@@ -97,7 +115,7 @@ sim_put_policy_type() {
 
     curlString="curl -X PUT -skw %{http_code} $RIC_SIM_LOCALHOST"$res"/policytype?id="$3" -H Content-Type:application/json --data-binary @"$4
 
-       __execute_curl_to_sim $1 "$curlString" $4
+       __execute_curl_to_sim $1 "$curlString"
        return $?
 }
 
@@ -193,7 +211,7 @@ sim_post_forcedelay() {
        app=$2
        res=$(__find_sim_port $app)
 
-    curlString="curl -X POST -skw %{http_code} $RIC_SIM_LOCALHOST$res/delay"
+    curlString="curl -X POST -skw %{http_code} $RIC_SIM_LOCALHOST$res/forcedelay"
        if [ $# -eq 3 ]; then
                curlString=$curlString"?delay="$3
        fi