X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC850.sh;h=52456caaadbdb9bd5be113a25be6b672a0daebc9;hb=4bedc3ee0dafa48108d79f81174a6e679acabd25;hp=451da3f2ccbf85393249824943f94c8468751cab;hpb=e6b019fac7bd4cc2610564909de61b983455661a;p=nonrtric.git diff --git a/test/auto-test/FTC850.sh b/test/auto-test/FTC850.sh index 451da3f2..52456caa 100755 --- a/test/auto-test/FTC850.sh +++ b/test/auto-test/FTC850.sh @@ -20,33 +20,24 @@ 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 when running docker, space separated list -DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM SDNC NGW" +DOCKER_INCLUDED_IMAGES="CBS CONSUL 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 KUBEPROXY NGW" +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" +CONDITIONALLY_IGNORED_IMAGES="CBS CONSUL NGW" #Supported test environment profiles -SUPPORTED_PROFILES="ONAP-GUILIN ONAP-HONOLULU ONAP-ISTANBUL ORAN-CHERRY ORAN-DAWN" +SUPPORTED_PROFILES="ONAP-GUILIN ONAP-HONOLULU ONAP-ISTANBUL ONAP-JAKARTA ORAN-CHERRY ORAN-D-RELEASE ORAN-E-RELEASE ORAN-F-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/cr_api_functions.sh -. ../common/kube_proxy_api_functions.sh -. ../common/gateway_api_functions.sh +. ../common/testcase_common.sh $@ setup_testenvironment @@ -58,7 +49,7 @@ setup_testenvironment # Tested variants of REST/DMAAP/SDNC config TESTED_VARIANTS="REST REST+SDNC" -#Test agent and simulator protocol versions (others are http only) +#Test a1pms and simulator protocol versions (others are http only) TESTED_PROTOCOLS="HTTP HTTPS" NUM_RICS=20 @@ -66,8 +57,8 @@ NUM_POLICIES_PER_RIC=500 generate_policy_uuid -if [ "$PMS_VERSION" == "V2" ]; then - notificationurl=$CR_SERVICE_PATH"/test" +if [ "$A1PMS_VERSION" == "V2" ]; then + notificationurl=$CR_SERVICE_APP_PATH_0"/test" else notificationurl="" fi @@ -77,7 +68,7 @@ for __httpx in $TESTED_PROTOCOLS ; do echo "#####################################################################" echo "#####################################################################" - echo "### Testing agent: "$interface" and "$__httpx + echo "### Testing a1pms: "$interface" and "$__httpx echo "#####################################################################" echo "#####################################################################" @@ -88,7 +79,7 @@ for __httpx in $TESTED_PROTOCOLS ; do if [[ $interface = *"SDNC"* ]]; then use_sdnc_https fi - use_agent_rest_https + use_a1pms_rest_https else use_cr_http use_simulator_http @@ -96,15 +87,13 @@ for __httpx in $TESTED_PROTOCOLS ; do if [[ $interface = *"SDNC"* ]]; then use_sdnc_http fi - use_agent_rest_http + use_a1pms_rest_http fi # Clean container and start all needed containers # clean_environment - if [ $RUNMODE == "KUBE" ]; then - start_kube_proxy - fi + start_kube_proxy start_ric_simulators ricsim_g1 $NUM_RICS OSC_2.1.0 @@ -114,13 +103,9 @@ for __httpx in $TESTED_PROTOCOLS ; do 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 - - set_agent_debug + start_a1pms NORPOXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE - if [ $RUNMODE == "DOCKER" ]; then - start_consul_cbs - fi + set_a1pms_debug if [[ $interface = *"SDNC"* ]]; then start_sdnc @@ -130,16 +115,21 @@ for __httpx in $TESTED_PROTOCOLS ; do fi 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 - start_mr # Not used, but removes error messages from the agent log + start_mr # Not used, but removes error messages from the a1pms log - start_cr + start_cr 1 - api_get_status 200 + a1pms_api_get_status 200 for ((i=1; i<=$NUM_RICS; i++)) do @@ -152,21 +142,21 @@ for __httpx in $TESTED_PROTOCOLS ; do sim_put_policy_type 201 ricsim_g1_$i 1 testdata/OSC/sim_1.json done - if [ "$PMS_VERSION" == "V2" ]; then - api_equal json:policy-types 1 300 #Wait for the agent to refresh types from the simulator + if [ "$A1PMS_VERSION" == "V2" ]; then + a1pms_equal json:policy-types 1 300 #Wait for the a1pms to refresh types from the simulator else - api_equal json:policy_types 1 300 #Wait for the agent to refresh types from the simulator + a1pms_equal json:policy_types 1 300 #Wait for the a1pms to refresh types from the simulator fi - api_put_service 201 "serv1" 600 "$CR_SERVICE_PATH/1" + a1pms_api_put_service 201 "serv1" 600 "$CR_SERVICE_APP_PATH_0/1" - echo "Check the number of types in the agent for each ric is 1" + echo "Check the number of types in the a1pms for each ric is 1" for ((i=1; i<=$NUM_RICS; i++)) do - if [ "$PMS_VERSION" == "V2" ]; then - api_equal json:policy-types?ric_id=ricsim_g1_$i 1 120 + if [ "$A1PMS_VERSION" == "V2" ]; then + a1pms_equal json:policy-types?ric_id=ricsim_g1_$i 1 120 else - api_equal json:policy_types?ric=ricsim_g1_$i 1 120 + a1pms_equal json:policy_types?ric=ricsim_g1_$i 1 120 fi done @@ -174,12 +164,12 @@ for __httpx in $TESTED_PROTOCOLS ; do start_timer "Create $((NUM_POLICIES_PER_RIC*$NUM_RICS)) polices over $interface using "$__httpx - api_put_policy_parallel 201 "serv1" ricsim_g1_ $NUM_RICS 1 $START_ID NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json $NUM_POLICIES_PER_RIC 7 + a1pms_api_put_policy_parallel 201 "serv1" ricsim_g1_ $NUM_RICS 1 $START_ID NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json $NUM_POLICIES_PER_RIC 7 print_timer "Create $((NUM_POLICIES_PER_RIC*$NUM_RICS)) polices over $interface using "$__httpx INSTANCES=$(($NUM_RICS*$NUM_POLICIES_PER_RIC)) - api_equal json:policies $INSTANCES + a1pms_equal json:policies $INSTANCES for ((i=1; i<=$NUM_RICS; i++)) do @@ -188,11 +178,11 @@ for __httpx in $TESTED_PROTOCOLS ; do start_timer "Delete $((NUM_POLICIES_PER_RIC*$NUM_RICS)) polices over $interface using "$__httpx - api_delete_policy_parallel 204 $NUM_RICS $START_ID $NUM_POLICIES_PER_RIC 7 + a1pms_api_delete_policy_parallel 204 $NUM_RICS $START_ID $NUM_POLICIES_PER_RIC 7 print_timer "Delete $((NUM_POLICIES_PER_RIC*$NUM_RICS)) polices over $interface using "$__httpx - api_equal json:policies 0 + a1pms_equal json:policies 0 for ((i=1; i<=$NUM_RICS; i++)) do @@ -204,11 +194,11 @@ for __httpx in $TESTED_PROTOCOLS ; do if [ $interface == "REST+SDNC" ]; then sim_contains_str ricsim_g1_$i remote_hosts $SDNC_APP_NAME else - sim_contains_str ricsim_g1_$i remote_hosts $POLICY_AGENT_APP_NAME + sim_contains_str ricsim_g1_$i remote_hosts $A1PMS_APP_NAME fi done - check_policy_agent_logs + check_a1pms_logs if [[ $interface = *"SDNC"* ]]; then check_sdnc_logs fi