X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC1800.sh;h=bb9ed60772512e3373b0b7d8d9e5ac7449125937;hb=fc15c05eeaedbb68fd58b7387ff707bd23f49eef;hp=fd50bc9b2350438c78e912968aa331b77d1814fc;hpb=c675b454a3434d690695a7336700f78a51579400;p=nonrtric.git diff --git a/test/auto-test/FTC1800.sh b/test/auto-test/FTC1800.sh index fd50bc9b..bb9ed607 100755 --- a/test/auto-test/FTC1800.sh +++ b/test/auto-test/FTC1800.sh @@ -34,7 +34,7 @@ KUBE_PRESTARTED_IMAGES="" CONDITIONALLY_IGNORED_IMAGES="NGW" #Supported test environment profiles -SUPPORTED_PROFILES="ONAP-HONOLULU ONAP-ISTANBUL ORAN-CHERRY ORAN-D-RELEASE" +SUPPORTED_PROFILES="ONAP-HONOLULU ONAP-ISTANBUL ORAN-CHERRY ORAN-D-RELEASE ORAN-E-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" @@ -82,13 +82,27 @@ CB_SV="$PROD_STUB_SERVICE_PATH$PROD_STUB_SUPERVISION_CALLBACK" TARGET="http://localhost:80/target" # Dummy target NUM_JOBS=10000 - use_info_jobs=false #Set flag if interface supporting info-types is used if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then use_info_jobs=true NUM_JOBS=5000 # 5K ei jobs and 5K info jobs fi +if [[ "$ECS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then + #Type registration status callbacks + TYPESTATUS1="$CR_SERVICE_PATH/type-status1" + TYPESTATUS2="$CR_SERVICE_PATH/type-status2" + + ecs_api_idc_put_subscription 201 subscription-id-1 owner1 $TYPESTATUS1 + + ecs_api_idc_get_subscription_ids 200 owner1 subscription-id-1 + + ecs_api_idc_put_subscription 201 subscription-id-2 owner2 $TYPESTATUS2 + + ecs_api_idc_get_subscription_ids 200 owner2 subscription-id-2 + +fi + # Setup prodstub sim to accept calls for producers, types and jobs prodstub_arm_producer 200 prod-a prodstub_arm_producer 200 prod-b @@ -204,6 +218,39 @@ else ecs_api_edp_put_type_2 201 type104 testdata/ecs/info-type-4.json ecs_api_edp_put_type_2 201 type105 testdata/ecs/info-type-5.json + + + if [[ "$ECS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then + cr_equal received_callbacks 20 30 + cr_equal received_callbacks?id=type-status1 10 + cr_equal received_callbacks?id=type-status2 10 + + cr_api_check_all_ecs_subscription_events 200 type-status1 \ + type1 testdata/ecs/ei-type-1.json REGISTERED \ + type2 testdata/ecs/ei-type-2.json REGISTERED \ + type3 testdata/ecs/ei-type-3.json REGISTERED \ + type4 testdata/ecs/ei-type-4.json REGISTERED \ + type5 testdata/ecs/ei-type-5.json REGISTERED \ + type101 testdata/ecs/info-type-1.json REGISTERED \ + type102 testdata/ecs/info-type-2.json REGISTERED \ + type103 testdata/ecs/info-type-3.json REGISTERED \ + type104 testdata/ecs/info-type-4.json REGISTERED \ + type105 testdata/ecs/info-type-5.json REGISTERED + + cr_api_check_all_ecs_subscription_events 200 type-status2 \ + type1 testdata/ecs/ei-type-1.json REGISTERED \ + type2 testdata/ecs/ei-type-2.json REGISTERED \ + type3 testdata/ecs/ei-type-3.json REGISTERED \ + type4 testdata/ecs/ei-type-4.json REGISTERED \ + type5 testdata/ecs/ei-type-5.json REGISTERED \ + type101 testdata/ecs/info-type-1.json REGISTERED \ + type102 testdata/ecs/info-type-2.json REGISTERED \ + type103 testdata/ecs/info-type-3.json REGISTERED \ + type104 testdata/ecs/info-type-4.json REGISTERED \ + type105 testdata/ecs/info-type-5.json REGISTERED + + fi + ecs_api_edp_put_producer_2 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 type101 ecs_api_edp_put_producer_2 200 prod-b $CB_JOB/prod-b $CB_SV/prod-b type1 type2 type101 type102 @@ -236,7 +283,7 @@ do fi if [ $use_info_jobs ]; then ecs_api_idc_put_job 201 job$(($i+$NUM_JOBS)) type101 $TARGET info-owner $CR_SERVICE_PATH/job_status_info-owner testdata/ecs/job-template.json VALIDATE - ecs_api_idc_get_job_status 200 job$(($i+$NUM_JOBS)) ENABLED 120 + ecs_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) ENABLED 3 prod-a prod-b prod-c 120 fi fi if [ $(($i%5)) -eq 1 ]; then @@ -248,7 +295,7 @@ do fi if [ $use_info_jobs ]; then ecs_api_idc_put_job 201 job$(($i+$NUM_JOBS)) type102 $TARGET info-owner $CR_SERVICE_PATH/job_status_info-owner testdata/ecs/job-template.json VALIDATE - ecs_api_idc_get_job_status 200 job$(($i+$NUM_JOBS)) ENABLED 120 + ecs_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) ENABLED 2 prod-b prod-c 120 fi fi if [ $(($i%5)) -eq 2 ]; then @@ -260,7 +307,7 @@ do fi if [ $use_info_jobs ]; then ecs_api_idc_put_job 201 job$(($i+$NUM_JOBS)) type103 $TARGET info-owner $CR_SERVICE_PATH/job_status_info-owner testdata/ecs/job-template.json VALIDATE - ecs_api_idc_get_job_status 200 job$(($i+$NUM_JOBS)) ENABLED 120 + ecs_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) ENABLED 1 prod-c 120 fi fi if [ $(($i%5)) -eq 3 ]; then @@ -272,7 +319,7 @@ do fi if [ $use_info_jobs ]; then ecs_api_idc_put_job 201 job$(($i+$NUM_JOBS)) type104 $TARGET info-owner $CR_SERVICE_PATH/job_status_info-owner testdata/ecs/job-template.json VALIDATE - ecs_api_idc_get_job_status 200 job$(($i+$NUM_JOBS)) ENABLED 120 + ecs_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) ENABLED 1 prod-d 120 fi fi if [ $(($i%5)) -eq 4 ]; then @@ -284,7 +331,7 @@ do fi if [ $use_info_jobs ]; then ecs_api_idc_put_job 201 job$(($i+$NUM_JOBS)) type105 $TARGET info-owner $CR_SERVICE_PATH/job_status_info-owner testdata/ecs/job-template.json VALIDATE - ecs_api_idc_get_job_status 200 job$(($i+$NUM_JOBS)) ENABLED 120 + ecs_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) ENABLED 1 prod-d 120 fi fi done @@ -310,12 +357,54 @@ if [ $use_info_jobs ]; then ecs_equal json:data-consumer/v1/info-jobs?infoTypeId=type105 $(($NUM_JOBS/5)) fi +if [[ "$ECS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then + cr_equal received_callbacks 20 30 + +else + cr_equal received_callbacks 0 30 + +fi + + +if [[ "$ECS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then + + ecs_equal json:/data-consumer/v1/info-type-subscription 2 200 + + ecs_api_idc_get_subscription_ids 200 owner1 subscription-id-1 + ecs_api_idc_get_subscription_ids 200 owner2 subscription-id-2 + + if [ $use_info_jobs ]; then + ecs_equal json:data-producer/v1/info-types 10 1000 + else + ecs_equal json:ei-producer/v1/eitypes 5 1000 + fi + +fi + stop_ecs +cr_api_reset + start_stopped_ecs set_ecs_trace +if [[ "$ECS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then + + ecs_equal json:/data-consumer/v1/info-type-subscription 2 200 + + ecs_api_idc_get_subscription_ids 200 owner1 subscription-id-1 + ecs_api_idc_get_subscription_ids 200 owner2 subscription-id-2 + + if [ $use_info_jobs ]; then + ecs_equal json:data-producer/v1/info-types 10 1000 + else + ecs_equal json:ei-producer/v1/eitypes 5 1000 + fi +fi + +cr_equal received_callbacks 0 + for ((i=1; i<=$NUM_JOBS; i++)) do if [ $(($i%5)) -eq 0 ]; then @@ -370,7 +459,7 @@ do ecs_api_a1_get_job_status 200 job$i DISABLED 120 fi if [ $use_info_jobs ]; then - ecs_api_idc_get_job_status 200 job$(($i+$NUM_JOBS)) DISABLED 120 + ecs_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) DISABLED EMPTYPROD 120 fi fi if [ $(($i%5)) -eq 1 ]; then @@ -380,7 +469,7 @@ do ecs_api_a1_get_job_status 200 job$i DISABLED 120 fi if [ $use_info_jobs ]; then - ecs_api_idc_get_job_status 200 job$(($i+$NUM_JOBS)) DISABLED 120 + ecs_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) DISABLED EMPTYPROD 120 fi fi if [ $(($i%5)) -eq 2 ]; then @@ -390,7 +479,7 @@ do ecs_api_a1_get_job_status 200 job$i DISABLED 120 fi if [ $use_info_jobs ]; then - ecs_api_idc_get_job_status 200 job$(($i+$NUM_JOBS)) DISABLED 120 + ecs_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) DISABLED EMPTYPROD 120 fi fi if [ $(($i%5)) -eq 3 ]; then @@ -400,7 +489,7 @@ do ecs_api_a1_get_job_status 200 job$i DISABLED 120 fi if [ $use_info_jobs ]; then - ecs_api_idc_get_job_status 200 job$(($i+$NUM_JOBS)) DISABLED 120 + ecs_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) DISABLED EMPTYPROD 120 fi fi if [ $(($i%5)) -eq 4 ]; then @@ -410,7 +499,7 @@ do ecs_api_a1_get_job_status 200 job$i DISABLED 120 fi if [ $use_info_jobs ]; then - ecs_api_idc_get_job_status 200 job$(($i+$NUM_JOBS)) DISABLED 120 + ecs_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) DISABLED EMPTYPROD 120 fi fi done @@ -466,7 +555,7 @@ do ecs_api_a1_get_job_status 200 job$i ENABLED 120 fi if [ $use_info_jobs ]; then - ecs_api_idc_get_job_status 200 job$(($i+$NUM_JOBS)) ENABLED 120 + ecs_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) ENABLED 3 prod-a prod-b prod-c 120 fi fi if [ $(($i%5)) -eq 1 ]; then @@ -476,7 +565,7 @@ do ecs_api_a1_get_job_status 200 job$i ENABLED 120 fi if [ $use_info_jobs ]; then - ecs_api_idc_get_job_status 200 job$(($i+$NUM_JOBS)) ENABLED 120 + ecs_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) ENABLED 2 prod-b prod-c 120 fi fi if [ $(($i%5)) -eq 2 ]; then @@ -486,7 +575,7 @@ do ecs_api_a1_get_job_status 200 job$i ENABLED 120 fi if [ $use_info_jobs ]; then - ecs_api_idc_get_job_status 200 job$(($i+$NUM_JOBS)) ENABLED 120 + ecs_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) ENABLED 1 prod-c 120 fi fi if [ $(($i%5)) -eq 3 ]; then @@ -496,7 +585,7 @@ do ecs_api_a1_get_job_status 200 job$i ENABLED 120 fi if [ $use_info_jobs ]; then - ecs_api_idc_get_job_status 200 job$(($i+$NUM_JOBS)) ENABLED 120 + ecs_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) ENABLED 1 prod-d 120 fi fi if [ $(($i%5)) -eq 4 ]; then @@ -506,7 +595,7 @@ do ecs_api_a1_get_job_status 200 job$i ENABLED 120 fi if [ $use_info_jobs ]; then - ecs_api_idc_get_job_status 200 job$(($i+$NUM_JOBS)) ENABLED 120 + ecs_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) ENABLED 1 prod-d 120 fi fi done @@ -689,6 +778,39 @@ if [ $use_info_jobs ]; then ecs_equal json:data-consumer/v1/info-jobs?infoTypeId=type105 0 fi +if [ $use_info_jobs ]; then + if [[ "$ECS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then + ecs_api_edp_put_type_2 200 type101 testdata/ecs/info-type-1.json + ecs_api_edp_put_type_2 200 type102 testdata/ecs/info-type-2.json + ecs_api_edp_put_type_2 200 type103 testdata/ecs/info-type-3.json + ecs_api_edp_put_type_2 200 type104 testdata/ecs/info-type-4.json + ecs_api_edp_put_type_2 200 type105 testdata/ecs/info-type-5.json + fi +fi + +if [[ "$ECS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then + cr_equal received_callbacks 10 30 + cr_equal received_callbacks?id=type-status1 5 + cr_equal received_callbacks?id=type-status2 5 + + cr_api_check_all_ecs_subscription_events 200 type-status1 \ + type101 testdata/ecs/info-type-1.json REGISTERED \ + type102 testdata/ecs/info-type-2.json REGISTERED \ + type103 testdata/ecs/info-type-3.json REGISTERED \ + type104 testdata/ecs/info-type-4.json REGISTERED \ + type105 testdata/ecs/info-type-5.json REGISTERED + + cr_api_check_all_ecs_subscription_events 200 type-status2 \ + type101 testdata/ecs/info-type-1.json REGISTERED \ + type102 testdata/ecs/info-type-2.json REGISTERED \ + type103 testdata/ecs/info-type-3.json REGISTERED \ + type104 testdata/ecs/info-type-4.json REGISTERED \ + type105 testdata/ecs/info-type-5.json REGISTERED + +else + cr_equal received_callbacks 0 30 +fi + check_ecs_logs store_logs END