From 08486cf3a7972219c3d017d5e47a2c802b225794 Mon Sep 17 00:00:00 2001 From: JohnKeeney Date: Tue, 24 May 2022 12:34:49 +0100 Subject: Attempt to get stdout&stderr for CSIT tests Also small tweak for RTD documentation Issue-ID: CCSDK-3675 Change-Id: Idd8acca0e07dc45c6f76a78a321b1075f3ee31ef Signed-off-by: JohnKeeney --- csit/scripts/healthcheck/data/preparePmsData.sh | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'csit/scripts/healthcheck') diff --git a/csit/scripts/healthcheck/data/preparePmsData.sh b/csit/scripts/healthcheck/data/preparePmsData.sh index 3891728f..c21747f5 100755 --- a/csit/scripts/healthcheck/data/preparePmsData.sh +++ b/csit/scripts/healthcheck/data/preparePmsData.sh @@ -32,6 +32,8 @@ a1_sim_OSC_port=${2:-30001} a1_sim_STD_port=${3:-30005} httpx=${4:-"http"} SHELL_FOLDER=$(cd "$(dirname "$0")";pwd) +ric1_id="ric1" +ric2_id="ric2" echo "using policy_agent port: "$policy_agent_port echo "using a1-sim-OSC port: "$a1_sim_OSC_port @@ -45,8 +47,21 @@ checkRes (){ exit 1; fi } +checkReturnContains(){ + for ((i=0; i<$1; i++)); do + res=$($2) + expect=$3 + echo "Check \"$4\" Expected to contain: \"$expect\" Received \"$res\"" + if [[ "$res" =~ "$expect" ]]; then + echo -e "$4 is as expected!\n" + break; + else + sleep 1 + fi + done +} -echo "policy agent status:" +echo "A1 policy management service status:" curlString="curl -skw %{http_code} $httpx://localhost:$policy_agent_port/status" res=$($curlString) echo "$res" @@ -86,6 +101,14 @@ expect="Policy type 2 is OK.201" checkRes echo -e "\n" +echo "check $ric1_id sync status:" +checkReturnContains 60 "curl -skw %{http_code} $httpx://localhost:$policy_agent_port/a1-policy/v2/rics/ric?ric_id=$ric1_id" "\"state\": \"AVAILABLE\"" "$ric1_id status" +echo -e "\n" + +echo "check $ric2_id sync status:" +checkReturnContains 60 "curl -skw %{http_code} $httpx://localhost:$policy_agent_port/a1-policy/v2/rics/ric?ric_id=$ric2_id" "\"state\": \"AVAILABLE\"" "$ric2_id status" +echo -e "\n" + for i in {1..300}; do echo "policy types from policy agent:" curlString="curl -skw %{http_code} $httpx://localhost:$policy_agent_port/a1-policy/v2/policy-types" -- cgit 1.2.3-korg