Removal of older test profiles

[nonrtric.git] / test / auto-test / FTC_HELM_E_RELEASE.sh

diff --git a/test/auto-test/FTC_HELM_E_RELEASE.sh b/test/auto-test/FTC_HELM_E_RELEASE.sh
index c54cb4f..f6433ad 100755 (executable)
--- a/test/auto-test/FTC_HELM_E_RELEASE.sh
+++ b/test/auto-test/FTC_HELM_E_RELEASE.sh
@@ -66,11 +66,6 @@ echo -e "$RED CHECK WHY RC HTTPS DOES NOT WORK $ERED"
 ###############################use_control_panel_https
 use_control_panel_http
 
-if [ "$A1PMS_VERSION" == "V1" ]; then
-   echo "A1PMS VERSION 2 (V2) is required"
-   exit 1
-fi
-
 clean_environment
 
 ics_kube_pvc_reset
@@ -134,6 +129,8 @@ rapp_cat_api_get_services 200 "Emergency-response-app" v1 "Emergency-response-ap
 #Check the number of services
 rc_equal json:services 1
 
+sleep_wait 120 "Let A1PMS cofiguration take effect"
+
 a1_a1pms_api_get_status 200
 
 #### Test Policy Management Service ####
@@ -225,23 +222,11 @@ do
     a1_a1pms_api_get_policy_type 200 2 testdata/OSC/2-a1pms-modified.json
 done
 
-if [ "$A1PMS_VERSION" == "V2" ]; then
+a1pms_equal json:policy-types 5 120
 
-    a1pms_equal json:policy-types 5 120
+a1pms_equal json:policies 0
 
-    a1pms_equal json:policies 0
-
-    a1pms_equal json:policy-instances 0
-else
-
-    a1pms_equal json:policy_schemas 5 120
-
-    a1pms_equal json:policy_types 5
-
-    a1pms_equal json:policies 0
-
-    a1pms_equal json:policy_ids 0
-fi
+a1pms_equal json:policy-instances 0
 
 a1pms_api_put_service 201 "Emergency-response-app" 0 "$CR_SERVICE_APP_PATH_0/ER-app"
 
@@ -297,23 +282,11 @@ start_stopped_a1pms
 
 sleep_wait 200
 
-if [ "$A1PMS_VERSION" == "V2" ]; then
-
-    a1pms_equal json:policy-types 5 120
-
-    a1pms_equal json:policies 12
-
-    a1pms_equal json:policy-instances 12
-else
-
-    a1pms_equal json:policy_schemas 5 120
+a1pms_equal json:policy-types 5 120
 
-    a1pms_equal json:policy_types 5
+a1pms_equal json:policies 12
 
-    a1pms_equal json:policies 12
-
-    a1pms_equal json:policy_ids 12
-fi
+a1pms_equal json:policy-instances 12
 
 # Check the number of policies in STD and STD2
 for ((i=0; i<$STD_NUM_RICS; i++))
@@ -411,7 +384,7 @@ else
 fi
 
 # Dmaap mediator and adapter
-start_dmaapadp NOPROXY $SIM_GROUP/$DMAAP_ADP_COMPOSE_DIR/$DMAAP_ADP_CONFIG_FILE $SIM_GROUP/$DMAAP_ADP_COMPOSE_DIR/$DMAAP_ADP_DATA_FILE
+start_dmaapadp NOPROXY $SIM_GROUP/$DMAAP_ADP_COMPOSE_DIR/$DMAAP_ADP_CONFIG_FILE_TEMPLATE $SIM_GROUP/$DMAAP_ADP_COMPOSE_DIR/$DMAAP_ADP_DATA_FILE
 
 start_dmaapmed NOPROXY $SIM_GROUP/$DMAAP_MED_COMPOSE_DIR/$DMAAP_MED_HOST_DATA_FILE
 
@@ -427,12 +400,12 @@ NUM_JOBS=1
 
 for ((i=1; i<=$NUM_JOBS; i++))
 do
-    ics_api_idc_put_job 201 jobx$i STD_Fault_Messages $CR_SERVICE_MR_PATH_0/jobx-data$i info-ownerx$i $CR_SERVICE_MR_PATH_0/job_status_info-ownerx$i testdata/dmaap-adapter/job-template.json
+    ics_api_idc_put_job 201 jobx$i STD_Fault_Messages $CR_SERVICE_MR_PATH_0/jobx-data$i info-ownerx$i $CR_SERVICE_MR_PATH_0/job_status_info-ownerx$i testdata/dmaap-adapter/job-template1.json
 done
 
 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/job-template1.json
     ics_api_idc_put_job 201 jobz$i ExampleInformationTypeKafka $CR_SERVICE_MR_PATH_0/jobz-data$i info-ownerz$i $CR_SERVICE_MR_PATH_0/job_status_info-ownerz$i testdata/dmaap-adapter/job-template-1-kafka.json
 done