X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC_HELM_E_RELEASE.sh;h=1b63f615d85883f939344751a420e4670197ec0e;hb=805ac7cae6f73802179b105941ebb12183de91a7;hp=0f7e30a053d55cc85c9b22e0b47db1f938cfe008;hpb=542d2dbfd8df1fcb011fea3d69d539c5c5fe3667;p=nonrtric.git

diff --git a/test/auto-test/FTC_HELM_E_RELEASE.sh b/test/auto-test/FTC_HELM_E_RELEASE.sh
index 0f7e30a0..1b63f615 100755
--- a/test/auto-test/FTC_HELM_E_RELEASE.sh
+++ b/test/auto-test/FTC_HELM_E_RELEASE.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.
@@ -26,8 +26,8 @@ DOCKER_INCLUDED_IMAGES="" # Not used -  KUBE only test script
 
 #App names to include in the test when running kubernetes, space separated list
 KUBE_INCLUDED_IMAGES=" MR DMAAPMR CR  PRODSTUB KUBEPROXY KAFKAPC"
-#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list
-KUBE_PRESTARTED_IMAGES=" PA RICSIM CP ICS RC SDNC DMAAPMED DMAAPADP"
+#Pre-started app (not started by script) to include in the test when running kubernetes, space separated list
+KUBE_PRESTARTED_IMAGES=" A1PMS RICSIM CP ICS RC SDNC DMAAPMED DMAAPADP"
 
 #Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if
 #the image is not configured in the supplied env_file
@@ -47,35 +47,25 @@ setup_testenvironment
 
 use_mr_https
 use_cr_https
-use_agent_rest_https
+use_a1pms_rest_https
 use_sdnc_https
 use_simulator_https
 use_ics_rest_https
 use_prod_stub_https
 use_dmaapmed_https
 
-if [ $ICS_VERSION == "V1-1" ]; then
-    use_rapp_catalogue_http # https not yet supported
-else
-    ########################################use_rapp_catalogue_https
-    use_rapp_catalogue_http
-fi
+use_rapp_catalogue_http
 
 echo -e "$RED CHECK WHY RC HTTPS DOES NOT WORK $ERED"
 
 ###############################use_control_panel_https
 use_control_panel_http
 
-if [ "$PMS_VERSION" == "V1" ]; then
-   echo "PMS VERSION 2 (V2) is required"
-   exit 1
-fi
-
 clean_environment
 
 ics_kube_pvc_reset
 
-pms_kube_pvc_reset
+a1pms_kube_pvc_reset
 
 start_kube_proxy
 
@@ -108,8 +98,9 @@ kafkapc_api_start_sending 200 "unauthenticated.dmaapadp_kafka.text"
 start_control_panel
 
 start_sdnc
+controller_api_wait_for_status_ok 200 a1-sim-std-1
 
-start_policy_agent
+start_a1pms
 
 start_cr 1
 
@@ -121,7 +112,7 @@ set_ics_trace
 
 start_rapp_catalogue
 
-set_agent_trace
+set_a1pms_trace
 
 #### Test RAPP Catalogue ####
 
@@ -134,7 +125,9 @@ rapp_cat_api_get_services 200 "Emergency-response-app" v1 "Emergency-response-ap
 #Check the number of services
 rc_equal json:services 1
 
-api_get_status 200
+sleep_wait 120 "Let A1PMS configuration take effect"
+
+a1_a1pms_api_get_status 200
 
 #### Test Policy Management Service ####
 
@@ -170,16 +163,16 @@ do
 done
 
 #Check the number of schemas
-api_equal json:policy-types 1
+a1pms_equal json:policy-types 1
 
-# Load the polictypes in STD 2
+# Load the policytypes in STD 2
 for ((i=0; i<$STD_NUM_RICS; i++))
 do
    sim_put_policy_type 201 "a1-sim-std2-"$i STD_QOS_0_2_0 testdata/STD2/sim_qos.json
    sim_put_policy_type 201 "a1-sim-std2-"$i STD_QOS2_0.1.0 testdata/STD2/sim_qos2.json
 done
 
-# Load the polictypes in OSC
+# Load the policytypes in OSC
 for ((i=0; i<$OSC_NUM_RICS; i++))
 do
     sim_put_policy_type 201 "a1-sim-osc-"$i 1 testdata/OSC/sim_1.json
