X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=test%2Fauto-test%2FFTC2001.sh;h=f63e5d1dac885d82bc356f84fa5d1902b42f0c5e;hb=refs%2Fchanges%2F88%2F12388%2F5;hp=3b53e8ef7a78e0cced0fe32927b93edd5167f84d;hpb=2b362b57251e5d685f4262ba532022295ddb8d0e;p=nonrtric.git diff --git a/test/auto-test/FTC2001.sh b/test/auto-test/FTC2001.sh index 3b53e8ef..f63e5d1d 100755 --- a/test/auto-test/FTC2001.sh +++ b/test/auto-test/FTC2001.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. @@ -24,7 +25,7 @@ DOCKER_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM ICS PRODSTUB HTTPPROXY NGW KUBEPRO #App names to include in the test when running kubernetes, space separated list 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 +#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 @@ -33,7 +34,7 @@ KUBE_PRESTARTED_IMAGES="" CONDITIONALLY_IGNORED_IMAGES="NGW" #Supported test environment profiles -SUPPORTED_PROFILES="ONAP-JAKARTA ONAP-KOHN ONAP-LONDON ORAN-F-RELEASE ORAN-G-RELEASE ORAN-H-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" @@ -64,7 +65,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 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 @@ -94,7 +99,7 @@ set_a1pms_trace set_ics_debug -sleep_wait 120 "Let A1PMS cofiguration take effect" +sleep_wait 120 "Let A1PMS configuration take effect" a1pms_api_get_status 200 @@ -103,7 +108,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 @@ -133,9 +138,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 @@ -153,7 +158,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" @@ -187,59 +191,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_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_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 @@ -247,11 +220,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