X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC350.sh;h=4f2244c93379a4e188a5b4432845b79f2d42218f;hb=647744d8ab625d28ea0ecda3e6741e23ba9b0bc7;hp=692d9b5621efff4bc76059d0e668203649856500;hpb=496156d78828c000cbde44c96cc37c57032f2244;p=nonrtric.git diff --git a/test/auto-test/FTC350.sh b/test/auto-test/FTC350.sh index 692d9b56..4f2244c9 100755 --- a/test/auto-test/FTC350.sh +++ b/test/auto-test/FTC350.sh @@ -19,8 +19,8 @@ TC_ONELINE_DESCR="Change supported policy types and reconfigure rics" -#App names to exclude checking pulling images for, space separated list -EXCLUDED_IMAGES="SDNC_ONAP" +#App names to include in the test, space separated list +INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM SDNC" . ../common/testcase_common.sh $@ . ../common/agent_api_functions.sh @@ -78,7 +78,6 @@ for interface in $TESTED_VARIANTS ; do start_ric_simulators ricsim_g1 $NUM_RICS OSC_2.1.0 if [[ $interface = *"SDNC"* ]]; then - start_sdnc prepare_consul_config SDNC ".consul_config_all.json" else prepare_consul_config NOSDNC ".consul_config_all.json" @@ -87,6 +86,7 @@ for interface in $TESTED_VARIANTS ; do start_policy_agent set_agent_debug + set_agent_trace api_get_status 200 @@ -138,17 +138,31 @@ for interface in $TESTED_VARIANTS ; do sim_put_policy_type 201 ricsim_g1_8 5 testdata/OSC/sim_5.json sim_put_policy_type 201 ricsim_g1_9 5 testdata/OSC/sim_5.json - api_equal json:policy_types 5 120 - - echo "Check the number of types in the agent for each ric" - api_equal json:policy_types?ric=ricsim_g1_1 1 120 - api_equal json:policy_types?ric=ricsim_g1_2 2 120 - api_equal json:policy_types?ric=ricsim_g1_3 3 120 - api_equal json:policy_types?ric=ricsim_g1_4 4 120 - api_equal json:policy_types?ric=ricsim_g1_5 5 120 - api_equal json:policy_types?ric=ricsim_g1_6 4 120 - api_equal json:policy_types?ric=ricsim_g1_7 3 120 - api_equal json:policy_types?ric=ricsim_g1_8 2 120 + if [ "$PMS_VERSION" == "V2" ]; then + api_equal json:policy-types 5 120 + + echo "Check the number of types in the agent for each ric" + api_equal json:policy-types?ric_id=ricsim_g1_1 1 120 + api_equal json:policy-types?ric_id=ricsim_g1_2 2 120 + api_equal json:policy-types?ric_id=ricsim_g1_3 3 120 + api_equal json:policy-types?ric_id=ricsim_g1_4 4 120 + api_equal json:policy-types?ric_id=ricsim_g1_5 5 120 + api_equal json:policy-types?ric_id=ricsim_g1_6 4 120 + api_equal json:policy-types?ric_id=ricsim_g1_7 3 120 + api_equal json:policy-types?ric_id=ricsim_g1_8 2 120 + else + api_equal json:policy_types 5 120 + + echo "Check the number of types in the agent for each ric" + api_equal json:policy_types?ric=ricsim_g1_1 1 120 + api_equal json:policy_types?ric=ricsim_g1_2 2 120 + api_equal json:policy_types?ric=ricsim_g1_3 3 120 + api_equal json:policy_types?ric=ricsim_g1_4 4 120 + api_equal json:policy_types?ric=ricsim_g1_5 5 120 + api_equal json:policy_types?ric=ricsim_g1_6 4 120 + api_equal json:policy_types?ric=ricsim_g1_7 3 120 + api_equal json:policy_types?ric=ricsim_g1_8 2 120 + fi api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1:???? \ ricsim_g1_2:me1_ricsim_g1_2,me2_ricsim_g1_2:1,2:???? \ @@ -165,17 +179,33 @@ for interface in $TESTED_VARIANTS ; do api_equal json:rics 10 120 - echo "Check the number of types in the agent for each ric" - api_equal json:policy_types?ric=ricsim_g1_1 1 120 - api_equal json:policy_types?ric=ricsim_g1_2 2 120 - api_equal json:policy_types?ric=ricsim_g1_3 3 120 - api_equal json:policy_types?ric=ricsim_g1_4 4 120 - api_equal json:policy_types?ric=ricsim_g1_5 5 120 - api_equal json:policy_types?ric=ricsim_g1_6 4 120 - api_equal json:policy_types?ric=ricsim_g1_7 3 120 - api_equal json:policy_types?ric=ricsim_g1_8 2 120 - api_equal json:policy_types?ric=ricsim_g1_9 1 120 - api_equal json:policy_types?ric=ricsim_g1_10 0 120 + if [ "$PMS_VERSION" == "V2" ]; then + + echo "Check the number of types in the agent for each ric" + api_equal json:policy-types?ric_id=ricsim_g1_1 1 120 + api_equal json:policy-types?ric_id=ricsim_g1_2 2 120 + api_equal json:policy-types?ric_id=ricsim_g1_3 3 120 + api_equal json:policy-types?ric_id=ricsim_g1_4 4 120 + api_equal json:policy-types?ric_id=ricsim_g1_5 5 120 + api_equal json:policy-types?ric_id=ricsim_g1_6 4 120 + api_equal json:policy-types?ric_id=ricsim_g1_7 3 120 + api_equal json:policy-types?ric_id=ricsim_g1_8 2 120 + api_equal json:policy-types?ric_id=ricsim_g1_9 1 120 + api_equal json:policy-types?ric_id=ricsim_g1_10 0 120 + else + + echo "Check the number of types in the agent for each ric" + api_equal json:policy_types?ric=ricsim_g1_1 1 120 + api_equal json:policy_types?ric=ricsim_g1_2 2 120 + api_equal json:policy_types?ric=ricsim_g1_3 3 120 + api_equal json:policy_types?ric=ricsim_g1_4 4 120 + api_equal json:policy_types?ric=ricsim_g1_5 5 120 + api_equal json:policy_types?ric=ricsim_g1_6 4 120 + api_equal json:policy_types?ric=ricsim_g1_7 3 120 + api_equal json:policy_types?ric=ricsim_g1_8 2 120 + api_equal json:policy_types?ric=ricsim_g1_9 1 120 + api_equal json:policy_types?ric=ricsim_g1_10 0 120 + fi api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1:???? \ ricsim_g1_2:me1_ricsim_g1_2,me2_ricsim_g1_2:1,2:???? \ @@ -191,13 +221,27 @@ for interface in $TESTED_VARIANTS ; do #No policy type in sim #10 - api_equal json:policy_types 5 + if [ "$PMS_VERSION" == "V2" ]; then + api_equal json:policy-types 5 + else + api_equal json:policy_types 5 + fi api_put_service 201 "serv1" 3600 "$CR_PATH/serv1" - api_put_policy 201 "serv1" ricsim_g1_9 5 2000 NOTRANSIENT testdata/OSC/pi5_template.json 1 + if [ "$PMS_VERSION" == "V2" ]; then + notificationurl="http://localhost:80" + else + notificationurl="" + fi - api_equal json:policy_ids 1 + api_put_policy 201 "serv1" ricsim_g1_9 5 2000 NOTRANSIENT $notificationurl testdata/OSC/pi5_template.json 1 + + if [ "$PMS_VERSION" == "V2" ]; then + api_equal json:policy_instances 1 + else + api_equal json:policy_ids 1 + fi sim_equal ricsim_g1_9 num_instances 1 @@ -207,15 +251,27 @@ for interface in $TESTED_VARIANTS ; do api_equal json:rics 8 120 - echo "Check the number of types in the agent for each ric" - api_equal json:policy_types?ric=ricsim_g1_1 1 120 - api_equal json:policy_types?ric=ricsim_g1_2 2 120 - api_equal json:policy_types?ric=ricsim_g1_3 3 120 - api_equal json:policy_types?ric=ricsim_g1_4 4 120 - api_equal json:policy_types?ric=ricsim_g1_5 5 120 - api_equal json:policy_types?ric=ricsim_g1_6 4 120 - api_equal json:policy_types?ric=ricsim_g1_7 3 120 - api_equal json:policy_types?ric=ricsim_g1_8 2 120 + if [ "$PMS_VERSION" == "V2" ]; then + echo "Check the number of types in the agent for each ric" + api_equal json:policy-types?ric_id=ricsim_g1_1 1 120 + api_equal json:policy-types?ric_id=ricsim_g1_2 2 120 + api_equal json:policy-types?ric_id=ricsim_g1_3 3 120 + api_equal json:policy-types?ric_id=ricsim_g1_4 4 120 + api_equal json:policy-types?ric_id=ricsim_g1_5 5 120 + api_equal json:policy-types?ric_id=ricsim_g1_6 4 120 + api_equal json:policy-types?ric_id=ricsim_g1_7 3 120 + api_equal json:policy-types?ric_id=ricsim_g1_8 2 120 + else + echo "Check the number of types in the agent for each ric" + api_equal json:policy_types?ric=ricsim_g1_1 1 120 + api_equal json:policy_types?ric=ricsim_g1_2 2 120 + api_equal json:policy_types?ric=ricsim_g1_3 3 120 + api_equal json:policy_types?ric=ricsim_g1_4 4 120 + api_equal json:policy_types?ric=ricsim_g1_5 5 120 + api_equal json:policy_types?ric=ricsim_g1_6 4 120 + api_equal json:policy_types?ric=ricsim_g1_7 3 120 + api_equal json:policy_types?ric=ricsim_g1_8 2 120 + fi api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1:???? \ ricsim_g1_2:me1_ricsim_g1_2,me2_ricsim_g1_2:1,2:???? \ @@ -226,13 +282,17 @@ for interface in $TESTED_VARIANTS ; do ricsim_g1_7:me1_ricsim_g1_7,me2_ricsim_g1_7:3,4,5:???? \ ricsim_g1_8:me1_ricsim_g1_8,me2_ricsim_g1_8:4,5:???? " - sleep 120 + sleep_wait 120 - api_equal json:policy_ids 0 + if [ "$PMS_VERSION" == "V2" ]; then + api_equal json:policy_instances 0 + else + api_equal json:policy_ids 0 + fi api_get_policy_types 404 ricsim_g1_9 - sim_equal ricsim_g1_9 num_instances 1 + sim_equal ricsim_g1_9 num_instances 0 api_delete_policy 404 2000 @@ -241,17 +301,31 @@ for interface in $TESTED_VARIANTS ; do api_equal json:rics 10 120 - echo "Check the number of types in the agent for each ric" - api_equal json:policy_types?ric=ricsim_g1_1 1 120 - api_equal json:policy_types?ric=ricsim_g1_2 2 120 - api_equal json:policy_types?ric=ricsim_g1_3 3 120 - api_equal json:policy_types?ric=ricsim_g1_4 4 120 - api_equal json:policy_types?ric=ricsim_g1_5 5 120 - api_equal json:policy_types?ric=ricsim_g1_6 4 120 - api_equal json:policy_types?ric=ricsim_g1_7 3 120 - api_equal json:policy_types?ric=ricsim_g1_8 2 120 - api_equal json:policy_types?ric=ricsim_g1_9 1 120 - api_equal json:policy_types?ric=ricsim_g1_10 0 120 + if [ "$PMS_VERSION" == "V2" ]; then + echo "Check the number of types in the agent for each ric" + api_equal json:policy-types?ric_id=ricsim_g1_1 1 120 + api_equal json:policy-types?ric_id=ricsim_g1_2 2 120 + api_equal json:policy-types?ric_id=ricsim_g1_3 3 120 + api_equal json:policy-types?ric_id=ricsim_g1_4 4 120 + api_equal json:policy-types?ric_id=ricsim_g1_5 5 120 + api_equal json:policy-types?ric_id=ricsim_g1_6 4 120 + api_equal json:policy-types?ric_id=ricsim_g1_7 3 120 + api_equal json:policy-types?ric_id=ricsim_g1_8 2 120 + api_equal json:policy-types?ric_id=ricsim_g1_9 1 120 + api_equal json:policy-types?ric_id=ricsim_g1_10 0 120 + else + echo "Check the number of types in the agent for each ric" + api_equal json:policy_types?ric=ricsim_g1_1 1 120 + api_equal json:policy_types?ric=ricsim_g1_2 2 120 + api_equal json:policy_types?ric=ricsim_g1_3 3 120 + api_equal json:policy_types?ric=ricsim_g1_4 4 120 + api_equal json:policy_types?ric=ricsim_g1_5 5 120 + api_equal json:policy_types?ric=ricsim_g1_6 4 120 + api_equal json:policy_types?ric=ricsim_g1_7 3 120 + api_equal json:policy_types?ric=ricsim_g1_8 2 120 + api_equal json:policy_types?ric=ricsim_g1_9 1 120 + api_equal json:policy_types?ric=ricsim_g1_10 0 120 + fi api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1:???? \ ricsim_g1_2:me1_ricsim_g1_2,me2_ricsim_g1_2:1,2:???? \ @@ -264,9 +338,13 @@ for interface in $TESTED_VARIANTS ; do ricsim_g1_9:me1_ricsim_g1_9,me2_ricsim_g1_9:5:???? \ ricsim_g1_10:me1_ricsim_g1_10,me2_ricsim_g1_10:NOTYPE:???? " - sleep 120 + sleep_wait 120 - api_equal json:policy_ids 0 + if [ "$PMS_VERSION" == "V2" ]; then + api_equal json:policy_instances 0 + else + api_equal json:policy_ids 0 + fi sim_equal ricsim_g1_9 num_instances 0 @@ -276,18 +354,31 @@ for interface in $TESTED_VARIANTS ; do sim_delete_policy_type 204 ricsim_g1_6 4 sim_delete_policy_type 204 ricsim_g1_7 4 - sleep 120 - - api_equal json:policy_types?ric=ricsim_g1_1 1 120 - api_equal json:policy_types?ric=ricsim_g1_2 2 120 - api_equal json:policy_types?ric=ricsim_g1_3 3 120 - api_equal json:policy_types?ric=ricsim_g1_4 3 120 - api_equal json:policy_types?ric=ricsim_g1_5 4 120 - api_equal json:policy_types?ric=ricsim_g1_6 3 120 - api_equal json:policy_types?ric=ricsim_g1_7 2 120 - api_equal json:policy_types?ric=ricsim_g1_8 2 120 - api_equal json:policy_types?ric=ricsim_g1_9 1 120 - api_equal json:policy_types?ric=ricsim_g1_10 0 120 + sleep_wait 120 + + if [ "$PMS_VERSION" == "V2" ]; then + api_equal json:policy-types?ric_id=ricsim_g1_1 1 120 + api_equal json:policy-types?ric_id=ricsim_g1_2 2 120 + api_equal json:policy-types?ric_id=ricsim_g1_3 3 120 + api_equal json:policy-types?ric_id=ricsim_g1_4 3 120 + api_equal json:policy-types?ric_id=ricsim_g1_5 4 120 + api_equal json:policy-types?ric_id=ricsim_g1_6 3 120 + api_equal json:policy-types?ric_id=ricsim_g1_7 2 120 + api_equal json:policy-types?ric_id=ricsim_g1_8 2 120 + api_equal json:policy-types?ric_id=ricsim_g1_9 1 120 + api_equal json:policy-types?ric_id=ricsim_g1_10 0 120 + else + api_equal json:policy_types?ric=ricsim_g1_1 1 120 + api_equal json:policy_types?ric=ricsim_g1_2 2 120 + api_equal json:policy_types?ric=ricsim_g1_3 3 120 + api_equal json:policy_types?ric=ricsim_g1_4 3 120 + api_equal json:policy_types?ric=ricsim_g1_5 4 120 + api_equal json:policy_types?ric=ricsim_g1_6 3 120 + api_equal json:policy_types?ric=ricsim_g1_7 2 120 + api_equal json:policy_types?ric=ricsim_g1_8 2 120 + api_equal json:policy_types?ric=ricsim_g1_9 1 120 + api_equal json:policy_types?ric=ricsim_g1_10 0 120 + fi api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1:???? \ ricsim_g1_2:me1_ricsim_g1_2,me2_ricsim_g1_2:1,2:???? \ @@ -302,7 +393,11 @@ for interface in $TESTED_VARIANTS ; do sim_delete_policy_type 204 ricsim_g1_8 4 - api_equal json:policy_types?ric=ricsim_g1_8 1 120 + if [ "$PMS_VERSION" == "V2" ]; then + api_equal json:policy-types?ric_id=ricsim_g1_8 1 120 + else + api_equal json:policy_types?ric=ricsim_g1_8 1 120 + fi api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1:???? \ ricsim_g1_2:me1_ricsim_g1_2,me2_ricsim_g1_2:1,2:???? \ @@ -319,6 +414,7 @@ for interface in $TESTED_VARIANTS ; do check_policy_agent_logs store_logs ${interface} + done