@@ -187,92 +180,80 @@ do
 done
 
 # Check that all rics are synced in
-api_equal json:rics 6 300
+a1pms_equal json:rics 6 300
 
 #Check the number of schemas and the individual schemas
-api_equal json:policy-types 5 300
+a1pms_equal json:policy-types 5 300
 
 for ((i=0; i<$STD_NUM_RICS; i++))
 do
     ricid=$((3+$i))
-    api_equal json:policy-types?ric_id=ric$ricid 1 120
+    a1pms_equal json:policy-types?ric_id=ric$ricid 1 120
 done
 
 for ((i=0; i<$STD_NUM_RICS; i++))
 do
    ricid=$((5+$i))
-   api_equal json:policy-types?ric_id=ric$ricid 2 120
+   a1pms_equal json:policy-types?ric_id=ric$ricid 2 120
 done
 
 for ((i=0; i<$OSC_NUM_RICS; i++))
 do
     ricid=$((1+$i))
-    api_equal json:policy-types?ric_id=ric$ricid 2 120
+    a1pms_equal json:policy-types?ric_id=ric$ricid 2 120
 done
 
 #Check the schemas in STD 2
 for ((i=0; i<$OSC_NUM_RICS; i++))
 do
    ricid=$((5+$i))
-   api_get_policy_type 200 STD_QOS_0_2_0 testdata/STD2/qos-agent-modified.json
-   api_get_policy_type 200 STD_QOS2_0.1.0 testdata/STD2/qos2-agent-modified.json
+   a1_a1pms_api_get_policy_type 200 STD_QOS_0_2_0 testdata/STD2/qos-a1pms-modified.json
+   a1_a1pms_api_get_policy_type 200 STD_QOS2_0.1.0 testdata/STD2/qos2-a1pms-modified.json
 done
 
 # Check the schemas in OSC
 for ((i=0; i<$OSC_NUM_RICS; i++))
 do
-    api_get_policy_type 200 1 testdata/OSC/1-agent-modified.json
-    api_get_policy_type 200 2 testdata/OSC/2-agent-modified.json
+    a1_a1pms_api_get_policy_type 200 1 testdata/OSC/1-a1pms-modified.json
+    a1_a1pms_api_get_policy_type 200 2 testdata/OSC/2-a1pms-modified.json
 done
 
-if [ "$PMS_VERSION" == "V2" ]; then
-
-    api_equal json:policy-types 5 120
-
-    api_equal json:policies 0
-
-    api_equal json:policy-instances 0
-else
-
-    api_equal json:policy_schemas 5 120
-
-    api_equal json:policy_types 5
+a1pms_equal json:policy-types 5 120
 
-    api_equal json:policies 0
+a1pms_equal json:policies 0
 
-    api_equal json:policy_ids 0
-fi
+a1pms_equal json:policy-instances 0
 
-api_put_service 201 "Emergency-response-app" 0 "$CR_SERVICE_APP_PATH_0/ER-app"
+a1pms_api_put_service 201 "Emergency-response-app" 0 "$CR_SERVICE_APP_PATH_0/ER-app"
 
 # Create policies in STD
 for ((i=0; i<$STD_NUM_RICS; i++))
 do
     ricid=$((3+$i))
-    generate_policy_uuid
-    api_put_policy 201 "Emergency-response-app" ric$ricid NOTYPE $((1100+$i)) NOTRANSIENT $CR_SERVICE_APP_PATH_0/"std2" testdata/STD/pi1_template.json 1
-    generate_policy_uuid
-    api_put_policy 201 "Emergency-response-app" ric$ricid NOTYPE $((1200+$i)) NOTRANSIENT $CR_SERVICE_APP_PATH_0/"std2" testdata/STD/pi1_template.json 1
+    sim_generate_policy_uuid
+    a1pms_api_put_policy 201 "Emergency-response-app" ric$ricid NOTYPE $((1100+$i)) NOTRANSIENT $CR_SERVICE_APP_PATH_0/"std2" testdata/STD/pi1_template.json 1
+    sim_generate_policy_uuid
+    a1pms_api_put_policy 201 "Emergency-response-app" ric$ricid NOTYPE $((1200+$i)) NOTRANSIENT $CR_SERVICE_APP_PATH_0/"std2" testdata/STD/pi1_template.json 1
 done
 
 #Create policies in STD 2
 for ((i=0; i<$STD_NUM_RICS; i++))
 do
    ricid=$((5+$i))
