X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC110.sh;h=19a8b36b23bae23d1d9a6fdb1949c98d0608109c;hb=refs%2Fchanges%2F33%2F9733%2F1;hp=f855f6fa15de1435c2acfd7d462777042e11b32b;hpb=79e37003f5c94bfe12d197727dd31334e50397a6;p=nonrtric.git diff --git a/test/auto-test/FTC110.sh b/test/auto-test/FTC110.sh index f855f6fa..19a8b36b 100755 --- a/test/auto-test/FTC110.sh +++ b/test/auto-test/FTC110.sh @@ -21,20 +21,20 @@ TC_ONELINE_DESCR="Testing of service registration timeouts and keepalive" #App names to include in the test when running docker, space separated list -DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM NGW KUBEPROXY" +DOCKER_INCLUDED_IMAGES="CBS CONSUL 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="" #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" +CONDITIONALLY_IGNORED_IMAGES="CBS CONSUL NGW" #Supported test environment profiles -SUPPORTED_PROFILES="ONAP-GUILIN ONAP-HONOLULU ONAP-ISTANBUL ORAN-CHERRY ORAN-D-RELEASE ORAN-E-RELEASE" +SUPPORTED_PROFILES="ONAP-GUILIN ONAP-HONOLULU ONAP-ISTANBUL ONAP-JAKARTA ONAP-KOHN ONAP-LONDON ORAN-CHERRY ORAN-D-RELEASE ORAN-E-RELEASE ORAN-F-RELEASE ORAN-G-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" @@ -49,7 +49,7 @@ generate_policy_uuid use_cr_http use_simulator_http use_mr_http -use_agent_rest_http +use_a1pms_rest_http clean_environment @@ -57,7 +57,7 @@ start_kube_proxy start_ric_simulators ricsim_g1 1 OSC_2.1.0 start_ric_simulators ricsim_g2 1 STD_1.1.3 -if [ "$PMS_VERSION" == "V2" ]; then +if [ "$A1PMS_VERSION" == "V2" ]; then start_ric_simulators ricsim_g3 1 STD_2.0.0 fi @@ -65,212 +65,223 @@ start_mr start_cr 1 -if [ $RUNMODE == "DOCKER" ]; then - start_consul_cbs -fi - start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE 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 -prepare_consul_config NOSDNC ".consul_config.json" +__CONFIG_HEADER="NOHEADER" +if [ $RUNMODE == "KUBE" ]; then + __CONFIG_HEADER="HEADER" +else + if [[ "$A1PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then + __CONFIG_HEADER="HEADER" + fi +fi +prepare_consul_config NOSDNC ".consul_config.json" $__CONFIG_HEADER if [ $RUNMODE == "KUBE" ]; then - agent_load_config ".consul_config.json" + a1pms_load_config ".consul_config.json" else - consul_config_app ".consul_config.json" + if [[ "$A1PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then + a1pms_api_put_configuration 200 ".consul_config.json" + else + start_consul_cbs + consul_config_app ".consul_config.json" + fi fi -set_agent_debug +set_a1pms_debug mr_equal requests_submitted 0 -#Check agent alive -api_get_status 200 +sleep_wait 120 "Let A1PMS cofiguration take effect" + +#Check a1pms alive +a1pms_api_get_status 200 #Print simulator interface version sim_print ricsim_g1_1 interface sim_print ricsim_g2_1 interface -if [ "$PMS_VERSION" == "V2" ]; then +if [ "$A1PMS_VERSION" == "V2" ]; then sim_print ricsim_g3_1 interface fi -api_put_service 201 "service1" 15 "$CR_SERVICE_APP_PATH_0/service1" +a1pms_api_put_service 201 "service1" 15 "$CR_SERVICE_APP_PATH_0/service1" -api_get_services 200 "service1" "service1" 15 "$CR_SERVICE_APP_PATH_0/service1" +a1pms_api_get_services 200 "service1" "service1" 15 "$CR_SERVICE_APP_PATH_0/service1" -api_put_service 201 "service2" 120 "$CR_SERVICE_APP_PATH_0/service2" +a1pms_api_put_service 201 "service2" 120 "$CR_SERVICE_APP_PATH_0/service2" -api_get_services 200 "service2" "service2" 120 "$CR_SERVICE_APP_PATH_0/service2" +a1pms_api_get_services 200 "service2" "service2" 120 "$CR_SERVICE_APP_PATH_0/service2" -api_put_service 200 "service1" 50 "$CR_SERVICE_APP_PATH_0/service1" -api_put_service 200 "service2" 180 "$CR_SERVICE_APP_PATH_0/service2" +a1pms_api_put_service 200 "service1" 50 "$CR_SERVICE_APP_PATH_0/service1" +a1pms_api_put_service 200 "service2" 180 "$CR_SERVICE_APP_PATH_0/service2" -api_get_services 200 "service1" "service1" 50 "$CR_SERVICE_APP_PATH_0/service1" -api_get_services 200 "service2" "service2" 180 "$CR_SERVICE_APP_PATH_0/service2" +a1pms_api_get_services 200 "service1" "service1" 50 "$CR_SERVICE_APP_PATH_0/service1" +a1pms_api_get_services 200 "service2" "service2" 180 "$CR_SERVICE_APP_PATH_0/service2" -api_get_service_ids 200 "service1" "service2" +a1pms_api_get_service_ids 200 "service1" "service2" sleep_wait 30 "Waiting for keep alive timeout" -api_get_services 200 "service1" "service1" 50 "$CR_SERVICE_APP_PATH_0/service1" -api_get_services 200 "service2" "service2" 180 "$CR_SERVICE_APP_PATH_0/service2" +a1pms_api_get_services 200 "service1" "service1" 50 "$CR_SERVICE_APP_PATH_0/service1" +a1pms_api_get_services 200 "service2" "service2" 180 "$CR_SERVICE_APP_PATH_0/service2" sleep_wait 100 "Waiting for keep alive timeout" -api_get_services 404 "service1" -api_get_services 200 "service2" "service2" 180 "$CR_SERVICE_APP_PATH_0/service2" +a1pms_api_get_services 404 "service1" +a1pms_api_get_services 200 "service2" "service2" 180 "$CR_SERVICE_APP_PATH_0/service2" -api_delete_services 204 "service2" +a1pms_api_delete_services 204 "service2" -api_get_services 404 "service1" -api_get_services 404 "service2" +a1pms_api_get_services 404 "service1" +a1pms_api_get_services 404 "service2" -api_put_service 201 "service3" 60 "$CR_SERVICE_APP_PATH_0/service3" +a1pms_api_put_service 201 "service3" 60 "$CR_SERVICE_APP_PATH_0/service3" -api_get_services 200 "service3" "service3" 60 "$CR_SERVICE_APP_PATH_0/service3" +a1pms_api_get_services 200 "service3" "service3" 60 "$CR_SERVICE_APP_PATH_0/service3" sleep_wait 30 "Waiting for keep alive timeout" -api_put_service 200 "service3" 60 "$CR_SERVICE_APP_PATH_0/service3" +a1pms_api_put_service 200 "service3" 60 "$CR_SERVICE_APP_PATH_0/service3" sleep_wait 100 "Waiting for keep alive timeout" -api_get_services 404 "service3" +a1pms_api_get_services 404 "service3" -api_put_service 201 "service4" 120 "$CR_SERVICE_APP_PATH_0/service4" +a1pms_api_put_service 201 "service4" 120 "$CR_SERVICE_APP_PATH_0/service4" sleep_wait 60 "Waiting for keep alive timeout" -api_get_services 200 "service4" "service4" 120 "$CR_SERVICE_APP_PATH_0/service4" +a1pms_api_get_services 200 "service4" "service4" 120 "$CR_SERVICE_APP_PATH_0/service4" -api_put_services_keepalive 200 "service4" +a1pms_api_put_services_keepalive 200 "service4" sleep_wait 90 "Waiting for keep alive timeout" -api_get_services 200 "service4" "service4" 120 "$CR_SERVICE_APP_PATH_0/service4" +a1pms_api_get_services 200 "service4" "service4" 120 "$CR_SERVICE_APP_PATH_0/service4" -api_delete_services 204 "service4" +a1pms_api_delete_services 204 "service4" -api_get_services 404 "service4" +a1pms_api_get_services 404 "service4" -api_get_services 404 "service1" -api_get_services 404 "service2" -api_get_services 404 "service3" +a1pms_api_get_services 404 "service1" +a1pms_api_get_services 404 "service2" +a1pms_api_get_services 404 "service3" -api_get_service_ids 200 +a1pms_api_get_service_ids 200 -api_delete_services 404 "service1" -api_delete_services 404 "service2" -api_delete_services 404 "service3" -api_delete_services 404 "service4" +a1pms_api_delete_services 404 "service1" +a1pms_api_delete_services 404 "service2" +a1pms_api_delete_services 404 "service3" +a1pms_api_delete_services 404 "service4" -api_put_services_keepalive 404 "service1" -api_put_services_keepalive 404 "service2" -api_put_services_keepalive 404 "service3" -api_put_services_keepalive 404 "service4" +a1pms_api_put_services_keepalive 404 "service1" +a1pms_api_put_services_keepalive 404 "service2" +a1pms_api_put_services_keepalive 404 "service3" +a1pms_api_put_services_keepalive 404 "service4" # Policy delete after timeout -api_put_service 201 "service10" 600 "$CR_SERVICE_APP_PATH_0/service10" +a1pms_api_put_service 201 "service10" 600 "$CR_SERVICE_APP_PATH_0/service10" sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json -if [ "$PMS_VERSION" == "V2" ]; then +if [ "$A1PMS_VERSION" == "V2" ]; then sim_put_policy_type 201 ricsim_g3_1 STD_QOS2_0.1.0 testdata/STD2/sim_qos2.json - api_equal json:rics 3 300 + a1pms_equal json:rics 3 300 - #api_equal json:policy_schemas 2 120 + #a1pms_equal json:policy_schemas 2 120 - api_equal json:policy-types 3 120 + a1pms_equal json:policy-types 3 120 - api_equal json:policies 0 + a1pms_equal json:policies 0 else - api_equal json:rics 2 300 + a1pms_equal json:rics 2 300 - api_equal json:policy_schemas 2 120 + a1pms_equal json:policy_schemas 2 120 - api_equal json:policy_types 2 + a1pms_equal json:policy_types 2 - api_equal json:policies 0 + a1pms_equal json:policies 0 fi -if [ "$PMS_VERSION" == "V2" ]; then +if [ "$A1PMS_VERSION" == "V2" ]; then notificationurl=$CR_SERVICE_APP_PATH_0"/test" else notificationurl="" fi -api_put_policy 201 "service10" ricsim_g1_1 1 5000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json -api_put_policy 201 "service10" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json +a1pms_api_put_policy 201 "service10" ricsim_g1_1 1 5000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json +a1pms_api_put_policy 201 "service10" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json -if [ "$PMS_VERSION" == "V2" ]; then - api_put_policy 201 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5200 NOTRANSIENT $notificationurl testdata/STD2/pi_qos2_template.json - api_equal json:policies 3 +if [ "$A1PMS_VERSION" == "V2" ]; then + a1pms_api_put_policy 201 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5200 NOTRANSIENT $notificationurl testdata/STD2/pi_qos2_template.json + a1pms_equal json:policies 3 else - api_equal json:policies 2 + a1pms_equal json:policies 2 fi sim_equal ricsim_g1_1 num_instances 1 sim_equal ricsim_g2_1 num_instances 1 -api_put_policy 201 "service10" ricsim_g1_1 1 5001 true $notificationurl testdata/OSC/pi1_template.json -api_put_policy 201 "service10" ricsim_g2_1 NOTYPE 5101 true $notificationurl testdata/STD/pi1_template.json +a1pms_api_put_policy 201 "service10" ricsim_g1_1 1 5001 true $notificationurl testdata/OSC/pi1_template.json +a1pms_api_put_policy 201 "service10" ricsim_g2_1 NOTYPE 5101 true $notificationurl testdata/STD/pi1_template.json -if [ "$PMS_VERSION" == "V2" ]; then - api_put_policy 201 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5201 true $notificationurl testdata/STD2/pi_qos2_template.json - api_equal json:policies 6 +if [ "$A1PMS_VERSION" == "V2" ]; then + a1pms_api_put_policy 201 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5201 true $notificationurl testdata/STD2/pi_qos2_template.json + a1pms_equal json:policies 6 else - api_equal json:policies 4 + a1pms_equal json:policies 4 fi sim_equal ricsim_g1_1 num_instances 2 sim_equal ricsim_g2_1 num_instances 2 -if [ "$PMS_VERSION" == "V2" ]; then +if [ "$A1PMS_VERSION" == "V2" ]; then sim_equal ricsim_g3_1 num_instances 2 fi sim_post_delete_instances 200 ricsim_g1_1 sim_post_delete_instances 200 ricsim_g2_1 -if [ "$PMS_VERSION" == "V2" ]; then +if [ "$A1PMS_VERSION" == "V2" ]; then sim_post_delete_instances 200 ricsim_g3_1 fi #Wait for recreate of non transient policy -if [ "$PMS_VERSION" == "V2" ]; then - api_equal json:policies 3 180 +if [ "$A1PMS_VERSION" == "V2" ]; then + a1pms_equal json:policies 3 180 else - api_equal json:policies 2 180 + a1pms_equal json:policies 2 180 fi sim_equal ricsim_g1_1 num_instances 1 sim_equal ricsim_g2_1 num_instances 1 -if [ "$PMS_VERSION" == "V2" ]; then +if [ "$A1PMS_VERSION" == "V2" ]; then sim_equal ricsim_g3_1 num_instances 1 fi -api_put_service 200 "service10" 10 "$CR_SERVICE_APP_PATH_0/service10" +a1pms_api_put_service 200 "service10" 10 "$CR_SERVICE_APP_PATH_0/service10" #Wait for service expiry -api_equal json:policies 0 120 +a1pms_equal json:policies 0 120 sim_equal ricsim_g1_1 num_instances 0 sim_equal ricsim_g2_1 num_instances 0 -if [ "$PMS_VERSION" == "V2" ]; then +if [ "$A1PMS_VERSION" == "V2" ]; then sim_equal ricsim_g3_1 num_instances 0 fi -api_get_service_ids 200 +a1pms_api_get_service_ids 200 mr_equal requests_submitted 0 -check_policy_agent_logs +check_a1pms_logs #### TEST COMPLETE ####