X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC900.sh;h=b9a6654054af67c94bb3b8f83a023ac59572b120;hb=d49bea61eb78af0058136cb8e16af0acd467f1f3;hp=7f5ca202c8cdd5f6632fc8896847e011504a5207;hpb=edea18a8fda2e2201cb3ede7f7af13f610bf4acc;p=nonrtric.git diff --git a/test/auto-test/FTC900.sh b/test/auto-test/FTC900.sh index 7f5ca202..b9a66540 100755 --- a/test/auto-test/FTC900.sh +++ b/test/auto-test/FTC900.sh @@ -20,10 +20,10 @@ 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 when running docker, space separated list -DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM NGW" +DOCKER_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM NGW KUBEPROXY" #App names to include in the test when running kubernetes, space separated list -KUBE_INCLUDED_IMAGES="CP CR MR PA RICSIM KUBEPROXY NGW" +KUBE_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM KUBEPROXY NGW" #Prestarted app (not started by script) to include in the test when running kubernetes, space separated list KUBE_PRESTARTED_IMAGES="" @@ -33,19 +33,11 @@ KUBE_PRESTARTED_IMAGES="" 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/consul_cbs_functions.sh -. ../common/kube_proxy_api_functions.sh -. ../common/gateway_api_functions.sh setup_testenvironment @@ -53,9 +45,7 @@ setup_testenvironment clean_environment -if [ $RUNMODE == "KUBE" ]; then - start_kube_proxy -fi +start_kube_proxy OSC_NUM_RICS=6 STD_NUM_RICS=5 @@ -64,11 +54,9 @@ 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 agent log... +start_mr #Just to prevent errors in the a1pms log... start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE @@ -76,23 +64,23 @@ if [ ! -z "$NRT_GATEWAY_APP_NAME" ]; then start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE fi -start_policy_agent NORPOXY $SIM_GROUP/$POLICY_AGENT_COMPOSE_DIR/$POLICY_AGENT_CONFIG_FILE +start_a1pms NORPOXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE + +use_a1pms_rest_http -use_agent_rest_http -if [ $RUNMODE == "DOCKER" ]; then - start_consul_cbs -fi -prepare_consul_config NOSDNC ".consul_config.json" +prepare_a1pms_config NOSDNC ".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 +95,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 for ((i=1; i<=$OSC_NUM_RICS; i++)) @@ -125,83 +111,59 @@ done #Check the number of schemas and the individual schemas in OSC -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 +a1pms_equal json:policy-types 4 300 -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 +for ((i=1; i<=$OSC_NUM_RICS; i++)) +do + a1pms_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 + a1pms_api_get_policy_type 200 2 testdata/OSC/hw-a1pms-modified.json + a1pms_api_get_policy_type 200 100 testdata/OSC/qos-a1pms-modified.json + a1pms_api_get_policy_type 200 20008 testdata/OSC/tsa-a1pms-modified.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 +a1pms_equal json:policy-types 6 120 + +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 + 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 # 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" -if [ "$PMS_VERSION" == "V2" ]; then - notificationurl=$CR_SERVICE_PATH"/test" -else - notificationurl="" -fi +notificationurl=$CR_SERVICE_APP_PATH_0"/test" # Create policies in OSC for ((i=1; i<=$OSC_NUM_RICS; i++)) do generate_policy_uuid - api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 2 $((2000+$i)) NOTRANSIENT $notificationurl testdata/OSC/pihw_template.json 1 + a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 2 $((2000+$i)) NOTRANSIENT $notificationurl testdata/OSC/pihw_template.json 1 generate_policy_uuid - api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 100 $((3000+$i)) NOTRANSIENT $notificationurl testdata/OSC/piqos_template.json 1 + a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 100 $((3000+$i)) NOTRANSIENT $notificationurl testdata/OSC/piqos_template.json 1 generate_policy_uuid - api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 20008 $((4000+$i)) NOTRANSIENT $notificationurl testdata/OSC/pitsa_template.json 1 + a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 20008 $((4000+$i)) NOTRANSIENT $notificationurl testdata/OSC/pitsa_template.json 1 done @@ -216,13 +178,11 @@ done for ((i=1; i<=$STD_NUM_RICS; i++)) do generate_policy_uuid - 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_policy_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_policy_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 + a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g2_"$i NOTYPE $((2100+$i)) NOTRANSIENT $notificationurl 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 @@ -230,12 +190,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 #### TEST COMPLETE ####