X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC850.sh;h=82e50f198fc68b9985fc7bc06ecd2cc3430a880b;hb=e0b665e3ff544bb78411bdc7f6b3ba2818fdeed4;hp=b6376f067becf0e5e894e3150c65a544b3b26b82;hpb=b65d77a754c356931b82c8edf6b29759d294ea51;p=nonrtric.git diff --git a/test/auto-test/FTC850.sh b/test/auto-test/FTC850.sh index b6376f06..82e50f19 100755 --- a/test/auto-test/FTC850.sh +++ b/test/auto-test/FTC850.sh @@ -17,14 +17,27 @@ # ============LICENSE_END================================================= # -TC_ONELINE_DESCR="Create/delete policies in parallel over a number of ric using a number of child process" +TC_ONELINE_DESCR="Create/delete policies in parallel over a number of rics using a number of child process" -#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 #### TEST BEGIN #### @@ -43,7 +56,7 @@ NUM_POLICIES_PER_RIC=500 generate_uuid if [ "$PMS_VERSION" == "V2" ]; then - notificationurl="http://localhost:80" + notificationurl=$CR_SERVICE_PATH"/test" else notificationurl="" fi @@ -58,7 +71,6 @@ for __httpx in $TESTED_PROTOCOLS ; do echo "#####################################################################" if [ $__httpx == "HTTPS" ]; then - CR_PATH="https://$CR_APP_NAME:$CR_EXTERNAL_SECURE_PORT/callbacks" use_cr_https use_simulator_https use_mr_https @@ -67,7 +79,6 @@ for __httpx in $TESTED_PROTOCOLS ; do fi use_agent_rest_https else - CR_PATH="http://$CR_APP_NAME:$CR_EXTERNAL_PORT/callbacks" use_cr_http use_simulator_http use_mr_http @@ -78,11 +89,19 @@ for __httpx in $TESTED_PROTOCOLS ; do fi # Clean container and start all needed containers # - clean_containers + clean_environment start_ric_simulators ricsim_g1 $NUM_RICS OSC_2.1.0 - start_consul_cbs + start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/application.properties + + start_policy_agent NORPOXY $SIM_GROUP/$POLICY_AGENT_COMPOSE_DIR/application.yaml + + set_agent_debug + + if [ $RUNMODE == "DOCKER" ]; then + start_consul_cbs + fi if [[ $interface = *"SDNC"* ]]; then start_sdnc @@ -91,15 +110,15 @@ for __httpx in $TESTED_PROTOCOLS ; do prepare_consul_config NOSDNC ".consul_config.json" fi - consul_config_app ".consul_config.json" + if [ $RUNMODE == "KUBE" ]; then + agent_load_config ".consul_config.json" + else + consul_config_app ".consul_config.json" + fi start_mr # Not used, but removes error messages from the agent log - start_control_panel - - start_policy_agent - - set_agent_debug + start_cr api_get_status 200 @@ -115,12 +134,12 @@ for __httpx in $TESTED_PROTOCOLS ; do done if [ "$PMS_VERSION" == "V2" ]; then - api_equal json:policy-types 1 120 #Wait for the agent to refresh types from the simulator + api_equal json:policy-types 1 300 #Wait for the agent to refresh types from the simulator else - api_equal json:policy_types 1 120 #Wait for the agent to refresh types from the simulator + api_equal json:policy_types 1 300 #Wait for the agent to refresh types from the simulator fi - api_put_service 201 "serv1" 600 "$CR_PATH/1" + api_put_service 201 "serv1" 600 "$CR_SERVICE_PATH/1" echo "Check the number of types in the agent for each ric is 1" for ((i=1; i<=$NUM_RICS; i++)) @@ -164,13 +183,16 @@ for __httpx in $TESTED_PROTOCOLS ; do for ((i=1; i<=$NUM_RICS; i++)) do if [ $interface == "REST+SDNC" ]; then - sim_contains_str ricsim_g1_$i remote_hosts "a1-controller" + sim_contains_str ricsim_g1_$i remote_hosts $SDNC_APP_NAME else - sim_contains_str ricsim_g1_$i remote_hosts "policy-agent" + sim_contains_str ricsim_g1_$i remote_hosts $POLICY_AGENT_APP_NAME fi done check_policy_agent_logs + if [[ $interface = *"SDNC"* ]]; then + check_sdnc_logs + fi store_logs "${__httpx}__${interface}" @@ -183,4 +205,4 @@ done print_result -auto_clean_containers \ No newline at end of file +auto_clean_environment \ No newline at end of file