X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FPM_DEMO.sh;h=0b70495079ee9bb5848a2157f485b436741a8a89;hb=28ea034c54771d3680743f3885c97d6bc9eb7f7b;hp=c309ddc68b7f5051dc131b0331ebce115ff2f83a;hpb=b65d77a754c356931b82c8edf6b29759d294ea51;p=nonrtric.git diff --git a/test/auto-test/PM_DEMO.sh b/test/auto-test/PM_DEMO.sh index c309ddc6..0b704950 100755 --- a/test/auto-test/PM_DEMO.sh +++ b/test/auto-test/PM_DEMO.sh @@ -19,32 +19,45 @@ TC_ONELINE_DESCR="Preparation demo setup - 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 SDNC" +#App names to include in the test when running docker, space separated list +DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM SDNC" + +#App names to include in the test when running kubernetes, space separated list +KUBE_INCLUDED_IMAGES="CP CR MR PA RICSIM SDNC" +#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 +. ../common/cr_api_functions.sh +. ../common/consul_cbs_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_https +use_agent_rest_https +use_sdnc_https +use_simulator_https if [ "$PMS_VERSION" == "V2" ]; then - notificationurl="http://localhost:80" + notificationurl=$CR_SERVICE_PATH"/test" else notificationurl="" fi -use_cr_http -use_agent_rest_http -use_sdnc_http -use_simulator_http - -clean_containers +clean_environment OSC_NUM_RICS=6 STD_NUM_RICS=5 @@ -53,21 +66,31 @@ 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 -start_mr #Just to prevent errors in the agent log... +if [ "$PMS_VERSION" == "V2" ]; then + start_ric_simulators $RIC_SIM_PREFIX"_g3" $STD_NUM_RICS STD_2.0.0 +fi -start_control_panel +start_mr #Just to prevent errors in the agent log... -CR_PATH="https://$CR_APP_NAME:$CR_EXTERNAL_SECURE_PORT/callbacks" -use_cr_http +start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/application.properties start_sdnc -start_consul_cbs +start_policy_agent NORPOXY $SIM_GROUP/$POLICY_AGENT_COMPOSE_DIR/application.yaml + +set_agent_trace + +if [ $RUNMODE == "DOCKER" ]; then + start_consul_cbs +fi prepare_consul_config SDNC ".consul_config.json" -consul_config_app ".consul_config.json" -start_policy_agent +if [ $RUNMODE == "KUBE" ]; then + agent_load_config ".consul_config.json" +else + consul_config_app ".consul_config.json" +fi api_get_status 200 @@ -78,12 +101,20 @@ do done -# Print the A1 version for STD +# Print the A1 version for STD 1.X for ((i=1; i<=$STD_NUM_RICS; i++)) 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++)) @@ -95,7 +126,8 @@ done #Check the number of schemas and the individual schemas in OSC if [ "$PMS_VERSION" == "V2" ]; then - api_equal json:policy-types 3 120 + + api_equal json:policy-types 3 300 for ((i=1; i<=$OSC_NUM_RICS; i++)) do @@ -109,7 +141,7 @@ if [ "$PMS_VERSION" == "V2" ]; then api_get_policy_type 200 20008 demo-testdata/OSC/tsa-agent-modified.json done else - api_equal json:policy_types 3 120 + api_equal json:policy_types 3 300 for ((i=1; i<=$OSC_NUM_RICS; i++)) do @@ -125,10 +157,45 @@ else 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 5 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 + +#Check the number of types +if [ "$PMS_VERSION" == "V2" ]; then + api_equal json:policy-types 5 120 +else + api_equal json:policy_types 3 120 +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" # Create policies in OSC for ((i=1; i<=$OSC_NUM_RICS; i++)) @@ -152,6 +219,12 @@ 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 $notificationurl demo-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 @@ -159,9 +232,13 @@ 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 +check_sdnc_logs #### TEST COMPLETE ####