X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC900.sh;h=b3e4d29b4a9d9662129ace0283b9324ddea0809e;hb=e0b665e3ff544bb78411bdc7f6b3ba2818fdeed4;hp=32567973cb6b725b99424bbe1ae6f2df9766b9a6;hpb=f38e1e8cb3652e73ea1e76b5a1a77a4aeb108577;p=nonrtric.git diff --git a/test/auto-test/FTC900.sh b/test/auto-test/FTC900.sh index 32567973..b3e4d29b 100755 --- a/test/auto-test/FTC900.sh +++ b/test/auto-test/FTC900.sh @@ -19,22 +19,29 @@ TC_ONELINE_DESCR="Preparation for test of the Control Panel and the Health Check app - populating a number of ric simulators with types and instances" -#App names to include in the test, space separated list -INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM" +#App names to include in the test when running docker, space separated list +DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM" + +#App names to include in the test when running kubernetes, space separated list +KUBE_INCLUDED_IMAGES="CP CR MR PA RICSIM" +#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list +KUBE_PRESTARTED_IMAGES="" + +#Supported test environment profiles +SUPPORTED_PROFILES="ONAP-GUILIN ONAP-HONOLULU ORAN-CHERRY ORAN-DAWN" +#Supported run modes +SUPPORTED_RUNMODES="DOCKER KUBE" . ../common/testcase_common.sh $@ . ../common/agent_api_functions.sh . ../common/ricsimulator_api_functions.sh +. ../common/mr_api_functions.sh +. ../common/control_panel_api_functions.sh +. ../common/controller_api_functions.sh #### TEST BEGIN #### -#Local vars in test script -########################## -# Path to callback receiver -CR_PATH="http://$CR_APP_NAME:$CR_EXTERNAL_PORT/callbacks" -use_cr_http - -clean_containers +clean_environment OSC_NUM_RICS=6 STD_NUM_RICS=5 @@ -43,18 +50,29 @@ start_ric_simulators $RIC_SIM_PREFIX"_g1" $OSC_NUM_RICS OSC_2.1.0 start_ric_simulators $RIC_SIM_PREFIX"_g2" $STD_NUM_RICS STD_1.1.3 +if [ "$PMS_VERSION" == "V2" ]; then + start_ric_simulators $RIC_SIM_PREFIX"_g3" $STD_NUM_RICS STD_2.0.0 +fi + start_mr #Just to prevent errors in the agent log... -start_control_panel +start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/application.properties -start_consul_cbs +start_policy_agent NORPOXY $SIM_GROUP/$POLICY_AGENT_COMPOSE_DIR/application.yaml -prepare_consul_config NOSDNC ".consul_config.json" -consul_config_app ".consul_config.json" +use_agent_rest_http -start_policy_agent +if [ $RUNMODE == "DOCKER" ]; then + start_consul_cbs +fi -use_agent_rest_http +prepare_consul_config NOSDNC ".consul_config.json" + +if [ $RUNMODE == "KUBE" ]; then + agent_load_config ".consul_config.json" +else + consul_config_app ".consul_config.json" +fi api_get_status 200 @@ -71,6 +89,13 @@ do sim_print $RIC_SIM_PREFIX"_g2_"$i interface done +if [ "$PMS_VERSION" == "V2" ]; then + # Print the A1 version for STD 2.X + for ((i=1; i<=$STD_NUM_RICS; i++)) + do + sim_print $RIC_SIM_PREFIX"_g3_"$i interface + done +fi # Load the polictypes in osc for ((i=1; i<=$OSC_NUM_RICS; i++)) @@ -82,36 +107,83 @@ done #Check the number of schemas and the individual schemas in OSC -api_equal json:policy_types 4 120 - -for ((i=1; i<=$OSC_NUM_RICS; i++)) -do - api_equal json:policy_types?ric=$RIC_SIM_PREFIX"_g1_"$i 3 120 -done - -# Check the schemas in OSC -for ((i=1; i<=$OSC_NUM_RICS; i++)) -do - api_get_policy_schema 200 2 testdata/OSC/hw-agent-modified.json - api_get_policy_schema 200 100 testdata/OSC/qos-agent-modified.json - api_get_policy_schema 200 20008 testdata/OSC/tsa-agent-modified.json -done - +if [ "$PMS_VERSION" == "V2" ]; then + api_equal json:policy-types 4 300 + + for ((i=1; i<=$OSC_NUM_RICS; i++)) + do + api_equal json:policy-types?ric_id=$RIC_SIM_PREFIX"_g1_"$i 3 120 + done + + # Check the schemas in OSC + for ((i=1; i<=$OSC_NUM_RICS; i++)) + do + api_get_policy_type 200 2 testdata/OSC/hw-agent-modified.json + api_get_policy_type 200 100 testdata/OSC/qos-agent-modified.json + api_get_policy_type 200 20008 testdata/OSC/tsa-agent-modified.json + done +else + api_equal json:policy_types 4 300 + + for ((i=1; i<=$OSC_NUM_RICS; i++)) + do + api_equal json:policy_types?ric=$RIC_SIM_PREFIX"_g1_"$i 3 120 + done + + # Check the schemas in OSC + for ((i=1; i<=$OSC_NUM_RICS; i++)) + do + api_get_policy_schema 200 2 testdata/OSC/hw-agent-modified.json + api_get_policy_schema 200 100 testdata/OSC/qos-agent-modified.json + api_get_policy_schema 200 20008 testdata/OSC/tsa-agent-modified.json + done +fi + +if [ "$PMS_VERSION" == "V2" ]; then + + # Load the polictypes in std + for ((i=1; i<=$STD_NUM_RICS; i++)) + do + sim_put_policy_type 201 $RIC_SIM_PREFIX"_g3_"$i STD_QOS_0_2_0 demo-testdata/STD2/sim_qos.json + sim_put_policy_type 201 $RIC_SIM_PREFIX"_g3_"$i STD_QOS2_0.1.0 demo-testdata/STD2/sim_qos2.json + done + + #Check the number of schemas and the individual schemas in STD + api_equal json:policy-types 6 120 + + for ((i=1; i<=$STD_NUM_RICS; i++)) + do + api_equal json:policy-types?ric_id=$RIC_SIM_PREFIX"_g3_"$i 2 120 + done + + # Check the schemas in STD + for ((i=1; i<=$STD_NUM_RICS; i++)) + do + api_get_policy_type 200 STD_QOS_0_2_0 demo-testdata/STD2/qos-agent-modified.json + api_get_policy_type 200 'STD_QOS2_0.1.0' demo-testdata/STD2/qos2-agent-modified.json + done +fi # Create policies use_agent_rest_http -api_put_service 201 "Emergency-response-app" 0 "$CR_PATH/1" +api_put_service 201 "Emergency-response-app" 0 "$CR_SERVICE_PATH/1" + +if [ "$PMS_VERSION" == "V2" ]; then + notificationurl=$CR_SERVICE_PATH"/test" +else + notificationurl="" +fi # Create policies in OSC for ((i=1; i<=$OSC_NUM_RICS; i++)) do generate_uuid - api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 2 $((2000+$i)) NOTRANSIENT testdata/OSC/pihw_template.json 1 + api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 2 $((2000+$i)) NOTRANSIENT $notificationurl testdata/OSC/pihw_template.json 1 generate_uuid - api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 100 $((3000+$i)) NOTRANSIENT testdata/OSC/piqos_template.json 1 + api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 100 $((3000+$i)) NOTRANSIENT $notificationurl testdata/OSC/piqos_template.json 1 generate_uuid - api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 20008 $((4000+$i)) NOTRANSIENT testdata/OSC/pitsa_template.json 1 + api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 20008 $((4000+$i)) NOTRANSIENT $notificationurl testdata/OSC/pitsa_template.json 1 done @@ -126,7 +198,13 @@ done for ((i=1; i<=$STD_NUM_RICS; i++)) do generate_uuid - api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g2_"$i NOTYPE $((2100+$i)) NOTRANSIENT testdata/STD/pi1_template.json 1 + api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g2_"$i NOTYPE $((2100+$i)) NOTRANSIENT $notificationurl testdata/STD/pi1_template.json 1 + if [ "$PMS_VERSION" == "V2" ]; then + generate_uuid + api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g3_"$i STD_QOS_0_2_0 $((2300+$i)) NOTRANSIENT $notificationurl demo-testdata/STD2/pi1_template.json 1 + generate_uuid + api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g3_"$i 'STD_QOS2_0.1.0' $((2400+$i)) NOTRANSIENT $notificationurl demo-testdata/STD2/pi1_template.json 1 + fi done @@ -134,6 +212,9 @@ done for ((i=1; i<=$STD_NUM_RICS; i++)) do sim_equal $RIC_SIM_PREFIX"_g2_"$i num_instances 1 + if [ "$PMS_VERSION" == "V2" ]; then + sim_equal $RIC_SIM_PREFIX"_g3_"$i num_instances 2 + fi done check_policy_agent_logs