X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC3001.sh;h=77376fc1a4d7af46407345d005250ab19f43860d;hb=1c7c5fc52d531205e3bd639fc4f2189c49f296cc;hp=390df597d2b4a4721ae0f0cc98df1caa6e2cf0ee;hpb=c8f92e94bb2638aa66a1d7c2ba63375bbfcdc8c9;p=nonrtric.git diff --git a/test/auto-test/FTC3001.sh b/test/auto-test/FTC3001.sh index 390df597..77376fc1 100755 --- a/test/auto-test/FTC3001.sh +++ b/test/auto-test/FTC3001.sh @@ -34,7 +34,7 @@ KUBE_PRESTARTED_IMAGES="" CONDITIONALLY_IGNORED_IMAGES="" #Supported test environment profiles -SUPPORTED_PROFILES="ORAN-E-RELEASE ORAN-F-RELEASE" +SUPPORTED_PROFILES="ORAN-E-RELEASE ORAN-F-RELEASE ORAN-G-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" @@ -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