-   generate_policy_uuid
-   api_put_policy 201 "Emergency-response-app" ric$ricid STD_QOS_0_2_0 $((2100+$i)) NOTRANSIENT $CR_SERVICE_APP_PATH_0/"std2" testdata/STD2/pi_qos_template.json 1
-   generate_policy_uuid
-   api_put_policy 201 "Emergency-response-app" ric$ricid STD_QOS2_0.1.0 $((2200+$i)) NOTRANSIENT $CR_SERVICE_APP_PATH_0/"std2" testdata/STD2/pi_qos2_template.json 1
+   sim_generate_policy_uuid
+   a1pms_api_put_policy 201 "Emergency-response-app" ric$ricid STD_QOS_0_2_0 $((2100+$i)) NOTRANSIENT $CR_SERVICE_APP_PATH_0/"std2" testdata/STD2/pi_qos_template.json 1
+   sim_generate_policy_uuid
+   a1pms_api_put_policy 201 "Emergency-response-app" ric$ricid STD_QOS2_0.1.0 $((2200+$i)) NOTRANSIENT $CR_SERVICE_APP_PATH_0/"std2" testdata/STD2/pi_qos2_template.json 1
 done
 
 # Create policies in OSC
 for ((i=0; i<$OSC_NUM_RICS; i++))
 do
     ricid=$((1+$i))
-    generate_policy_uuid
-    api_put_policy 201 "Emergency-response-app" ric$ricid 1 $((3100+$i)) NOTRANSIENT $CR_SERVICE_APP_PATH_0/"osc" testdata/OSC/pi1_template.json 1
-    generate_policy_uuid
-    api_put_policy 201 "Emergency-response-app" ric$ricid 2 $((3200+$i)) NOTRANSIENT $CR_SERVICE_APP_PATH_0/"osc" testdata/OSC/pi2_template.json 1
+    sim_generate_policy_uuid
+    a1pms_api_put_policy 201 "Emergency-response-app" ric$ricid 1 $((3100+$i)) NOTRANSIENT $CR_SERVICE_APP_PATH_0/"osc" testdata/OSC/pi1_template.json 1
+    sim_generate_policy_uuid
+    a1pms_api_put_policy 201 "Emergency-response-app" ric$ricid 2 $((3200+$i)) NOTRANSIENT $CR_SERVICE_APP_PATH_0/"osc" testdata/OSC/pi2_template.json 1
 done
 
 
@@ -289,31 +270,19 @@ do
     sim_equal "a1-sim-osc-"$i num_instances 2
 done
 
-stop_policy_agent
+stop_a1pms
 
-start_stopped_policy_agent
+start_stopped_a1pms
 
-# Check PMS state after restart
+# Check A1PMS state after restart
 
 sleep_wait 200
 
-if [ "$PMS_VERSION" == "V2" ]; then
+a1pms_equal json:policy-types 5 120
 
-    api_equal json:policy-types 5 120
+a1pms_equal json:policies 12
 
-    api_equal json:policies 12
-
-    api_equal json:policy-instances 12
-else
-
-    api_equal json:policy_schemas 5 120
-
-    api_equal json:policy_types 5
-
-    api_equal json:policies 12
-
-    api_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++))
@@ -333,8 +302,6 @@ cr_api_reset 0   # Reset CR to count new events
 echo "ADD EVENT/STATUS CHECK"
 echo "ADD MR CHECK"
 
-FLAT_A1_EI="1"
-
 ics_api_admin_reset
 
 CB_JOB="$PROD_STUB_SERVICE_PATH$PROD_STUB_JOB_CALLBACK"
@@ -355,63 +322,33 @@ prodstub_arm_job_create 200 prod-a job2
 ics_api_service_status 200
 
 ## Setup prod-a
-if [ $ICS_VERSION == "V1-1" ]; then
-    ics_api_edp_put_producer 201 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 testdata/ics/ei-type-1.json
-
-    ics_api_edp_get_producer 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 testdata/ics/ei-type-1.json
-else
-    ics_api_edp_put_type_2 201 type1 testdata/ics/ei-type-1.json
-    ics_api_edp_get_type_2 200 type1
+ics_api_edp_put_type_2 201 type1 testdata/ics/ei-type-1.json
+ics_api_edp_get_type_2 200 type1
 
