X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC1100.sh;h=fe59d45b27b606bcedb88a56e0cda9ff04728563;hb=c963b73942867f631f9e5708e28025140afcb893;hp=9921108fe1432b2dd9a8597b5d754a56e13d243b;hpb=b83e54c2bdab21d7f6ff5c9a4c340e801c93e1c2;p=nonrtric.git diff --git a/test/auto-test/FTC1100.sh b/test/auto-test/FTC1100.sh index 9921108f..fe59d45b 100755 --- a/test/auto-test/FTC1100.sh +++ b/test/auto-test/FTC1100.sh @@ -18,24 +18,35 @@ # -TC_ONELINE_DESCR="ECS full intefaces walkthrough" +TC_ONELINE_DESCR="ECS full interfaces walkthrough" -#App names to include in the test, space separated list -INCLUDED_IMAGES="ECS PRODSTUB CR RICSIM CP" +#App names to include in the test when running docker, space separated list +DOCKER_INCLUDED_IMAGES="ECS PRODSTUB CR RICSIM CP HTTPPROXY" -#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=" PRODSTUB CR ECS RICSIM CP HTTPPROXY" +#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list +KUBE_PRESTARTED_IMAGES=" " + +#Supported test environment profiles +SUPPORTED_PROFILES="ONAP-HONOLULU ORAN-CHERRY ORAN-DAWN" +#Supported run modes +SUPPORTED_RUNMODES="DOCKER KUBE" . ../common/testcase_common.sh $@ . ../common/ecs_api_functions.sh . ../common/prodstub_api_functions.sh . ../common/cr_api_functions.sh +. ../common/control_panel_api_functions.sh +. ../common/controller_api_functions.sh +. ../common/ricsimulator_api_functions.sh +. ../common/http_proxy_api_functions.sh #### TEST BEGIN #### FLAT_A1_EI="1" -clean_containers +clean_environment use_ecs_rest_https @@ -45,13 +56,19 @@ use_simulator_https use_cr_https -start_ecs +#start_http_proxy #Uncomment this cmd to run with proxy + +start_ecs NOPROXY $SIM_GROUP/$ECS_COMPOSE_DIR/application.yaml #Change NOPROXY to PROXY to run with http proxy + +if [ $RUNMODE == "KUBE" ]; then + ecs_api_admin_reset +fi start_prod_stub set_ecs_trace -start_control_panel +start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/application.properties if [ "$PMS_VERSION" == "V2" ]; then start_ric_simulators ricsim_g3 4 STD_2.0.0 @@ -59,19 +76,19 @@ fi start_cr -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" +CB_JOB="$PROD_STUB_SERVICE_PATH$PROD_STUB_JOB_CALLBACK" +CB_SV="$PROD_STUB_SERVICE_PATH$PROD_STUB_SUPERVISION_CALLBACK" TARGET1="$RIC_SIM_HTTPX://ricsim_g3_1:$RIC_SIM_PORT/datadelivery" TARGET2="$RIC_SIM_HTTPX://ricsim_g3_2:$RIC_SIM_PORT/datadelivery" TARGET3="$RIC_SIM_HTTPX://ricsim_g3_3:$RIC_SIM_PORT/datadelivery" TARGET8="$RIC_SIM_HTTPX://ricsim_g3_4:$RIC_SIM_PORT/datadelivery" TARGET10="$RIC_SIM_HTTPX://ricsim_g3_4:$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" -STATUS3="$CR_HTTPX://$CR_APP_NAME:$CR_PORT/callbacks/job3-status" -STATUS8="$CR_HTTPX://$CR_APP_NAME:$CR_PORT/callbacks/job8-status" -STATUS10="$CR_HTTPX://$CR_APP_NAME:$CR_PORT/callbacks/job10-status" +STATUS1="$CR_SERVICE_PATH/job1-status" +STATUS2="$CR_SERVICE_PATH/job2-status" +STATUS3="$CR_SERVICE_PATH/job3-status" +STATUS8="$CR_SERVICE_PATH/job8-status" +STATUS10="$CR_SERVICE_PATH/job10-status" ### Setup prodstub sim to accept calls for producers, types and jobs ## prod-a type1 @@ -138,11 +155,19 @@ ecs_api_a1_get_type_ids 200 EMPTY ecs_api_a1_get_type 404 test-type ecs_api_edp_get_type_ids 200 EMPTY -ecs_api_edp_get_type 404 test-type - -ecs_api_edp_get_producer_ids 200 EMPTY -ecs_api_edp_get_producer 404 test-prod +if [ $ECS_VERSION == "V1-1" ]; then + ecs_api_edp_get_type 404 test-type +else + ecs_api_edp_get_type_2 404 test-type +fi +if [ $ECS_VERSION == "V1-1" ]; then + ecs_api_edp_get_producer_ids 200 EMPTY + ecs_api_edp_get_producer 404 test-prod +else + ecs_api_edp_get_producer_ids_2 200 NOTYPE EMPTY + ecs_api_edp_get_producer_2 404 test-prod +fi ecs_api_edp_get_producer_status 404 test-prod ecs_api_edp_delete_producer 404 test-prod @@ -169,14 +194,45 @@ else ecs_api_a1_delete_job 404 test-job fi -ecs_api_edp_get_producer_jobs 404 test-prod +if [ $ECS_VERSION == "V1-1" ]; then + ecs_api_edp_get_producer_jobs 404 test-prod +else + ecs_api_edp_get_producer_jobs_2 404 test-prod +fi +if [ $ECS_VERSION == "V1-2" ]; then + ecs_api_edp_get_type_2 404 test-type + ecs_api_edp_delete_type_2 404 test-type +fi ### Setup of producer/job and testing apis ### ## 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 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 testdata/ecs/ei-type-1.json +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_put_producer 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 testdata/ecs/ei-type-1.json +else + #V1-2 + ecs_api_edp_get_type_ids 200 EMPTY + ecs_api_edp_get_type_2 404 type1 + ecs_api_edp_put_producer_2 404 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 + + # Create type, delete and create again + ecs_api_edp_put_type_2 201 type1 testdata/ecs/ei-type-1.json + ecs_api_edp_get_type_2 200 type1 + ecs_api_edp_get_type_ids 200 type1 + ecs_api_edp_delete_type_2 204 type1 + ecs_api_edp_get_type_2 404 type1 + ecs_api_edp_get_type_ids 200 EMPTY + ecs_api_edp_put_type_2 201 type1 testdata/ecs/ei-type-1.json + ecs_api_edp_get_type_ids 200 type1 + ecs_api_edp_get_type_2 200 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_put_producer_2 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 + + ecs_api_edp_delete_type_2 406 type1 +fi ecs_api_a1_get_type_ids 200 type1 @@ -187,11 +243,25 @@ else fi ecs_api_edp_get_type_ids 200 type1 -ecs_api_edp_get_type 200 type1 testdata/ecs/ei-type-1.json prod-a +if [ $ECS_VERSION == "V1-1" ]; then + ecs_api_edp_get_type 200 type1 testdata/ecs/ei-type-1.json prod-a +else + ecs_api_edp_get_type_2 200 type1 testdata/ecs/ei-type-1.json +fi -ecs_api_edp_get_producer_ids 200 prod-a +if [ $ECS_VERSION == "V1-1" ]; then + ecs_api_edp_get_producer_ids 200 prod-a +else + ecs_api_edp_get_producer_ids_2 200 NOTYPE prod-a + ecs_api_edp_get_producer_ids_2 200 type1 prod-a + ecs_api_edp_get_producer_ids_2 200 type2 EMPTY +fi -ecs_api_edp_get_producer 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 testdata/ecs/ei-type-1.json +if [ $ECS_VERSION == "V1-1" ]; then + 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_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 @@ -207,8 +277,11 @@ else ecs_api_a1_get_job_status 404 test-job fi - -ecs_api_edp_get_producer_jobs 200 prod-a EMPTY +if [ $ECS_VERSION == "V1-1" ]; then + ecs_api_edp_get_producer_jobs 200 prod-a EMPTY +else + ecs_api_edp_get_producer_jobs_2 200 prod-a EMPTY +fi ## Create a job for prod-a ## job1 - prod-a @@ -219,7 +292,11 @@ 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 + prodstub_check_jobdata_2 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ecs/job-template.json +fi ecs_api_a1_get_job_ids 200 type1 NOWNER job1 ecs_api_a1_get_job_ids 200 type1 ricsim_g3_1 job1 @@ -240,7 +317,11 @@ fi prodstub_equal create/prod-a/job1 1 -ecs_api_edp_get_producer_jobs 200 prod-a job1 type1 $TARGET1 testdata/ecs/job-template.json +if [ $ECS_VERSION == "V1-1" ]; then + ecs_api_edp_get_producer_jobs 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ecs/job-template.json +else + ecs_api_edp_get_producer_jobs_2 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ecs/job-template.json +fi ## Create a second job for prod-a ## job2 - prod-a @@ -251,8 +332,11 @@ 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 + prodstub_check_jobdata_2 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ecs/job-template.json +fi ecs_api_a1_get_job_ids 200 type1 NOWNER job1 job2 ecs_api_a1_get_job_ids 200 type1 ricsim_g3_1 job1 ecs_api_a1_get_job_ids 200 type1 ricsim_g3_2 job2 @@ -272,10 +356,20 @@ fi prodstub_equal create/prod-a/job2 1 -ecs_api_edp_get_producer_jobs 200 prod-a job1 type1 $TARGET1 testdata/ecs/job-template.json job2 type1 $TARGET2 testdata/ecs/job-template.json +if [ $ECS_VERSION == "V1-1" ]; then + ecs_api_edp_get_producer_jobs 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ecs/job-template.json job2 type1 $TARGET2 ricsim_g3_2 testdata/ecs/job-template.json +else + ecs_api_edp_get_producer_jobs_2 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ecs/job-template.json job2 type1 $TARGET2 ricsim_g3_2 testdata/ecs/job-template.json +fi ## Setup prod-b -ecs_api_edp_put_producer 201 prod-b $CB_JOB/prod-b $CB_SV/prod-b type2 testdata/ecs/ei-type-2.json +if [ $ECS_VERSION == "V1-1" ]; then + ecs_api_edp_put_producer 201 prod-b $CB_JOB/prod-b $CB_SV/prod-b type2 testdata/ecs/ei-type-2.json +else + ecs_api_edp_put_type_2 201 type2 testdata/ecs/ei-type-2.json + ecs_api_edp_put_producer_2 201 prod-b $CB_JOB/prod-b $CB_SV/prod-b type2 +fi + ecs_api_a1_get_type_ids 200 type1 type2 if [ -z "$FLAT_A1_EI" ]; then @@ -287,14 +381,27 @@ else fi ecs_api_edp_get_type_ids 200 type1 type2 -ecs_api_edp_get_type 200 type1 testdata/ecs/ei-type-1.json prod-a -ecs_api_edp_get_type 200 type2 testdata/ecs/ei-type-2.json prod-b - -ecs_api_edp_get_producer_ids 200 prod-a prod-b +if [ $ECS_VERSION == "V1-1" ]; then + ecs_api_edp_get_type 200 type1 testdata/ecs/ei-type-1.json prod-a + ecs_api_edp_get_type 200 type2 testdata/ecs/ei-type-2.json prod-b +else + ecs_api_edp_get_type_2 200 type1 testdata/ecs/ei-type-1.json + ecs_api_edp_get_type_2 200 type2 testdata/ecs/ei-type-2.json +fi -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 200 prod-b $CB_JOB/prod-b $CB_SV/prod-b type2 testdata/ecs/ei-type-2.json +if [ $ECS_VERSION == "V1-1" ]; then + ecs_api_edp_get_producer_ids 200 prod-a prod-b +else + ecs_api_edp_get_producer_ids_2 200 NOTYPE prod-a prod-b +fi +if [ $ECS_VERSION == "V1-1" ]; then + 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 200 prod-b $CB_JOB/prod-b $CB_SV/prod-b type2 testdata/ecs/ei-type-2.json +else + ecs_api_edp_get_producer_2 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 + ecs_api_edp_get_producer_2 200 prod-b $CB_JOB/prod-b $CB_SV/prod-b type2 +fi ecs_api_edp_get_producer_status 200 prod-b ENABLED @@ -309,7 +416,11 @@ fi prodstub_equal create/prod-b/job3 1 # Check the job data in the producer -prodstub_check_jobdata 200 prod-b job3 type2 $TARGET3 testdata/ecs/job-template.json +if [ $ECS_VERSION == "V1-1" ]; then + prodstub_check_jobdata 200 prod-b job3 type2 $TARGET3 ricsim_g3_3 testdata/ecs/job-template.json +else + prodstub_check_jobdata_2 200 prod-b job3 type2 $TARGET3 ricsim_g3_3 testdata/ecs/job-template.json +fi ecs_api_a1_get_job_ids 200 type1 NOWNER job1 job2 ecs_api_a1_get_job_ids 200 type2 NOWNER job3 @@ -327,19 +438,36 @@ else ecs_api_a1_get_job_status 200 job3 ENABLED fi -ecs_api_edp_get_producer_jobs 200 prod-a job1 type1 $TARGET1 testdata/ecs/job-template.json job2 type1 $TARGET2 testdata/ecs/job-template.json -ecs_api_edp_get_producer_jobs 200 prod-b job3 type2 $TARGET3 testdata/ecs/job-template.json - +if [ $ECS_VERSION == "V1-1" ]; then + ecs_api_edp_get_producer_jobs 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ecs/job-template.json job2 type1 $TARGET2 ricsim_g3_2 testdata/ecs/job-template.json + ecs_api_edp_get_producer_jobs 200 prod-b job3 type2 $TARGET3 ricsim_g3_3 testdata/ecs/job-template.json +else + ecs_api_edp_get_producer_jobs_2 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ecs/job-template.json job2 type1 $TARGET2 ricsim_g3_2 testdata/ecs/job-template.json + ecs_api_edp_get_producer_jobs_2 200 prod-b job3 type2 $TARGET3 ricsim_g3_3 testdata/ecs/job-template.json +fi ## Setup prod-c (no types) -ecs_api_edp_put_producer 201 prod-c $CB_JOB/prod-c $CB_SV/prod-c NOTYPE - +if [ $ECS_VERSION == "V1-1" ]; then + ecs_api_edp_put_producer 201 prod-c $CB_JOB/prod-c $CB_SV/prod-c NOTYPE +else + ecs_api_edp_put_producer_2 201 prod-c $CB_JOB/prod-c $CB_SV/prod-c NOTYPE +fi -ecs_api_edp_get_producer_ids 200 prod-a prod-b prod-c +if [ $ECS_VERSION == "V1-1" ]; then + ecs_api_edp_get_producer_ids 200 prod-a prod-b prod-c +else + ecs_api_edp_get_producer_ids_2 200 NOTYPE prod-a prod-b prod-c +fi -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 200 prod-b $CB_JOB/prod-b $CB_SV/prod-b type2 testdata/ecs/ei-type-2.json -ecs_api_edp_get_producer 200 prod-c $CB_JOB/prod-c $CB_SV/prod-c EMPTY +if [ $ECS_VERSION == "V1-1" ]; then + 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 200 prod-b $CB_JOB/prod-b $CB_SV/prod-b type2 testdata/ecs/ei-type-2.json + ecs_api_edp_get_producer 200 prod-c $CB_JOB/prod-c $CB_SV/prod-c EMPTY +else + ecs_api_edp_get_producer_2 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 + ecs_api_edp_get_producer_2 200 prod-b $CB_JOB/prod-b $CB_SV/prod-b type2 + ecs_api_edp_get_producer_2 200 prod-c $CB_JOB/prod-c $CB_SV/prod-c EMPTY +fi ecs_api_edp_get_producer_status 200 prod-c ENABLED @@ -348,7 +476,11 @@ ecs_api_edp_get_producer_status 200 prod-c ENABLED # Delete job then producer ecs_api_a1_get_job_ids 200 NOTYPE NOWNER job1 job2 job3 -ecs_api_edp_get_producer_ids 200 prod-a prod-b prod-c +if [ $ECS_VERSION == "V1-1" ]; then + ecs_api_edp_get_producer_ids 200 prod-a prod-b prod-c +else + ecs_api_edp_get_producer_ids_2 200 NOTYPE prod-a prod-b prod-c +fi if [ -z "$FLAT_A1_EI" ]; then ecs_api_a1_delete_job 204 type2 job3 @@ -357,25 +489,42 @@ else fi ecs_api_a1_get_job_ids 200 NOTYPE NOWNER job1 job2 -ecs_api_edp_get_producer_ids 200 prod-a prod-b prod-c +if [ $ECS_VERSION == "V1-1" ]; then + ecs_api_edp_get_producer_ids 200 prod-a prod-b prod-c +else + ecs_api_edp_get_producer_ids_2 200 NOTYPE prod-a prod-b prod-c +fi ecs_api_edp_delete_producer 204 prod-b ecs_api_edp_get_producer_status 404 prod-b ecs_api_a1_get_job_ids 200 NOTYPE NOWNER job1 job2 -ecs_api_edp_get_producer_ids 200 prod-a prod-c +if [ $ECS_VERSION == "V1-1" ]; then + ecs_api_edp_get_producer_ids 200 prod-a prod-c +else + ecs_api_edp_get_producer_ids_2 200 NOTYPE prod-a prod-c +fi prodstub_equal delete/prod-b/job3 1 if [ -z "$FLAT_A1_EI" ]; then ecs_api_a1_put_job 404 type2 job3 $TARGET3 ricsim_g3_3 testdata/ecs/job-template.json else - ecs_api_a1_put_job 404 job3 type2 $TARGET3 ricsim_g3_3 $STATUS3 testdata/ecs/job-template.json + if [ $ECS_VERSION == "V1-1" ]; then + ecs_api_a1_put_job 404 job3 type2 $TARGET3 ricsim_g3_3 $STATUS3 testdata/ecs/job-template.json + else + ecs_api_a1_put_job 201 job3 type2 $TARGET3 ricsim_g3_3 $STATUS3 testdata/ecs/job-template.json + ecs_api_a1_get_job_status 200 job3 DISABLED + fi fi # Put producer then job -ecs_api_edp_put_producer 201 prod-b $CB_JOB/prod-b $CB_SV/prod-b type2 testdata/ecs/ei-type-2.json +if [ $ECS_VERSION == "V1-1" ]; then + ecs_api_edp_put_producer 201 prod-b $CB_JOB/prod-b $CB_SV/prod-b type2 testdata/ecs/ei-type-2.json +else + ecs_api_edp_put_producer_2 201 prod-b $CB_JOB/prod-b $CB_SV/prod-b type2 +fi ecs_api_edp_get_producer_status 200 prod-b ENABLED @@ -383,16 +532,32 @@ if [ -z "$FLAT_A1_EI" ]; then ecs_api_a1_put_job 201 type2 job3 $TARGET3 ricsim_g3_3 testdata/ecs/job-template2.json ecs_api_a1_get_job_status 200 type2 job3 ENABLED else - ecs_api_a1_put_job 201 job3 type2 $TARGET3 ricsim_g3_3 $STATUS3 testdata/ecs/job-template2.json + if [ $ECS_VERSION == "V1-1" ]; then + ecs_api_a1_put_job 201 job3 type2 $TARGET3 ricsim_g3_3 $STATUS3 testdata/ecs/job-template2.json + else + ecs_api_a1_put_job 200 job3 type2 $TARGET3 ricsim_g3_3 $STATUS3 testdata/ecs/job-template2.json + fi ecs_api_a1_get_job_status 200 job3 ENABLED fi -prodstub_check_jobdata 200 prod-b job3 type2 $TARGET3 testdata/ecs/job-template2.json +if [ $ECS_VERSION == "V1-1" ]; then + prodstub_check_jobdata 200 prod-b job3 type2 $TARGET3 ricsim_g3_3 testdata/ecs/job-template2.json +else + prodstub_check_jobdata_2 200 prod-b job3 type2 $TARGET3 ricsim_g3_3 testdata/ecs/job-template2.json +fi ecs_api_a1_get_job_ids 200 NOTYPE NOWNER job1 job2 job3 -ecs_api_edp_get_producer_ids 200 prod-a prod-b prod-c +if [ $ECS_VERSION == "V1-1" ]; then + ecs_api_edp_get_producer_ids 200 prod-a prod-b prod-c +else + ecs_api_edp_get_producer_ids_2 200 NOTYPE prod-a prod-b prod-c +fi -prodstub_equal create/prod-b/job3 2 +if [ $ECS_VERSION == "V1-1" ]; then + prodstub_equal create/prod-b/job3 2 +else + prodstub_equal create/prod-b/job3 3 +fi prodstub_equal delete/prod-b/job3 1 # Delete only the producer @@ -401,7 +566,11 @@ ecs_api_edp_delete_producer 204 prod-b ecs_api_edp_get_producer_status 404 prod-b ecs_api_a1_get_job_ids 200 NOTYPE NOWNER job1 job2 job3 -ecs_api_edp_get_producer_ids 200 prod-a prod-c +if [ $ECS_VERSION == "V1-1" ]; then + ecs_api_edp_get_producer_ids 200 prod-a prod-c +else + ecs_api_edp_get_producer_ids_2 200 NOTYPE prod-a prod-c +fi if [ -z "$FLAT_A1_EI" ]; then ecs_api_a1_get_job_status 200 type2 job3 DISABLED @@ -414,7 +583,11 @@ cr_equal received_callbacks?id=job3-status 1 cr_api_check_all_ecs_events 200 job3-status DISABLED # Re-create the producer -ecs_api_edp_put_producer 201 prod-b $CB_JOB/prod-b $CB_SV/prod-b type2 testdata/ecs/ei-type-2.json +if [ $ECS_VERSION == "V1-1" ]; then + ecs_api_edp_put_producer 201 prod-b $CB_JOB/prod-b $CB_SV/prod-b type2 testdata/ecs/ei-type-2.json +else + ecs_api_edp_put_producer_2 201 prod-b $CB_JOB/prod-b $CB_SV/prod-b type2 +fi ecs_api_edp_get_producer_status 200 prod-b ENABLED @@ -428,11 +601,19 @@ cr_equal received_callbacks 2 30 cr_equal received_callbacks?id=job3-status 2 cr_api_check_all_ecs_events 200 job3-status ENABLED -prodstub_check_jobdata 200 prod-b job3 type2 $TARGET3 testdata/ecs/job-template2.json - +if [ $ECS_VERSION == "V1-1" ]; then + prodstub_check_jobdata 200 prod-b job3 type2 $TARGET3 ricsim_g3_3 testdata/ecs/job-template2.json +else + prodstub_check_jobdata_2 200 prod-b job3 type2 $TARGET3 ricsim_g3_3 testdata/ecs/job-template2.json +fi ## Setup prod-d -ecs_api_edp_put_producer 201 prod-d $CB_JOB/prod-d $CB_SV/prod-d type4 testdata/ecs/ei-type-1.json +if [ $ECS_VERSION == "V1-1" ]; then + ecs_api_edp_put_producer 201 prod-d $CB_JOB/prod-d $CB_SV/prod-d type4 testdata/ecs/ei-type-4.json +else + ecs_api_edp_put_type_2 201 type4 testdata/ecs/ei-type-1.json + ecs_api_edp_put_producer_2 201 prod-d $CB_JOB/prod-d $CB_SV/prod-d type4 +fi ecs_api_a1_get_job_ids 200 type4 NOWNER EMPTY @@ -442,7 +623,11 @@ else ecs_api_a1_put_job 201 job8 type4 $TARGET8 ricsim_g3_4 $STATUS8 testdata/ecs/job-template.json fi -prodstub_check_jobdata 200 prod-d job8 type4 $TARGET8 testdata/ecs/job-template.json +if [ $ECS_VERSION == "V1-1" ]; then + prodstub_check_jobdata 200 prod-d job8 type4 $TARGET8 ricsim_g3_4 testdata/ecs/job-template.json +else + prodstub_check_jobdata_2 200 prod-d job8 type4 $TARGET8 ricsim_g3_4 testdata/ecs/job-template.json +fi prodstub_equal create/prod-d/job8 1 prodstub_equal delete/prod-d/job8 0 @@ -456,7 +641,11 @@ else fi # Re-PUT the producer with zero types -ecs_api_edp_put_producer 200 prod-d $CB_JOB/prod-d $CB_SV/prod-d NOTYPE +if [ $ECS_VERSION == "V1-1" ]; then + ecs_api_edp_put_producer 200 prod-d $CB_JOB/prod-d $CB_SV/prod-d NOTYPE +else + ecs_api_edp_put_producer_2 200 prod-d $CB_JOB/prod-d $CB_SV/prod-d NOTYPE +fi if [ -z "$FLAT_A1_EI" ]; then ecs_api_a1_get_job_ids 404 type4 NOWNER @@ -479,7 +668,12 @@ prodstub_equal create/prod-d/job8 1 prodstub_equal delete/prod-d/job8 0 ## Re-setup prod-d -ecs_api_edp_put_producer 200 prod-d $CB_JOB/prod-d $CB_SV/prod-d type4 testdata/ecs/ei-type-1.json +if [ $ECS_VERSION == "V1-1" ]; then + ecs_api_edp_put_producer 200 prod-d $CB_JOB/prod-d $CB_SV/prod-d type4 testdata/ecs/ei-type-4.json +else + ecs_api_edp_put_type_2 200 type4 testdata/ecs/ei-type-4.json + ecs_api_edp_put_producer_2 200 prod-d $CB_JOB/prod-d $CB_SV/prod-d type4 +fi if [ -z "$FLAT_A1_EI" ]; then ecs_api_a1_get_job_ids 404 type4 NOWNER @@ -508,7 +702,12 @@ prodstub_equal delete/prod-d/job8 0 ## Setup prod-e -ecs_api_edp_put_producer 201 prod-e $CB_JOB/prod-e $CB_SV/prod-e type6 testdata/ecs/ei-type-6.json +if [ $ECS_VERSION == "V1-1" ]; then + ecs_api_edp_put_producer 201 prod-e $CB_JOB/prod-e $CB_SV/prod-e type6 testdata/ecs/ei-type-6.json +else + ecs_api_edp_put_type_2 201 type6 testdata/ecs/ei-type-6.json + ecs_api_edp_put_producer_2 201 prod-e $CB_JOB/prod-e $CB_SV/prod-e type6 +fi ecs_api_a1_get_job_ids 200 type6 NOWNER EMPTY @@ -518,7 +717,11 @@ else ecs_api_a1_put_job 201 job10 type6 $TARGET10 ricsim_g3_4 $STATUS10 testdata/ecs/job-template.json fi -prodstub_check_jobdata 200 prod-e job10 type6 $TARGET10 testdata/ecs/job-template.json +if [ $ECS_VERSION == "V1-1" ]; then + prodstub_check_jobdata 200 prod-e job10 type6 $TARGET10 ricsim_g3_4 testdata/ecs/job-template.json +else + prodstub_check_jobdata_2 200 prod-e job10 type6 $TARGET10 ricsim_g3_4 testdata/ecs/job-template.json +fi prodstub_equal create/prod-e/job10 1 prodstub_equal delete/prod-e/job10 0 @@ -532,11 +735,20 @@ else fi ## Setup prod-f -ecs_api_edp_put_producer 201 prod-f $CB_JOB/prod-f $CB_SV/prod-f type6 testdata/ecs/ei-type-6.json +if [ $ECS_VERSION == "V1-1" ]; then + ecs_api_edp_put_producer 201 prod-f $CB_JOB/prod-f $CB_SV/prod-f type6 testdata/ecs/ei-type-6.json +else + ecs_api_edp_put_type_2 200 type6 testdata/ecs/ei-type-6.json + ecs_api_edp_put_producer_2 201 prod-f $CB_JOB/prod-f $CB_SV/prod-f type6 +fi ecs_api_a1_get_job_ids 200 type6 NOWNER job10 -prodstub_check_jobdata 200 prod-f job10 type6 $TARGET10 testdata/ecs/job-template.json +if [ $ECS_VERSION == "V1-1" ]; then + prodstub_check_jobdata 200 prod-f job10 type6 $TARGET10 ricsim_g3_4 testdata/ecs/job-template.json +else + prodstub_check_jobdata_2 200 prod-f job10 type6 $TARGET10 ricsim_g3_4 testdata/ecs/job-template.json +fi prodstub_equal create/prod-f/job10 1 prodstub_equal delete/prod-f/job10 0 @@ -551,7 +763,11 @@ fi ## Status updates prod-a and jobs -ecs_api_edp_get_producer_ids 200 prod-a prod-b prod-c prod-d prod-e prod-f +if [ $ECS_VERSION == "V1-1" ]; then + ecs_api_edp_get_producer_ids 200 prod-a prod-b prod-c prod-d prod-e prod-f +else + ecs_api_edp_get_producer_ids_2 200 NOTYPE prod-a prod-b prod-c prod-d prod-e prod-f +fi ecs_api_edp_get_producer_status 200 prod-a ENABLED ecs_api_edp_get_producer_status 200 prod-b ENABLED @@ -566,7 +782,11 @@ prodstub_arm_producer 200 prod-a 400 # Wait for producer prod-a to go disabled ecs_api_edp_get_producer_status 200 prod-a DISABLED 360 -ecs_api_edp_get_producer_ids 200 prod-a prod-b prod-c prod-d prod-e prod-f +if [ $ECS_VERSION == "V1-1" ]; then + ecs_api_edp_get_producer_ids 200 prod-a prod-b prod-c prod-d prod-e prod-f +else + ecs_api_edp_get_producer_ids_2 200 NOTYPE prod-a prod-b prod-c prod-d prod-e prod-f +fi ecs_api_edp_get_producer_status 200 prod-a DISABLED ecs_api_edp_get_producer_status 200 prod-b ENABLED @@ -596,7 +816,11 @@ prodstub_arm_producer 200 prod-a 200 # Wait for producer prod-a to go enabled ecs_api_edp_get_producer_status 200 prod-a ENABLED 360 -ecs_api_edp_get_producer_ids 200 prod-a prod-b prod-c prod-d prod-e prod-f +if [ $ECS_VERSION == "V1-1" ]; then + ecs_api_edp_get_producer_ids 200 prod-a prod-b prod-c prod-d prod-e prod-f +else + ecs_api_edp_get_producer_ids_2 200 NOTYPE prod-a prod-b prod-c prod-d prod-e prod-f +fi ecs_api_edp_get_producer_status 200 prod-a ENABLED ecs_api_edp_get_producer_status 200 prod-b ENABLED @@ -625,7 +849,11 @@ prodstub_arm_producer 200 prod-a 400 # Wait for producer prod-a to go disabled ecs_api_edp_get_producer_status 200 prod-a DISABLED 360 -ecs_api_edp_get_producer_ids 200 prod-a prod-b prod-c prod-d prod-e prod-f +if [ $ECS_VERSION == "V1-1" ]; then + ecs_api_edp_get_producer_ids 200 prod-a prod-b prod-c prod-d prod-e prod-f +else + ecs_api_edp_get_producer_ids_2 200 NOTYPE prod-a prod-b prod-c prod-d prod-e prod-f +fi ecs_api_edp_get_producer_status 200 prod-a DISABLED ecs_api_edp_get_producer_status 200 prod-b ENABLED @@ -651,7 +879,12 @@ fi # Wait for producer prod-a to be removed ecs_equal json:ei-producer/v1/eiproducers 5 1000 -ecs_api_edp_get_producer_ids 200 prod-b prod-c prod-d prod-e prod-f +if [ $ECS_VERSION == "V1-1" ]; then + ecs_api_edp_get_producer_ids 200 prod-b prod-c prod-d prod-e prod-f +else + ecs_api_edp_get_producer_ids_2 200 NOTYPE prod-b prod-c prod-d prod-e prod-f +fi + ecs_api_edp_get_producer_status 404 prod-a ecs_api_edp_get_producer_status 200 prod-b ENABLED @@ -687,7 +920,11 @@ prodstub_arm_producer 200 prod-e 400 ecs_api_edp_get_producer_status 200 prod-e DISABLED 1000 -ecs_api_edp_get_producer_ids 200 prod-b prod-c prod-d prod-e prod-f +if [ $ECS_VERSION == "V1-1" ]; then + ecs_api_edp_get_producer_ids 200 prod-b prod-c prod-d prod-e prod-f +else + ecs_api_edp_get_producer_ids_2 200 NOTYPE prod-b prod-c prod-d prod-e prod-f +fi ecs_api_edp_get_producer_status 404 prod-a ecs_api_edp_get_producer_status 200 prod-b ENABLED @@ -725,12 +962,20 @@ prodstub_arm_job_create 200 prod-e job10 200 ecs_api_edp_get_producer_status 200 prod-e ENABLED 360 -ecs_api_edp_get_producer_ids 200 prod-b prod-c prod-d prod-e prod-f +if [ $ECS_VERSION == "V1-1" ]; then + ecs_api_edp_get_producer_ids 200 prod-b prod-c prod-d prod-e prod-f +else + ecs_api_edp_get_producer_ids_2 200 NOTYPE prod-b prod-c prod-d prod-e prod-f +fi -#Job 10 should be updated when the producer goes enabled -deviation "Job 10 should be updated when the producer prod-e goes enabled" -prodstub_check_jobdata 200 prod-e job10 type6 $TARGET10 testdata/ecs/job-template2.json -prodstub_check_jobdata 200 prod-f job10 type6 $TARGET10 testdata/ecs/job-template2.json +#Wait for job to be updated +sleep_wait 120 + +if [ $ECS_VERSION == "V1-1" ]; then + prodstub_check_jobdata 200 prod-f job10 type6 $TARGET10 ricsim_g3_4 testdata/ecs/job-template2.json +else + prodstub_check_jobdata_2 200 prod-f job10 type6 $TARGET10 ricsim_g3_4 testdata/ecs/job-template2.json +fi prodstub_arm_producer 200 prod-f 400 @@ -738,7 +983,11 @@ ecs_api_edp_get_producer_status 200 prod-f DISABLED 360 ecs_equal json:ei-producer/v1/eiproducers 4 1000 -ecs_api_edp_get_producer_ids 200 prod-b prod-c prod-d prod-e +if [ $ECS_VERSION == "V1-1" ]; then + ecs_api_edp_get_producer_ids 200 prod-b prod-c prod-d prod-e +else + ecs_api_edp_get_producer_ids_2 200 NOTYPE prod-b prod-c prod-d prod-e +fi ecs_api_edp_get_producer_status 404 prod-a ecs_api_edp_get_producer_status 200 prod-b ENABLED @@ -771,4 +1020,4 @@ store_logs END print_result -auto_clean_containers +auto_clean_environment