X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC800.sh;h=1ecd5ffba6f1ef2bc31bf7cf49df35fc6ebe6152;hb=f83c362e67d25a464b80faf6d8363ccacacc5ebb;hp=e509f6ce80d56f4c1426fdc42605f9a240f3f13c;hpb=09e21f39a3ffcfc2063110bcad028014b0056398;p=nonrtric.git diff --git a/test/auto-test/FTC800.sh b/test/auto-test/FTC800.sh index e509f6ce..1ecd5ffb 100755 --- a/test/auto-test/FTC800.sh +++ b/test/auto-test/FTC800.sh @@ -17,13 +17,13 @@ # ============LICENSE_END================================================= # -TC_ONELINE_DESCR="Create 10000 policies in sequence using http/https and Agent REST/DMAAP with/without SDNC controller" +TC_ONELINE_DESCR="Create 10000 policies in sequence using http/https and a1pms REST/DMAAP with/without SDNC controller" #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" @@ -53,7 +53,7 @@ NUM_POLICIES=10000 # Tested variants of REST/DMAAP/SDNC config TESTED_VARIANTS="NOSDNC 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" for __httpx in $TESTED_PROTOCOLS ; do @@ -61,7 +61,7 @@ for __httpx in $TESTED_PROTOCOLS ; do echo "#####################################################################" echo "#####################################################################" - echo "### Testing agent via $interface using $__httpx" + echo "### Testing a1pms via $interface using $__httpx" echo "#####################################################################" echo "#####################################################################" @@ -69,12 +69,12 @@ for __httpx in $TESTED_PROTOCOLS ; do use_cr_https use_simulator_https use_mr_https - use_agent_rest_https + use_a1pms_rest_https else use_cr_http use_simulator_http use_mr_http - use_agent_rest_http + use_a1pms_rest_http fi # Policy instance start id @@ -86,9 +86,7 @@ for __httpx in $TESTED_PROTOCOLS ; do 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 - start_ric_simulators ricsim_g3 1 STD_2.0.0 - fi + start_ric_simulators ricsim_g3 1 STD_2.0.0 start_mr @@ -100,158 +98,139 @@ 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_agent_debug + set_a1pms_debug mr_equal requests_submitted 0 + sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json + sim_put_policy_type 201 ricsim_g3_1 STD_QOS2_0.1.0 testdata/STD2/sim_qos2.json + + 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" - fi - - if [ $RUNMODE == "DOCKER" ]; then - start_consul_cbs + 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 + sleep_wait 120 "Let A1PMS cofiguration take effect" - api_get_status 200 + a1pms_api_get_status 200 sim_print ricsim_g1_1 interface sim_print ricsim_g2_1 interface - if [ "$PMS_VERSION" == "V2" ]; then - sim_print ricsim_g3_1 interface - fi - - sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json + sim_print ricsim_g3_1 interface - if [ "$PMS_VERSION" == "V2" ]; then - sim_put_policy_type 201 ricsim_g3_1 STD_QOS2_0.1.0 testdata/STD2/sim_qos2.json - - api_equal json:policy-types 3 300 #Wait for the agent to refresh types from the simulators - else - api_equal json:policy_types 2 300 #Wait for the agent to refresh types from the simulators - fi + a1pms_equal json:policy-types 3 300 #Wait for the a1pms to refresh types from the simulators - api_put_service 201 "serv1" 3600 "$CR_SERVICE_APP_PATH_0/1" + a1pms_api_put_service 201 "serv1" 3600 "$CR_SERVICE_APP_PATH_0/1" - if [ "$PMS_VERSION" == "V2" ]; then - notificationurl=$CR_SERVICE_APP_PATH_0"/test" - else - notificationurl="" - fi + notificationurl=$CR_SERVICE_APP_PATH_0"/test" - start_timer "Create polices in OSC via agent REST and $interface using "$__httpx - api_put_policy 201 "serv1" ricsim_g1_1 1 $START_ID NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json $NUM_POLICIES - print_timer "Create polices in OSC via agent REST and $interface using "$__httpx + start_timer "Create polices in OSC via a1pms REST and $interface using "$__httpx + a1pms_api_put_policy 201 "serv1" ricsim_g1_1 1 $START_ID NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json $NUM_POLICIES + print_timer "Create polices in OSC via a1pms REST and $interface using "$__httpx sim_equal ricsim_g1_1 num_instances $NUM_POLICIES START_ID=$(($START_ID+$NUM_POLICIES)) - start_timer "Create polices in STD via agent REST and $interface using "$__httpx - api_put_policy 201 "serv1" ricsim_g2_1 NOTYPE $START_ID NOTRANSIENT $notificationurl testdata/STD/pi1_template.json $NUM_POLICIES - print_timer "Create polices in STD via agent REST and $interface using "$__httpx + start_timer "Create polices in STD via a1pms REST and $interface using "$__httpx + a1pms_api_put_policy 201 "serv1" ricsim_g2_1 NOTYPE $START_ID NOTRANSIENT $notificationurl testdata/STD/pi1_template.json $NUM_POLICIES + print_timer "Create polices in STD via a1pms REST and $interface using "$__httpx sim_equal ricsim_g2_1 num_instances $NUM_POLICIES - if [ "$PMS_VERSION" == "V2" ]; then - START_ID=$(($START_ID+$NUM_POLICIES)) - start_timer "Create polices in STD 2 via agent REST and $interface using "$__httpx - api_put_policy 201 "serv1" ricsim_g3_1 STD_QOS2_0.1.0 $START_ID NOTRANSIENT $notificationurl testdata/STD2/pi_qos2_template.json $NUM_POLICIES - print_timer "Create polices in STD via agent REST and $interface using "$__httpx + START_ID=$(($START_ID+$NUM_POLICIES)) + + start_timer "Create polices in STD 2 via a1pms REST and $interface using "$__httpx + a1pms_api_put_policy 201 "serv1" ricsim_g3_1 STD_QOS2_0.1.0 $START_ID NOTRANSIENT $notificationurl testdata/STD2/pi_qos2_template.json $NUM_POLICIES + print_timer "Create polices in STD via a1pms REST and $interface using "$__httpx + + sim_equal ricsim_g3_1 num_instances $NUM_POLICIES - sim_equal ricsim_g3_1 num_instances $NUM_POLICIES - fi if [ $__httpx == "HTTPS" ]; then echo "Using secure ports towards dmaap" - use_agent_dmaap_https + use_a1pms_dmaap_https else echo "Using non-secure ports towards dmaap" - use_agent_dmaap_http + use_a1pms_dmaap_http fi START_ID=$(($START_ID+$NUM_POLICIES)) - start_timer "Create polices in OSC via agent DMAAP, one by one, and $interface using "$__httpx - api_put_policy 201 "serv1" ricsim_g1_1 1 $START_ID NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json $NUM_POLICIES - print_timer "Create polices in OSC via agent DMAAP, one by one, and $interface using "$__httpx + start_timer "Create polices in OSC via a1pms DMAAP, one by one, and $interface using "$__httpx + a1pms_api_put_policy 201 "serv1" ricsim_g1_1 1 $START_ID NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json $NUM_POLICIES + print_timer "Create polices in OSC via a1pms DMAAP, one by one, and $interface using "$__httpx sim_equal ricsim_g1_1 num_instances $((2*$NUM_POLICIES)) START_ID=$(($START_ID+$NUM_POLICIES)) - start_timer "Create polices in STD via agent DMAAP, one by one, and $interface using "$__httpx - api_put_policy 201 "serv1" ricsim_g2_1 NOTYPE $START_ID NOTRANSIENT $notificationurl testdata/STD/pi1_template.json $NUM_POLICIES - print_timer "Create polices in STD via agent DMAAP, one by one, and $interface using "$__httpx + start_timer "Create polices in STD via a1pms DMAAP, one by one, and $interface using "$__httpx + a1pms_api_put_policy 201 "serv1" ricsim_g2_1 NOTYPE $START_ID NOTRANSIENT $notificationurl testdata/STD/pi1_template.json $NUM_POLICIES + print_timer "Create polices in STD via a1pms DMAAP, one by one, and $interface using "$__httpx sim_equal ricsim_g2_1 num_instances $((2*$NUM_POLICIES)) - if [ "$PMS_VERSION" == "V2" ]; then - START_ID=$(($START_ID+$NUM_POLICIES)) + START_ID=$(($START_ID+$NUM_POLICIES)) - start_timer "Create polices in STD 2 via agent DMAAP, one by one, and $interface using "$__httpx - api_put_policy 201 "serv1" ricsim_g3_1 STD_QOS2_0.1.0 $START_ID NOTRANSIENT $notificationurl testdata/STD2/pi_qos2_template.json $NUM_POLICIES - print_timer "Create polices in STD via agent DMAAP, one by one, and $interface using "$__httpx + start_timer "Create polices in STD 2 via a1pms DMAAP, one by one, and $interface using "$__httpx + a1pms_api_put_policy 201 "serv1" ricsim_g3_1 STD_QOS2_0.1.0 $START_ID NOTRANSIENT $notificationurl testdata/STD2/pi_qos2_template.json $NUM_POLICIES + print_timer "Create polices in STD via a1pms DMAAP, one by one, and $interface using "$__httpx + + sim_equal ricsim_g3_1 num_instances $((2*$NUM_POLICIES)) - sim_equal ricsim_g3_1 num_instances $((2*$NUM_POLICIES)) - fi START_ID=$(($START_ID+$NUM_POLICIES)) - start_timer "Create polices in OSC via agent DMAAP in batch and $interface using "$__httpx - api_put_policy_batch 201 "serv1" ricsim_g1_1 1 $START_ID NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json $NUM_POLICIES - print_timer "Create polices in OSC via agent DMAAP in batch and $interface using "$__httpx + start_timer "Create polices in OSC via a1pms DMAAP in batch and $interface using "$__httpx + a1pms_api_put_policy_batch 201 "serv1" ricsim_g1_1 1 $START_ID NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json $NUM_POLICIES + print_timer "Create polices in OSC via a1pms DMAAP in batch and $interface using "$__httpx sim_equal ricsim_g1_1 num_instances $((3*$NUM_POLICIES)) START_ID=$(($START_ID+$NUM_POLICIES)) - start_timer "Create polices in STD via agent DMAAP in batch and $interface using "$__httpx - api_put_policy_batch 201 "serv1" ricsim_g2_1 NOTYPE $START_ID NOTRANSIENT $notificationurl testdata/STD/pi1_template.json $NUM_POLICIES - print_timer "Create polices in STD via agent DMAAP in batch and $interface using "$__httpx + start_timer "Create polices in STD via a1pms DMAAP in batch and $interface using "$__httpx + a1pms_api_put_policy_batch 201 "serv1" ricsim_g2_1 NOTYPE $START_ID NOTRANSIENT $notificationurl testdata/STD/pi1_template.json $NUM_POLICIES + print_timer "Create polices in STD via a1pms DMAAP in batch and $interface using "$__httpx sim_equal ricsim_g2_1 num_instances $((3*$NUM_POLICIES)) - if [ "$PMS_VERSION" == "V2" ]; then - START_ID=$(($START_ID+$NUM_POLICIES)) + START_ID=$(($START_ID+$NUM_POLICIES)) - start_timer "Create polices in STD via agent DMAAP in batch and $interface using "$__httpx - api_put_policy_batch 201 "serv1" ricsim_g3_1 STD_QOS2_0.1.0 $START_ID NOTRANSIENT $notificationurl testdata/STD2/pi_qos2_template.json $NUM_POLICIES - print_timer "Create polices in STD via agent DMAAP in batch and $interface using "$__httpx + start_timer "Create polices in STD via a1pms DMAAP in batch and $interface using "$__httpx + a1pms_api_put_policy_batch 201 "serv1" ricsim_g3_1 STD_QOS2_0.1.0 $START_ID NOTRANSIENT $notificationurl testdata/STD2/pi_qos2_template.json $NUM_POLICIES + print_timer "Create polices in STD via a1pms DMAAP in batch and $interface using "$__httpx + + sim_equal ricsim_g3_1 num_instances $((3*$NUM_POLICIES)) - sim_equal ricsim_g3_1 num_instances $((3*$NUM_POLICIES)) - fi if [ $interface == "SDNC" ]; then sim_contains_str ricsim_g1_1 remote_hosts $SDNC_APP_NAME sim_contains_str ricsim_g2_1 remote_hosts $SDNC_APP_NAME - if [ "$PMS_VERSION" == "V2" ]; then - sim_contains_str ricsim_g3_1 remote_hosts $SDNC_APP_NAME - fi + sim_contains_str ricsim_g3_1 remote_hosts $SDNC_APP_NAME else - sim_contains_str ricsim_g1_1 remote_hosts $POLICY_AGENT_APP_NAME - sim_contains_str ricsim_g2_1 remote_hosts $POLICY_AGENT_APP_NAME - if [ "$PMS_VERSION" == "V2" ]; then - sim_contains_str ricsim_g3_1 remote_hosts $POLICY_AGENT_APP_NAME - fi + sim_contains_str ricsim_g1_1 remote_hosts $A1PMS_APP_NAME + sim_contains_str ricsim_g2_1 remote_hosts $A1PMS_APP_NAME + sim_contains_str ricsim_g3_1 remote_hosts $A1PMS_APP_NAME fi - check_policy_agent_logs + check_a1pms_logs if [[ $interface = *"SDNC"* ]]; then check_sdnc_logs fi