X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC2001.sh;h=d94b3d7570169f6bb209e8bfabbda1a423888b27;hb=7d7cb5f4f6306db8193ebd4e6e110fa0060900fa;hp=7c1202c459932e258df4b9d90ea68ef206c2d31f;hpb=e60d04ec982c4ccb833226624ff5c3e3f311097a;p=nonrtric.git diff --git a/test/auto-test/FTC2001.sh b/test/auto-test/FTC2001.sh index 7c1202c4..d94b3d75 100755 --- a/test/auto-test/FTC2001.sh +++ b/test/auto-test/FTC2001.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,13 +17,13 @@ # ============LICENSE_END================================================= # -TC_ONELINE_DESCR="Testing southbound proxy for PMS and ICS" +TC_ONELINE_DESCR="Testing southbound proxy for A1PMS and ICS" #App names to include in the test when running docker, space separated list -DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM ICS PRODSTUB HTTPPROXY NGW KUBEPROXY" +DOCKER_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM ICS PRODSTUB HTTPPROXY NGW KUBEPROXY" #App names to include in the test when running kubernetes, space separated list -KUBE_INCLUDED_IMAGES=" MR CR PA PRODSTUB RICSIM CP ICS HTTPPROXY KUBEPROXY NGW" +KUBE_INCLUDED_IMAGES=" MR CR A1PMS PRODSTUB RICSIM CP ICS HTTPPROXY KUBEPROXY NGW" #Prestarted app (not started by script) to include in the test when running kubernetes, space separated list KUBE_PRESTARTED_IMAGES="" @@ -33,7 +33,7 @@ KUBE_PRESTARTED_IMAGES="" 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-JAKARTA ONAP-KOHN ONAP-LONDON ORAN-F-RELEASE ORAN-G-RELEASE ORAN-H-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" @@ -47,17 +47,12 @@ setup_testenvironment ########################## use_cr_https -use_agent_rest_https +use_a1pms_rest_https use_simulator_https use_ics_rest_https use_prod_stub_https -if [ "$PMS_VERSION" == "V2" ]; then - notificationurl=$CR_SERVICE_APP_PATH_0"/test" -else - echo "PMS VERSION 2 (V2) is required" - exit 1 -fi +notificationurl=$CR_SERVICE_APP_PATH_0"/test" clean_environment @@ -69,7 +64,11 @@ start_http_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... +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 @@ -77,18 +76,16 @@ if [ ! -z "$NRT_GATEWAY_APP_NAME" ]; then start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE fi -start_policy_agent PROXY $SIM_GROUP/$POLICY_AGENT_COMPOSE_DIR/$POLICY_AGENT_CONFIG_FILE +start_a1pms PROXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE + -if [ $RUNMODE == "DOCKER" ]; then - start_consul_cbs -fi -prepare_consul_config NOSDNC ".consul_config.json" +prepare_a1pms_config NOSDNC ".a1pms_config.json" if [ $RUNMODE == "KUBE" ]; then - agent_load_config ".consul_config.json" + a1pms_load_config ".a1pms_config.json" else - consul_config_app ".consul_config.json" + a1pms_api_put_configuration 200 ".a1pms_config.json" fi start_cr 1 @@ -97,11 +94,13 @@ start_prod_stub start_ics PROXY $SIM_GROUP/$ICS_COMPOSE_DIR/$ICS_CONFIG_FILE -set_agent_trace +set_a1pms_trace set_ics_debug -api_get_status 200 +sleep_wait 120 "Let A1PMS cofiguration take effect" + +a1pms_api_get_status 200 # Print the A1 version for STD 2.X for ((i=1; i<=$STD_NUM_RICS; i++)) @@ -116,32 +115,32 @@ do done #Check the number of schemas and the individual schemas in STD -api_equal json:policy-types 2 120 +a1pms_equal json:policy-types 2 120 for ((i=1; i<=$STD_NUM_RICS; i++)) do - api_equal json:policy-types?ric_id=$RIC_SIM_PREFIX"_g3_"$i 2 120 + a1pms_equal json:policy-types?ric_id=$RIC_SIM_PREFIX"_g3_"$i 2 120 done # Check the schemas in STD for ((i=1; i<=$STD_NUM_RICS; i++)) do - api_get_policy_type 200 STD_QOS_0_2_0 demo-testdata/STD2/qos-agent-modified.json - api_get_policy_type 200 'STD_QOS2_0.1.0' demo-testdata/STD2/qos2-agent-modified.json + a1pms_api_get_policy_type 200 STD_QOS_0_2_0 demo-testdata/STD2/qos-a1pms-modified.json + a1pms_api_get_policy_type 200 'STD_QOS2_0.1.0' demo-testdata/STD2/qos2-a1pms-modified.json done #Check the number of types -api_equal json:policy-types 2 300 +a1pms_equal json:policy-types 2 300 -api_put_service 201 "Emergency-response-app" 0 "$CR_SERVICE_APP_PATH_0/1" +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 - 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 - 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 + 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 + 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 @@ -158,7 +157,6 @@ do sim_contains_str $RIC_SIM_PREFIX"_g3_"$i remote_hosts proxy 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" @@ -192,59 +190,28 @@ if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then fi ## 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 [[ "$ICS_FEATURE_LEVEL" != *"INFO-TYPES"* ]]; then - prodstub_check_jobdata_2 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json - else - prodstub_check_jobdata_3 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_2 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ics/job-template.json - else - prodstub_check_jobdata_3 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 # Arm producer prod-a for supervision failure prodstub_arm_producer 200 prod-a 400 @@ -252,11 +219,7 @@ prodstub_arm_producer 200 prod-a 400 # Wait for producer prod-a to go disabled ics_api_edp_get_producer_status 200 prod-a DISABLED 360 -if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then - ics_equal json:data-producer/v1/info-producers 0 1000 -else - ics_equal json:ei-producer/v1/eiproducers 0 1000 -fi +ics_equal json:data-producer/v1/info-producers 0 1000 if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then cr_equal 0 received_callbacks 3 30 @@ -271,7 +234,7 @@ fi cr_contains_str 0 remote_hosts $HTTP_PROXY_APP_NAME -check_policy_agent_logs +check_a1pms_logs check_ics_logs #### TEST COMPLETE ####