X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FPM_DEMO.sh;h=f4adcd66063e0642f6d3e9eb6071a18fbaba3438;hb=f83c362e67d25a464b80faf6d8363ccacacc5ebb;hp=0b70495079ee9bb5848a2157f485b436741a8a89;hpb=f0019c8168b9d59f132ba47e939e8aa3ef324b7d;p=nonrtric.git diff --git a/test/auto-test/PM_DEMO.sh b/test/auto-test/PM_DEMO.sh index 0b704950..f4adcd66 100755 --- a/test/auto-test/PM_DEMO.sh +++ b/test/auto-test/PM_DEMO.sh @@ -20,26 +20,26 @@ TC_ONELINE_DESCR="Preparation demo setup - populating a number of ric simulators with types and instances" #App names to include in the test when running docker, space separated list -DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM SDNC" +DOCKER_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM SDNC NGW KUBEPROXY" #App names to include in the test when running kubernetes, space separated list -KUBE_INCLUDED_IMAGES="CP CR MR PA RICSIM SDNC" +KUBE_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM SDNC KUBEPROXY NGW" #Prestarted app (not started by script) to include in the test when running kubernetes, space separated list KUBE_PRESTARTED_IMAGES="" +#Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if +#the image is not configured in the supplied env_file +#Used for images not applicable to all supported profile +CONDITIONALLY_IGNORED_IMAGES="NGW" + #Supported test environment profiles -SUPPORTED_PROFILES="ONAP-GUILIN ONAP-HONOLULU ORAN-CHERRY ORAN-DAWN" +SUPPORTED_PROFILES="ONAP-JAKARTA ONAP-KOHN ONAP-LONDON ORAN-F-RELEASE ORAN-G-RELEASE ORAN-H-RELEASE" #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 + +setup_testenvironment #### TEST BEGIN #### @@ -47,18 +47,16 @@ SUPPORTED_RUNMODES="DOCKER KUBE" ########################## use_cr_https -use_agent_rest_https +use_a1pms_rest_https use_sdnc_https use_simulator_https -if [ "$PMS_VERSION" == "V2" ]; then - notificationurl=$CR_SERVICE_PATH"/test" -else - notificationurl="" -fi +notificationurl=$CR_SERVICE_APP_PATH_0"/test" clean_environment +start_kube_proxy + OSC_NUM_RICS=6 STD_NUM_RICS=5 @@ -66,33 +64,35 @@ 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_ric_simulators $RIC_SIM_PREFIX"_g3" $STD_NUM_RICS STD_2.0.0 + +start_mr #Just to prevent errors in the a1pms log... -start_mr #Just to prevent errors in the agent log... +start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE -start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/application.properties +if [ ! -z "$NRT_GATEWAY_APP_NAME" ]; then + start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE +fi start_sdnc -start_policy_agent NORPOXY $SIM_GROUP/$POLICY_AGENT_COMPOSE_DIR/application.yaml +start_a1pms NORPOXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE + +set_a1pms_trace -set_agent_trace -if [ $RUNMODE == "DOCKER" ]; then - start_consul_cbs -fi -prepare_consul_config SDNC ".consul_config.json" +prepare_a1pms_config SDNC ".a1pms_config.json" if [ $RUNMODE == "KUBE" ]; then - agent_load_config ".consul_config.json" + a1pms_load_config ".a1pms_config.json" else - consul_config_app ".consul_config.json" + a1pms_api_put_configuration 200 ".a1pms_config.json" fi -api_get_status 200 +sleep_wait 120 "Let A1PMS cofiguration take effect" + +a1pms_api_get_status 200 # Print the A1 version for OSC for ((i=1; i<=$OSC_NUM_RICS; i++)) @@ -107,13 +107,11 @@ 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 +# 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 # Load the polictypes in osc @@ -125,85 +123,59 @@ done #Check the number of schemas and the individual schemas in OSC -if [ "$PMS_VERSION" == "V2" ]; then - - api_equal json:policy-types 3 300 - - for ((i=1; i<=$OSC_NUM_RICS; i++)) - do - api_equal json:policy-types?ric_id=$RIC_SIM_PREFIX"_g1_"$i 2 120 - done - - # Check the schemas in OSC - for ((i=1; i<=$OSC_NUM_RICS; i++)) - do - api_get_policy_type 200 100 demo-testdata/OSC/qos-agent-modified.json - api_get_policy_type 200 20008 demo-testdata/OSC/tsa-agent-modified.json - done -else - api_equal json:policy_types 3 300 - - for ((i=1; i<=$OSC_NUM_RICS; i++)) - do - api_equal json:policy_types?ric=$RIC_SIM_PREFIX"_g1_"$i 2 120 - done - - # Check the schemas in OSC - for ((i=1; i<=$OSC_NUM_RICS; i++)) - do - api_get_policy_schema 200 100 demo-testdata/OSC/qos-agent-modified.json - api_get_policy_schema 200 20008 demo-testdata/OSC/tsa-agent-modified.json - done -fi - +a1pms_equal json:policy-types 3 300 +for ((i=1; i<=$OSC_NUM_RICS; i++)) +do + a1pms_equal json:policy-types?ric_id=$RIC_SIM_PREFIX"_g1_"$i 2 120 +done +# Check the schemas in OSC +for ((i=1; i<=$OSC_NUM_RICS; i++)) +do + a1pms_api_get_policy_type 200 100 demo-testdata/OSC/qos-a1pms-modified.json + a1pms_api_get_policy_type 200 20008 demo-testdata/OSC/tsa-a1pms-modified.json +done -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 +# 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 +#Check the number of schemas and the individual schemas in STD +a1pms_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 +for ((i=1; i<=$STD_NUM_RICS; i++)) +do + a1pms_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 schemas in STD +for ((i=1; i<=$STD_NUM_RICS; i++)) +do + a1pms_api_get_policy_type 200 STD_QOS_0_2_0 demo-testdata/STD2/qos-a1pms-modified.json + a1pms_api_get_policy_type 200 'STD_QOS2_0.1.0' demo-testdata/STD2/qos2-a1pms-modified.json +done #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 +a1pms_equal json:policy-types 5 120 # Create policies -use_agent_rest_http +use_a1pms_rest_http -api_put_service 201 "Emergency-response-app" 0 "$CR_SERVICE_PATH/1" +a1pms_api_put_service 201 "Emergency-response-app" 0 "$CR_SERVICE_APP_PATH_0/1" # 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 100 $((3000+$i)) NOTRANSIENT $notificationurl demo-testdata/OSC/piqos_template.json 1 - generate_uuid - api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 20008 $((4000+$i)) NOTRANSIENT $notificationurl demo-testdata/OSC/pitsa_template.json 1 + generate_policy_uuid + a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 100 $((3000+$i)) NOTRANSIENT $notificationurl demo-testdata/OSC/piqos_template.json 1 + generate_policy_uuid + a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 20008 $((4000+$i)) NOTRANSIENT $notificationurl demo-testdata/OSC/pitsa_template.json 1 done @@ -217,14 +189,12 @@ done # Create policies in STD 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 + generate_policy_uuid + a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g2_"$i NOTYPE $((2100+$i)) NOTRANSIENT $notificationurl demo-testdata/STD/pi1_template.json 1 + generate_policy_uuid + a1pms_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_policy_uuid + a1pms_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 done @@ -232,12 +202,10 @@ 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 + sim_equal $RIC_SIM_PREFIX"_g3_"$i num_instances 2 done -check_policy_agent_logs +check_a1pms_logs check_sdnc_logs #### TEST COMPLETE #### @@ -245,3 +213,5 @@ check_sdnc_logs store_logs END print_result + +auto_clean_environment \ No newline at end of file