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=cbb78700fc01d812729e5f7383707e6004e66ee6;hpb=d6624171da70a1c71e3d5b8263855fabf613a06e;p=nonrtric.git diff --git a/test/auto-test/FTC1800.sh b/test/auto-test/FTC1800.sh index cbb78700..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" @@ -88,6 +88,21 @@ if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then 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 @@ -203,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 @@ -309,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 @@ -688,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