X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC2003.sh;h=c98eeac3b8fceb668843a6b0d23f26e867b30f5f;hb=f83c362e67d25a464b80faf6d8363ccacacc5ebb;hp=6e22ced1be949e079a5d6570ff7f16093ae63c1b;hpb=6f48adb69090799c74c29204dd2cd1737cc9d6ac;p=nonrtric.git diff --git a/test/auto-test/FTC2003.sh b/test/auto-test/FTC2003.sh index 6e22ced1..c98eeac3 100755 --- a/test/auto-test/FTC2003.sh +++ b/test/auto-test/FTC2003.sh @@ -17,13 +17,13 @@ # ============LICENSE_END================================================= # -TC_ONELINE_DESCR="Testing southbound proxy for Dmaap Adaptor" +TC_ONELINE_DESCR="Testing southbound proxy for Dmaap Adapter" #App names to include in the test when running docker, space separated list -DOCKER_INCLUDED_IMAGES="CR MR ECS HTTPPROXY KUBEPROXY DMAAPADP" +DOCKER_INCLUDED_IMAGES="CR MR ICS HTTPPROXY KUBEPROXY DMAAPADP" #App names to include in the test when running kubernetes, space separated list -KUBE_INCLUDED_IMAGES=" CR MR ECS HTTPPROXY KUBEPROXY DMAAPADP" +KUBE_INCLUDED_IMAGES=" CR MR ICS HTTPPROXY KUBEPROXY DMAAPADP" #Prestarted app (not started by script) to include in the test when running kubernetes, space separated list KUBE_PRESTARTED_IMAGES="" @@ -33,17 +33,11 @@ KUBE_PRESTARTED_IMAGES="" CONDITIONALLY_IGNORED_IMAGES="" #Supported test environment profiles -SUPPORTED_PROFILES="ORAN-E-RELEASE" +SUPPORTED_PROFILES="ORAN-F-RELEASE ORAN-G-RELEASE ORAN-H-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" . ../common/testcase_common.sh $@ -. ../common/ecs_api_functions.sh -. ../common/cr_api_functions.sh -. ../common/mr_api_functions.sh -. ../common/http_proxy_api_functions.sh -. ../common/kube_proxy_api_functions.sh -. ../common/dmaapadp_api_functions.sh setup_testenvironment @@ -58,7 +52,7 @@ NUM_JOBS=10 clean_environment use_cr_https -use_ecs_rest_https +use_ics_rest_https use_mr_https use_dmaapadp_https @@ -66,38 +60,48 @@ start_kube_proxy start_http_proxy -start_cr +start_cr 1 -start_ecs NOPROXY $SIM_GROUP/$ECS_COMPOSE_DIR/$ECS_CONFIG_FILE +start_ics NOPROXY $SIM_GROUP/$ICS_COMPOSE_DIR/$ICS_CONFIG_FILE -set_ecs_trace +set_ics_trace start_mr -start_dmaapadp PROXY $SIM_GROUP/$DMAAP_ADP_COMPOSE_DIR/$DMAAP_ADP_CONFIG_FILE $SIM_GROUP/$DMAAP_ADP_COMPOSE_DIR/$DMAAP_ADP_DATA_FILE +start_dmaapadp PROXY $SIM_GROUP/$DMAAP_ADP_COMPOSE_DIR/$DMAAP_ADP_CONFIG_FILE_TEMPLATE $SIM_GROUP/$DMAAP_ADP_COMPOSE_DIR/$DMAAP_ADP_DATA_FILE set_dmaapadp_trace -if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then - ecs_equal json:data-producer/v1/info-producers 1 60 +if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then + ics_equal json:data-producer/v1/info-producers 1 60 else - ecs_equal json:ei-producer/v1/eiproducers 1 60 + ics_equal json:ei-producer/v1/eiproducers 1 60 fi -ecs_api_idc_get_job_ids 200 NOTYPE NOWNER EMPTY -ecs_api_idc_get_type_ids 200 ExampleInformationType +ics_api_idc_get_job_ids 200 NOTYPE NOWNER EMPTY +ics_api_idc_get_type_ids 200 ExampleInformationType ExampleInformationTypeKafka -ecs_api_edp_get_producer_ids_2 200 NOTYPE DmaapGenericInfoProducer +if [[ "$DMAAP_ADP_FEATURE_LEVEL" == *"GENERATED_PROD_NAME"* ]]; then + if [ $RUNMODE == "KUBE" ]; then + __NAME="https:__$DMAAP_ADP_APP_NAME.$KUBE_NONRTRIC_NAMESPACE:$DMAAP_ADP_EXTERNAL_SECURE_PORT" + else + __NAME="https:__$DMAAP_ADP_APP_NAME:$DMAAP_ADP_INTERNAL_SECURE_PORT" + fi + ics_api_edp_get_producer_ids_2 200 NOTYPE $__NAME +else + ics_api_edp_get_producer_ids_2 200 NOTYPE DmaapGenericInfoProducer +fi + for ((i=1; i<=$NUM_JOBS; i++)) do - ecs_api_idc_put_job 201 joby$i ExampleInformationType $CR_SERVICE_MR_PATH/joby-data$i info-ownery$i $CR_SERVICE_MR_PATH/job_status_info-ownery$i testdata/dmaap-adapter/job-template.json + ics_api_idc_put_job 201 joby$i ExampleInformationType $CR_SERVICE_MR_PATH_0/joby-data$i info-ownery$i $CR_SERVICE_MR_PATH_0/job_status_info-ownery$i testdata/dmaap-adapter/job-template1.json done for ((i=1; i<=$NUM_JOBS; i++)) do - ecs_api_a1_get_job_status 200 joby$i ENABLED 30 + ics_api_a1_get_job_status 200 joby$i ENABLED 30 done @@ -105,20 +109,20 @@ done mr_api_send_json "/events/unauthenticated.dmaapadp.json" '{"msg":"msg-1"}' mr_api_send_json "/events/unauthenticated.dmaapadp.json" '{"msg":"msg-3"}' -cr_equal received_callbacks $(($NUM_JOBS*2)) 60 +cr_equal 0 received_callbacks $(($NUM_JOBS*2)) 60 for ((i=1; i<=$NUM_JOBS; i++)) do - cr_equal received_callbacks?id=joby-data$i 2 + cr_equal 0 received_callbacks?id=joby-data$i 2 done for ((i=1; i<=$NUM_JOBS; i++)) do - cr_api_check_single_genric_json_event 200 joby-data$i '{"msg":"msg-1"}' - cr_api_check_single_genric_json_event 200 joby-data$i '{"msg":"msg-3"}' + cr_api_check_single_genric_json_event 200 0 joby-data$i '{"msg":"msg-1"}' + cr_api_check_single_genric_json_event 200 0 joby-data$i '{"msg":"msg-3"}' done -cr_contains_str remote_hosts $HTTP_PROXY_APP_NAME +cr_contains_str 0 remote_hosts $HTTP_PROXY_APP_NAME #### TEST COMPLETE #### @@ -126,4 +130,4 @@ store_logs END print_result -auto_clean_environment \ No newline at end of file +auto_clean_environment