aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xcsit/scripts/healthcheck/data/preparePmsData.sh37
-rwxr-xr-xcsit/scripts/healthcheck/test/pms_a1sim_sdnc.sh23
-rw-r--r--csit/tests/healthcheck/test1.robot12
-rw-r--r--csit/tests/healthcheck/test2.robot14
-rw-r--r--csit/tests/healthcheck/test3.robot14
5 files changed, 70 insertions, 30 deletions
diff --git a/csit/scripts/healthcheck/data/preparePmsData.sh b/csit/scripts/healthcheck/data/preparePmsData.sh
index 383ceeb1..69dc92d2 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,25 @@ checkRes (){
exit 1;
fi
}
+checkReturnContains(){
+#arg 1 max time, seconds
+#arg 2 command
+#arg 3 value (regex)
+#arg 4 description
+ for ((i=0; i<$1; i++)); do
+ resin=$($2)
+ exp=$3
+ echo "Check \"$4\" Expected to contain: \"$exp\" Received \"$resin\""
+ if [[ $resin =~ $exp ]]; 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,7 +105,15 @@ expect="Policy type 2 is OK.201"
checkRes
echo -e "\n"
-for i in {1..60}; do
+echo "check $ric1_id sync status:"
+checkReturnContains 90 "curl -skw %{http_code} $httpx://localhost:$policy_agent_port/a1-policy/v2/rics/ric?ric_id=$ric1_id" "\"state\"\s*:\s*\"AVAILABLE\"" "$ric1_id status"
+echo -e "\n"
+
+echo "check $ric2_id sync status:"
+checkReturnContains 30 "curl -skw %{http_code} $httpx://localhost:$policy_agent_port/a1-policy/v2/rics/ric?ric_id=$ric2_id" "\"state\"\s*:\s*\"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"
res=$($curlString)
@@ -96,10 +123,14 @@ for i in {1..60}; do
echo -e "\n"
break;
else
- sleep $i
+ sleep 1
fi
done
+docker images
+docker ps -a
+docker logs policy-agent
+
echo "create service ric-registration to policy agent:"
curlString="curl -k -X PUT -sw %{http_code} -H accept:application/json -H Content-Type:application/json "$httpx://localhost:$policy_agent_port/a1-policy/v2/services" --data-binary @${SHELL_FOLDER}/testdata/v2/service.json"
res=$($curlString)
diff --git a/csit/scripts/healthcheck/test/pms_a1sim_sdnc.sh b/csit/scripts/healthcheck/test/pms_a1sim_sdnc.sh
index c80e68a9..29feb88a 100755
--- a/csit/scripts/healthcheck/test/pms_a1sim_sdnc.sh
+++ b/csit/scripts/healthcheck/test/pms_a1sim_sdnc.sh
@@ -32,15 +32,15 @@ chmod +x docker-compose
./docker-compose --env-file .env -f docker-compose.yml -f sdnc/docker-compose.yml up -d
checkStatus(){
- for i in {1..60}; do
- res=$($1)
+ for ((i=0; i<$1; i++)); do
+ res=$($2)
echo "$res"
- expect=$2
+ expect=$3
if [ "$res" == "$expect" ]; then
- echo -e "$3 is alive!\n"
+ echo -e "$4 is alive!\n"
break;
else
- sleep $i
+ sleep 1
fi
done
}
@@ -48,23 +48,26 @@ checkStatus(){
# check SIM1 status
echo "check SIM1 status:"
-checkStatus "curl -skw %{http_code} http://localhost:30001/" "OK200" "SIM1"
+checkStatus 60 "curl -skw %{http_code} http://localhost:30001/" "OK200" "SIM1"
# check SIM2 status
echo "check SIM2 status:"
-checkStatus "curl -skw %{http_code} http://localhost:30003/" "OK200" "SIM2"
+checkStatus 60 "curl -skw %{http_code} http://localhost:30003/" "OK200" "SIM2"
# check SIM3 status
echo "check SIM3 status:"
-checkStatus "curl -skw %{http_code} http://localhost:30005/" "OK200" "SIM3"
+checkStatus 60 "curl -skw %{http_code} http://localhost:30005/" "OK200" "SIM3"
# check PMS status
echo "check PMS status:"
-checkStatus "curl -skw %{http_code} http://localhost:8081/status" "hunky dory200" "PMS"
+checkStatus 60 "curl -skw %{http_code} http://localhost:8081/status" "hunky dory200" "PMS"
+
+curl -skw %{http_code} http://localhost:8081/actuator/loggers/org.onap.ccsdk.oran.a1policymanagementservice -X POST -H Content-Type:application/json -d '{"configuredLevel":"debug"}'
+curl -skw %{http_code} http://localhost:8081/actuator/loggers/org.onap.ccsdk.oran.a1policymanagementservice.tasks -X POST -H Content-Type:application/json -d '{"configuredLevel":"trace"}'
# check SDNC status
echo "check SDNC status:"
-checkStatus "curl -s -o /dev/null -I -w %{http_code} http://localhost:8282/apidoc/explorer/" "200" "SDNC"
+checkStatus 300 "curl -s -o /dev/null -I -w %{http_code} http://localhost:8282/apidoc/explorer/" "200" "SDNC"
cd ${SHELL_FOLDER}/../data
./preparePmsData.sh
diff --git a/csit/tests/healthcheck/test1.robot b/csit/tests/healthcheck/test1.robot
index bc9ec597..a8eba153 100644
--- a/csit/tests/healthcheck/test1.robot
+++ b/csit/tests/healthcheck/test1.robot
@@ -5,13 +5,15 @@ Library Process
*** Variables ***
${health_check} ${SCRIPTS}/healthcheck/test/health_check.sh
-
+${test1_stdout} ${OUTPUT_DIR}/test1_healthcheck_STDOUT.log
+${test1_stderr} ${OUTPUT_DIR}/test1_healthcheck_STDERR.log
*** Test Cases ***
Health check test case for NONRTRIC
- [Documentation] Health check
- Start Process ${health_check} shell=yes
- ${cli_cmd_output}= Wait For Process timeout=600
- Log ${cli_cmd_output.stdout}
+ [Documentation] Health check - Test 1
+ Log Variables
+ ${cli_cmd_output}= Run Process ${health_check} shell=no stdout=${test1_stdout} stderr=${test1_stderr}
+ Log Many Standard output: ${test1_stdout} ${\n} ${cli_cmd_output.stdout}
+ Log Many Standard error: ${test1_stderr} ${\n} ${cli_cmd_output.stderr}
Should Be Equal as Integers ${cli_cmd_output.rc} 0
diff --git a/csit/tests/healthcheck/test2.robot b/csit/tests/healthcheck/test2.robot
index 4e3e6c0e..ae51982e 100644
--- a/csit/tests/healthcheck/test2.robot
+++ b/csit/tests/healthcheck/test2.robot
@@ -4,14 +4,16 @@ Library Process
*** Variables ***
-${pms_a1sim} ${SCRIPTS}/healthcheck/test/pms_a1sim.sh
-
+${pms_a1sim} ${SCRIPTS}/healthcheck/test/pms_a1sim.sh
+${test2_stdout} ${OUTPUT_DIR}/test2_pms_a1sim_STDOUT.log
+${test2_stderr} ${OUTPUT_DIR}/test2_pms_a1sim_STDERR.log
*** Test Cases ***
Health check test case for NONRTRIC
- [Documentation] Deploy NONRTRIC without SDNC
- Start Process ${pms_a1sim} shell=yes
- ${cli_cmd_output}= Wait For Process timeout=600
- Log ${cli_cmd_output.stdout}
+ [Documentation] Deploy NONRTRIC without SDNC - Test 2
+ Log Variables
+ ${cli_cmd_output}= Run Process ${pms_a1sim} shell=no stdout=${test2_stdout} stderr=${test2_stderr}
+ Log Many Standard output: ${test2_stdout} ${\n} ${cli_cmd_output.stdout}
+ Log Many Standard error: ${test2_stderr} ${\n} ${cli_cmd_output.stderr}
Should Be Equal as Integers ${cli_cmd_output.rc} 0
diff --git a/csit/tests/healthcheck/test3.robot b/csit/tests/healthcheck/test3.robot
index 05b58afd..f2687572 100644
--- a/csit/tests/healthcheck/test3.robot
+++ b/csit/tests/healthcheck/test3.robot
@@ -4,14 +4,16 @@ Library Process
*** Variables ***
-${pms_a1sim_sdnc} ${SCRIPTS}/healthcheck/test/pms_a1sim_sdnc.sh
-
+${pms_a1sim_sdnc} ${SCRIPTS}/healthcheck/test/pms_a1sim_sdnc.sh
+${test3_stdout} ${OUTPUT_DIR}/test3_pms_a1sim_sdnc_STDOUT.sh.log
+${test3_stderr} ${OUTPUT_DIR}/test3_pms_a1sim_sdnc_STDERR.sh.log
*** Test Cases ***
Health check test case for NONRTRIC
- [Documentation] Deploy NONRTRIC with SDNC
- Start Process ${pms_a1sim_sdnc} shell=yes
- ${cli_cmd_output}= Wait For Process timeout=600
- Log ${cli_cmd_output.stdout}
+ [Documentation] Deploy NONRTRIC with SDNC - Test 3
+ Log Variables
+ ${cli_cmd_output}= Run Process ${pms_a1sim_sdnc} shell=no stdout=${test3_stdout} stderr=${test3_stderr}
+ Log Many Standard output: ${test3_stdout} ${\n} ${cli_cmd_output.stdout}
+ Log Many Standard error: ${test3_stderr} ${\n} ${cli_cmd_output.stderr}
Should Be Equal as Integers ${cli_cmd_output.rc} 0