X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FPM_EI_DEMO.sh;h=c93a6d77174e5c5ea3274b84e7b624bb727e80a1;hb=6fc58fd020514c2afce1fc240828bf23f53d8fb6;hp=bb33025ca8975594942bd97399350952581ed6fc;hpb=de4d0f86a327469fb64645c2bcd3aeea7832ad25;p=nonrtric.git diff --git a/test/auto-test/PM_EI_DEMO.sh b/test/auto-test/PM_EI_DEMO.sh index bb33025c..c93a6d77 100755 --- a/test/auto-test/PM_EI_DEMO.sh +++ b/test/auto-test/PM_EI_DEMO.sh @@ -19,11 +19,23 @@ TC_ONELINE_DESCR="Preparation demo setup - policy management and enrichment information" -#App names to include in the test, space separated list -INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM SDNC ECS PRODSTUB RC" +#App names to include in the test when running docker, space separated list +DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM SDNC ECS PRODSTUB RC HTTPPROXY KUBEPROXY NGW" -#SUPPORTED TEST ENV FILE -SUPPORTED_PROFILES="ONAP-MASTER ORAN-CHERRY" +#App names to include in the test when running kubernetes, space separated list +KUBE_INCLUDED_IMAGES=" MR CR PA RC PRODSTUB RICSIM CP ECS SDNC HTTPPROXY KUBEPROXY NGW" +#Prestarted 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="NGW" + +#Supported test environment profiles +SUPPORTED_PROFILES="ONAP-HONOLULU ONAP-ISTANBUL ORAN-CHERRY ORAN-D-RELEASE ORAN-E-RELEASE" +#Supported run modes +SUPPORTED_RUNMODES="DOCKER KUBE" . ../common/testcase_common.sh $@ . ../common/agent_api_functions.sh @@ -32,6 +44,15 @@ SUPPORTED_PROFILES="ONAP-MASTER ORAN-CHERRY" . ../common/prodstub_api_functions.sh . ../common/cr_api_functions.sh . ../common/rapp_catalogue_api_functions.sh +. ../common/mr_api_functions.sh +. ../common/control_panel_api_functions.sh +. ../common/controller_api_functions.sh +. ../common/consul_cbs_functions.sh +. ../common/http_proxy_api_functions.sh +. ../common/kube_proxy_api_functions.sh +. ../common/gateway_api_functions.sh + +setup_testenvironment #### TEST BEGIN #### @@ -44,41 +65,59 @@ use_sdnc_https use_simulator_https use_ecs_rest_https use_prod_stub_https -use_rapp_catalogue_http # https not yet supported +if [ $ECS_VERSION == "V1-1" ]; then + use_rapp_catalogue_http # https not yet supported +else + use_rapp_catalogue_https +fi + if [ "$PMS_VERSION" == "V2" ]; then - notificationurl=$CR_PATH"/test" + notificationurl=$CR_SERVICE_APP_PATH"/test" else echo "PMS VERSION 2 (V2) is required" exit 1 fi -clean_containers +clean_environment + +start_kube_proxy STD_NUM_RICS=2 +#start_http_proxy #Remove the comment on this line, comment out 'start_sdnc' and change SDNC to NOSDNC a few lines below to run with proxy + start_ric_simulators $RIC_SIM_PREFIX"_g3" $STD_NUM_RICS STD_2.0.0 start_mr #Just to prevent errors in the agent log... -start_control_panel +start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE -start_sdnc +if [ ! -z "$NRT_GATEWAY_APP_NAME" ]; then + start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE +fi -start_consul_cbs +start_sdnc # Comment this line to run PMS with proxy -prepare_consul_config SDNC ".consul_config.json" -consul_config_app ".consul_config.json" +start_policy_agent PROXY $SIM_GROUP/$POLICY_AGENT_COMPOSE_DIR/$POLICY_AGENT_CONFIG_FILE -start_policy_agent +if [ $RUNMODE == "DOCKER" ]; then + start_consul_cbs +fi -start_rapp_catalogue +prepare_consul_config SDNC ".consul_config.json" #Change to NOSDNC if running PMS with proxy + +if [ $RUNMODE == "KUBE" ]; then + agent_load_config ".consul_config.json" +else + consul_config_app ".consul_config.json" +fi start_cr start_prod_stub -start_ecs +start_ecs PROXY $SIM_GROUP/$ECS_COMPOSE_DIR/$ECS_CONFIG_FILE start_rapp_catalogue @@ -86,6 +125,10 @@ set_agent_trace set_ecs_trace +use_info_jobs=false #Set flag if interface supporting info-types is used +if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then + use_info_jobs=true +fi rapp_cat_api_get_services 200 EMPTY @@ -123,16 +166,16 @@ do done #Check the number of types -api_equal json:policy-types 2 120 +api_equal json:policy-types 2 300 -api_put_service 201 "Emergency-response-app" 0 "$CR_PATH/1" +api_put_service 201 "Emergency-response-app" 0 "$CR_SERVICE_APP_PATH/1" # Create policies in STD for ((i=1; i<=$STD_NUM_RICS; i++)) do - generate_uuid + generate_policy_uuid 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_uuid + generate_policy_uuid 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 @@ -143,33 +186,48 @@ do sim_equal $RIC_SIM_PREFIX"_g3_"$i num_instances 2 done - +# Print calling hosts STD 2.X +for ((i=1; i<=$STD_NUM_RICS; i++)) +do + sim_print $RIC_SIM_PREFIX"_g3_"$i remote_hosts +done FLAT_A1_EI="1" -CB_JOB="$PROD_STUB_HTTPX://$PROD_STUB_APP_NAME:$PROD_STUB_PORT/callbacks/job" -CB_SV="$PROD_STUB_HTTPX://$PROD_STUB_APP_NAME:$PROD_STUB_PORT/callbacks/supervision" -TARGET1="$RIC_SIM_HTTPX://ricsim_g3_1:$RIC_SIM_PORT/datadelivery" -TARGET2="$RIC_SIM_HTTPX://ricsim_g3_2:$RIC_SIM_PORT/datadelivery" +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" +RIC_G1_2=$RIC_SIM_PREFIX"_g3_2" +if [ $RUNMODE == "KUBE" ]; then + RIC_G1_1=$(get_kube_sim_host $RIC_G1_1) + RIC_G1_2=$(get_kube_sim_host $RIC_G1_2) +fi +TARGET1="$RIC_SIM_HTTPX://$RIC_G1_1:$RIC_SIM_PORT/datadelivery" +TARGET2="$RIC_SIM_HTTPX://$RIC_G1_1:$RIC_SIM_PORT/datadelivery" -STATUS1="$CR_HTTPX://$CR_APP_NAME:$CR_PORT/callbacks/job1-status" -STATUS2="$CR_HTTPX://$CR_APP_NAME:$CR_PORT/callbacks/job2-status" +STATUS1="$CR_SERVICE_APP_PATH/callbacks/job1-status" +STATUS2="$CR_SERVICE_APP_PATH/callbacks/job2-status" prodstub_arm_producer 200 prod-a prodstub_arm_type 200 prod-a type1 prodstub_arm_job_create 200 prod-a job1 prodstub_arm_job_create 200 prod-a job2 - ### ecs status ecs_api_service_status 200 +## Setup prod-a +if [ $ECS_VERSION == "V1-1" ]; then + ecs_api_edp_put_producer 201 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 testdata/ecs/ei-type-1.json + ecs_api_edp_get_producer 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 testdata/ecs/ei-type-1.json +else + ecs_api_edp_put_type_2 201 type1 testdata/ecs/ei-type-1.json -## Setup prod-a -ecs_api_edp_put_producer 201 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 testdata/ecs/ei-type-1.json + ecs_api_edp_put_producer_2 201 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 -ecs_api_edp_get_producer 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 testdata/ecs/ei-type-1.json + ecs_api_edp_get_producer_2 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 +fi ecs_api_edp_get_producer_status 200 prod-a ENABLED @@ -183,7 +241,15 @@ else fi # Check the job data in the producer -prodstub_check_jobdata 200 prod-a job1 type1 $TARGET1 testdata/ecs/job-template.json +if [ $ECS_VERSION == "V1-1" ]; then + prodstub_check_jobdata 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ecs/job-template.json +else + if [ $use_info_jobs ]; then + prodstub_check_jobdata_3 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ecs/job-template.json + else + prodstub_check_jobdata_2 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ecs/job-template.json + fi +fi ## Create a second job for prod-a @@ -195,10 +261,15 @@ else fi # Check the job data in the producer -prodstub_check_jobdata 200 prod-a job2 type1 $TARGET2 testdata/ecs/job-template.json - - - +if [ $ECS_VERSION == "V1-1" ]; then + prodstub_check_jobdata 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ecs/job-template.json +else + if [ $use_info_jobs ]; then + prodstub_check_jobdata_3 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ecs/job-template.json + else + prodstub_check_jobdata_2 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ecs/job-template.json + fi +fi check_policy_agent_logs check_ecs_logs @@ -209,3 +280,5 @@ check_sdnc_logs store_logs END print_result + +auto_clean_environment \ No newline at end of file