#
-TC_ONELINE_DESCR="ECS full intefaces walkthrough"
+TC_ONELINE_DESCR="ECS full interfaces walkthrough"
#App names to include in the test when running docker, space separated list
-DOCKER_INCLUDED_IMAGES="ECS PRODSTUB CR RICSIM CP"
+DOCKER_INCLUDED_IMAGES="ECS PRODSTUB CR RICSIM CP HTTPPROXY"
#App names to include in the test when running kubernetes, space separated list
-KUBE_INCLUDED_IMAGES=" PRODSTUB CR ECS RICSIM CP "
+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=" "
. ../common/control_panel_api_functions.sh
. ../common/controller_api_functions.sh
. ../common/ricsimulator_api_functions.sh
+. ../common/http_proxy_api_functions.sh
#### TEST BEGIN ####
use_cr_https
-start_ecs $SIM_GROUP/$ECS_COMPOSE_DIR/application.yaml
+#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
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
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
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
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
fi
# Check the job data in the producer
-prodstub_check_jobdata 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 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
prodstub_equal create/prod-a/job1 1
-ecs_api_edp_get_producer_jobs 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 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
fi
# Check the job data in the producer
-prodstub_check_jobdata 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 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
prodstub_equal create/prod-a/job2 1
-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
+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
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
prodstub_equal create/prod-b/job3 1
# Check the job data in the producer
-prodstub_check_jobdata 200 prod-b job3 type2 $TARGET3 ricsim_g3_3 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
ecs_api_a1_get_job_status 200 job3 ENABLED
fi
-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
-
+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
# 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
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
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 ricsim_g3_3 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
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
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
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 ricsim_g3_3 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
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 ricsim_g3_4 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
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
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
## 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
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 ricsim_g3_4 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
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 ricsim_g3_4 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
## 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
# 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
# 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
# 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
# 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
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
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
+
+#Wait for job to be updated
+sleep_wait 120
-#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 ricsim_g3_4 testdata/ecs/job-template2.json
-prodstub_check_jobdata 200 prod-f job10 type6 $TARGET10 ricsim_g3_4 testdata/ecs/job-template2.json
+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
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
Code Review / nonrtric.git / blobdiff