X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FPM_EI_DEMO.sh;h=49a5c93a73559418d86b45d435bec62c4af4d41b;hb=refs%2Fchanges%2F88%2F12388%2F5;hp=e72c71b87d819d6481af6c9a22cab52afc4e9188;hpb=2c5af88869ce0fa702b011dbc6cb8a272273f70e;p=nonrtric.git diff --git a/test/auto-test/PM_EI_DEMO.sh b/test/auto-test/PM_EI_DEMO.sh index e72c71b8..49a5c93a 100755 --- a/test/auto-test/PM_EI_DEMO.sh +++ b/test/auto-test/PM_EI_DEMO.sh @@ -1,7 +1,8 @@ #!/usr/bin/env bash # ============LICENSE_START=============================================== -# Copyright (C) 2020 Nordix Foundation. All rights reserved. +# Copyright (C) 2020-2023 Nordix Foundation. All rights reserved. +# Copyright (C) 2023 OpenInfra Foundation Europe. 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. @@ -20,20 +21,20 @@ TC_ONELINE_DESCR="Preparation demo setup - policy management and information information" #App names to include in the test when running docker, space separated list -DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR A1PMS RICSIM SDNC ICS PRODSTUB RC HTTPPROXY KUBEPROXY NGW" +DOCKER_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM SDNC ICS PRODSTUB RC HTTPPROXY KUBEPROXY NGW" #App names to include in the test when running kubernetes, space separated list KUBE_INCLUDED_IMAGES=" MR CR A1PMS RC PRODSTUB RICSIM CP ICS SDNC HTTPPROXY KUBEPROXY NGW" -#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 #the image is not configured in the supplied env_file #Used for images not applicable to all supported profile -CONDITIONALLY_IGNORED_IMAGES="CBS CONSUL NGW" +CONDITIONALLY_IGNORED_IMAGES="NGW" #Supported test environment profiles -SUPPORTED_PROFILES="ONAP-HONOLULU ONAP-ISTANBUL ONAP-JAKARTA ORAN-CHERRY ORAN-D-RELEASE ORAN-E-RELEASE ORAN-F-RELEASE" +SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" @@ -48,23 +49,19 @@ setup_testenvironment use_cr_https use_a1pms_rest_https -use_sdnc_https +if [[ "$SDNC_FEATURE_LEVEL" == *"NO_NB_HTTPS"* ]]; then + deviation "SDNC does not support NB https" + use_sdnc_http +else + use_sdnc_https +fi use_simulator_https use_ics_rest_https use_prod_stub_https -if [ $ICS_VERSION == "V1-1" ]; then - use_rapp_catalogue_http # https not yet supported -else - use_rapp_catalogue_https -fi +use_rapp_catalogue_https -if [ "$A1PMS_VERSION" == "V2" ]; then - notificationurl=$CR_SERVICE_APP_PATH_0"/test" -else - echo "A1PMS VERSION 2 (V2) is required" - exit 1 -fi +notificationurl=$CR_SERVICE_APP_PATH_0"/test" clean_environment @@ -76,7 +73,11 @@ STD_NUM_RICS=2 start_ric_simulators $RIC_SIM_PREFIX"_g3" $STD_NUM_RICS STD_2.0.0 -start_mr #Just to prevent errors in the a1pms log... +if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then + : +else + start_mr #Just to prevent errors in the a1pms log... +fi start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE @@ -85,29 +86,18 @@ if [ ! -z "$NRT_GATEWAY_APP_NAME" ]; then fi start_sdnc # Comment this line to run A1PMS with proxy +controller_api_wait_for_status_ok 200 ricsim_g3_1 # Comment this line to run A1PMS with proxy start_a1pms PROXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE -__CONFIG_HEADER="NOHEADER" -if [ $RUNMODE == "KUBE" ]; then - __CONFIG_HEADER="HEADER" -else - if [[ "$A1PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then - __CONFIG_HEADER="HEADER" - fi -fi -prepare_consul_config SDNC ".consul_config.json" $__CONFIG_HEADER #Change to NOSDNC if running A1PMS with proxy + +prepare_a1pms_config SDNC ".a1pms_config.json" #Change to NOSDNC if running A1PMS with proxy if [ $RUNMODE == "KUBE" ]; then - a1pms_load_config ".consul_config.json" + a1pms_load_config ".a1pms_config.json" else - if [[ "$A1PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then - a1pms_api_put_configuration 200 ".consul_config.json" - else - start_consul_cbs - consul_config_app ".consul_config.json" - fi + a1pms_api_put_configuration 200 ".a1pms_config.json" fi start_cr 1 @@ -122,17 +112,14 @@ set_a1pms_trace set_ics_trace -use_info_jobs=false #Set flag if interface supporting info-types is used -if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then - use_info_jobs=true -fi - rapp_cat_api_get_services 200 EMPTY rapp_cat_api_put_service 201 "Emergency-response-app" v1 "Emergency-response-app" "Emergency-response-app" rapp_cat_api_get_services 200 "Emergency-response-app" v1 "Emergency-response-app" "Emergency-response-app" +sleep_wait 120 "Let A1PMS configuration take effect" + a1pms_api_get_status 200 # Print the A1 version for STD 2.X @@ -140,7 +127,7 @@ for ((i=1; i<=$STD_NUM_RICS; i++)) do sim_print $RIC_SIM_PREFIX"_g3_"$i interface done -# Load the polictypes in std +# Load the policytypes in std for ((i=1; i<=$STD_NUM_RICS; i++)) do sim_put_policy_type 201 $RIC_SIM_PREFIX"_g3_"$i STD_QOS_0_2_0 demo-testdata/STD2/sim_qos.json @@ -170,9 +157,9 @@ a1pms_api_put_service 201 "Emergency-response-app" 0 "$CR_SERVICE_APP_PATH_0/1" # Create policies in STD for ((i=1; i<=$STD_NUM_RICS; i++)) do - generate_policy_uuid + sim_generate_policy_uuid a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g3_"$i STD_QOS_0_2_0 $((2300+$i)) NOTRANSIENT $notificationurl demo-testdata/STD2/pi1_template.json 1 - generate_policy_uuid + sim_generate_policy_uuid a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g3_"$i 'STD_QOS2_0.1.0' $((2400+$i)) NOTRANSIENT $notificationurl demo-testdata/STD2/pi1_template.json 1 done @@ -189,8 +176,6 @@ do sim_print $RIC_SIM_PREFIX"_g3_"$i remote_hosts done -FLAT_A1_EI="1" - CB_JOB="$PROD_STUB_SERVICE_PATH$PROD_STUB_JOB_CALLBACK" CB_SV="$PROD_STUB_SERVICE_PATH$PROD_STUB_SUPERVISION_CALLBACK" RIC_G1_1=$RIC_SIM_PREFIX"_g3_1" @@ -214,59 +199,28 @@ 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_put_type_2 201 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_put_producer_2 201 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 - ics_api_edp_put_producer_2 201 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 - - ics_api_edp_get_producer_2 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 -fi +ics_api_edp_get_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 [ $use_info_jobs ]; 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 [ $use_info_jobs ]; 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 check_a1pms_logs check_ics_logs