-    ics_api_edp_get_type_ids 200 type1
+ics_api_edp_get_type_ids 200 type1
 
-    ics_api_edp_put_producer_2 201 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1
-    ics_api_edp_put_producer_2 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1
-fi
+ics_api_edp_put_producer_2 201 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1
+ics_api_edp_put_producer_2 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1
 
 ics_api_edp_get_producer_status 200 prod-a ENABLED
 
 
 ## Create a job for prod-a
 ## job1 - prod-a
-if [  -z "$FLAT_A1_EI" ]; then
-    ics_api_a1_put_job 201 type1 job1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json
-else
-    ics_api_a1_put_job 201 job1 type1 $TARGET1 ricsim_g3_1 $STATUS1 testdata/ics/job-template.json
-fi
+ics_api_a1_put_job 201 job1 type1 $TARGET1 ricsim_g3_1 $STATUS1 testdata/ics/job-template.json
 
 # Check the job data in the producer
-if [ $ICS_VERSION == "V1-1" ]; then
-    prodstub_check_jobdata 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json
-else
-    if [[ "$ICS_FEATURE3LEVEL" == *"INFO-TYPES"* ]]; then
-        prodstub_check_jobdata_3 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json
-    else
-        prodstub_check_jobdata_2 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json
-    fi
-fi
+prodstub_check_jobdata_3 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json
 
 ## Create a second job for prod-a
 ## job2 - prod-a
-if [  -z "$FLAT_A1_EI" ]; then
-    ics_api_a1_put_job 201 type1 job2 $TARGET2 ricsim_g3_2 testdata/ics/job-template.json
-else
-    ics_api_a1_put_job 201 job2 type1 $TARGET2 ricsim_g3_2 $STATUS2 testdata/ics/job-template.json
-fi
+ics_api_a1_put_job 201 job2 type1 $TARGET2 ricsim_g3_2 $STATUS2 testdata/ics/job-template.json
 
 # Check the job data in the producer
-if [ $ICS_VERSION == "V1-1" ]; then
-    prodstub_check_jobdata 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ics/job-template.json
-else
-    if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
-        prodstub_check_jobdata_3 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ics/job-template.json
-    else
-        prodstub_check_jobdata_2 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ics/job-template.json
-    fi
-fi
+prodstub_check_jobdata_3 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ics/job-template.json
 
 # 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 +364,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
 
@@ -463,12 +400,12 @@ done
 
 for ((i=1; i<=$NUM_JOBS; i++))
 do
-    cr_api_check_single_genric_json_event 200 0 jobx-data$i '{"msg":"msg-0"}'
-    cr_api_check_single_genric_json_event 200 0 jobx-data$i '{"msg":"msg-2"}'
-    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_genric_json_event 200 0 jobz-data$i 'Message-------4'
-    cr_api_check_single_genric_json_event 200 0 jobz-data$i 'Message-------6'
+    cr_api_check_single_generic_json_event 200 0 jobx-data$i '{"msg":"msg-0"}'
+    cr_api_check_single_generic_json_event 200 0 jobx-data$i '{"msg":"msg-2"}'
+    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"}'
+    cr_api_check_single_generic_json_event 200 0 jobz-data$i 'Message-------4'
+    cr_api_check_single_generic_json_event 200 0 jobz-data$i 'Message-------6'
 done
 
 
@@ -478,15 +415,10 @@ start_stopped_ics
 
 # Check ICS status after restart
 
-if [  -z "$FLAT_A1_EI" ]; then
-    ics_api_a1_get_job_status 200 type1 job1 DISABLED
-    ics_api_a1_get_job_status 200 type1 job2 DISABLED
-else
-    ics_api_a1_get_job_status 200 job1 DISABLED
-    ics_api_a1_get_job_status 200 job2 DISABLED
-fi
+ics_api_a1_get_job_status 200 job1 DISABLED
+ics_api_a1_get_job_status 200 job2 DISABLED
 
-check_policy_agent_logs
+check_a1pms_logs
 check_ics_logs
 check_sdnc_logs