X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC3001.sh;h=26ba3f22376a8b16355ebd333775134694150045;hb=f81090f8f5f1fd1a76bb9feab1f41f03252297c3;hp=2672d12741ddc718d5e9350b92d0abc17f21db69;hpb=237a4da4b9419171f774bd6a02f61bef81f1b60f;p=nonrtric.git diff --git a/test/auto-test/FTC3001.sh b/test/auto-test/FTC3001.sh index 2672d127..26ba3f22 100755 --- a/test/auto-test/FTC3001.sh +++ b/test/auto-test/FTC3001.sh @@ -95,7 +95,7 @@ done adp_config_data=$adp_config_data']}' echo $adp_config_data > tmp/adp_config_data.json -start_dmaapadp NOPROXY $SIM_GROUP/$DMAAP_ADP_COMPOSE_DIR/$DMAAP_ADP_CONFIG_FILE tmp/adp_config_data.json +start_dmaapadp NOPROXY $SIM_GROUP/$DMAAP_ADP_COMPOSE_DIR/$DMAAP_ADP_CONFIG_FILE_TEMPLATE tmp/adp_config_data.json set_dmaapadp_trace @@ -126,7 +126,17 @@ ics_equal json:data-producer/v1/info-producers 2 60 # Check producers ics_api_idc_get_job_ids 200 NOTYPE NOWNER EMPTY -ics_api_edp_get_producer_ids_2 200 NOTYPE DmaapGenericInfoProducer DMaaP_Mediator_Producer +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 DMaaP_Mediator_Producer +else + ics_api_edp_get_producer_ids_2 200 NOTYPE DmaapGenericInfoProducer DMaaP_Mediator_Producer +fi + ics_api_idc_get_type_ids 200 $adp_med_type_list @@ -199,7 +209,6 @@ EXPECTED_BATCHES_DELIV=$(($NUM_JOBS/$NUM_CR+$EXPECTED_BATCHES_DELIV)) adp_timeout=$(($NUM_JOBS*1*2+60)) #NUM_JOBS*MIN_BUFFERTIMEOUT*2+60_SEC_DELAY for ((i=0; i<$NUM_CR; i++)) do - #tmp_receptio cr_equal $i received_callbacks $EXPECTED_DATA_DELIV $adp_timeout cr_greater_or_equal $i received_callback_batches $EXPECTED_BATCHES_DELIV done