X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC2003.sh;h=3268e5b64c3bf061dd4cdd97aada14526c65f92b;hb=818277d56f9f0d86c710dec270319ae32030d444;hp=32412b7c00d4e1d8b80be36bc120fc4ececa73b6;hpb=534a1fe8136ed8d72615707008bdd6061d1df2fe;p=nonrtric.git

diff --git a/test/auto-test/FTC2003.sh b/test/auto-test/FTC2003.sh
index 32412b7c..3268e5b6 100755
--- a/test/auto-test/FTC2003.sh
+++ b/test/auto-test/FTC2003.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 #  ============LICENSE_START===============================================
-#  Copyright (C) 2020 Nordix Foundation. All rights reserved.
+#  Copyright (C) 2020-2023 Nordix Foundation. All rights reserved.
 #  ========================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -17,14 +17,14 @@
 #  ============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 ICS HTTPPROXY KUBEPROXY DMAAPADP"
 
 #App names to include in the test when running kubernetes, space separated list
 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
+#Pre-started app (not started by script) to include in the test when running kubernetes, space separated list
 KUBE_PRESTARTED_IMAGES=""
 
 #Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if
@@ -33,7 +33,7 @@ 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"
 
@@ -46,7 +46,6 @@ setup_testenvironment
 #Local vars in test script
 ##########################
 
-FLAT_A1_EI="1"
 NUM_JOBS=10
 
 clean_environment
@@ -68,25 +67,35 @@ 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 [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
-    ics_equal json:data-producer/v1/info-producers 1 60
-else
-    ics_equal json:ei-producer/v1/eiproducers 1 60
-fi
+ics_equal json:data-producer/v1/info-producers 1 60
 
 ics_api_idc_get_job_ids 200 NOTYPE NOWNER EMPTY
-ics_api_idc_get_type_ids 200 ExampleInformationType
+ics_api_idc_get_type_ids 200 ExampleInformationType ExampleInformationTypeKafka
 
 
-ics_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
 
+if [[ "$DMAAP_ADP_FEATURE_LEVEL" == *"FILTERSCHEMA"* ]]; then
+    _template_json=job-template1.1.json
+else
+    _template_json=job-template1.json
+fi
 for ((i=1; i<=$NUM_JOBS; i++))
 do
-    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-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/$_template_json
 done
 
 for ((i=1; i<=$NUM_JOBS; i++))
@@ -108,8 +117,8 @@ done
 
 for ((i=1; i<=$NUM_JOBS; i++))
 do
-    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"}'
+    cr_api_check_single_generic_json_event 200 0 joby-data$i '{"msg":"msg-1"}'
+    cr_api_check_single_generic_json_event 200 0 joby-data$i '{"msg":"msg-3"}'
 done
 
 cr_contains_str 0 remote_hosts $HTTP_PROXY_APP_NAME
@@ -120,4 +129,4 @@ store_logs          END
 
 print_result
 
-auto_clean_environment
\ No newline at end of file
+auto_clean_environment