X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC850.sh;h=4b795c0865feabd191ff64b13bd8a887b15eadb5;hb=f83c362e67d25a464b80faf6d8363ccacacc5ebb;hp=bd61b3af89bd6c709f2e184c2457b3f978991efe;hpb=534a1fe8136ed8d72615707008bdd6061d1df2fe;p=nonrtric.git diff --git a/test/auto-test/FTC850.sh b/test/auto-test/FTC850.sh index bd61b3af..4b795c08 100755 --- a/test/auto-test/FTC850.sh +++ b/test/auto-test/FTC850.sh @@ -20,10 +20,10 @@ 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 KUBEPROXY" +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 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="" @@ -33,7 +33,7 @@ KUBE_PRESTARTED_IMAGES="" CONDITIONALLY_IGNORED_IMAGES="NGW" #Supported test environment profiles -SUPPORTED_PROFILES="ONAP-GUILIN ONAP-HONOLULU ONAP-ISTANBUL ORAN-CHERRY ORAN-D-RELEASE ORAN-E-RELEASE" +SUPPORTED_PROFILES="ONAP-JAKARTA ONAP-KOHN ONAP-LONDON ORAN-F-RELEASE ORAN-G-RELEASE ORAN-H-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" @@ -49,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 @@ -57,18 +57,14 @@ NUM_POLICIES_PER_RIC=500 generate_policy_uuid -if [ "$PMS_VERSION" == "V2" ]; then - notificationurl=$CR_SERVICE_APP_PATH_0"/test" -else - notificationurl="" -fi +notificationurl=$CR_SERVICE_APP_PATH_0"/test" for __httpx in $TESTED_PROTOCOLS ; do for interface in $TESTED_VARIANTS ; do echo "#####################################################################" echo "#####################################################################" - echo "### Testing agent: "$interface" and "$__httpx + echo "### Testing a1pms: "$interface" and "$__httpx echo "#####################################################################" echo "#####################################################################" @@ -79,7 +75,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 @@ -87,7 +83,7 @@ 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 # @@ -103,32 +99,32 @@ 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 + start_a1pms NORPOXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE + + set_a1pms_debug - set_agent_debug - if [ $RUNMODE == "DOCKER" ]; then - start_consul_cbs - fi if [[ $interface = *"SDNC"* ]]; then start_sdnc - prepare_consul_config SDNC ".consul_config.json" + prepare_a1pms_config SDNC ".a1pms_config.json" else - prepare_consul_config NOSDNC ".consul_config.json" + prepare_a1pms_config NOSDNC ".a1pms_config.json" fi 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 - 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 1 - api_get_status 200 + sleep_wait 120 "Let A1PMS cofiguration take effect" + + a1pms_api_get_status 200 for ((i=1; i<=$NUM_RICS; i++)) do @@ -141,34 +137,26 @@ 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 - else - api_equal json:policy_types 1 300 #Wait for the agent to refresh types from the simulator - fi + a1pms_equal json:policy-types 1 300 #Wait for the a1pms to refresh types from the simulator - api_put_service 201 "serv1" 600 "$CR_SERVICE_APP_PATH_0/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 - else - api_equal json:policy_types?ric=ricsim_g1_$i 1 120 - fi + a1pms_equal json:policy-types?ric_id=ricsim_g1_$i 1 120 done START_ID=2000 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 @@ -177,11 +165,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 @@ -193,11 +181,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