From 007b64509101d8e3ef881955adee2ad15d062213 Mon Sep 17 00:00:00 2001 From: BjornMagnussonXA Date: Mon, 29 Nov 2021 08:03:38 +0100 Subject: [PATCH] Change of ECS to ICS in test env Issue-ID: NONRTRIC-640 Signed-off-by: BjornMagnussonXA Change-Id: Idcb4cc288b2e057120b5d8568070e852e6cd4487 --- test/auto-test/FTC1100.sh | 1656 ++++++++++---------- test/auto-test/FTC1800.sh | 552 +++---- test/auto-test/FTC2001.sh | 86 +- test/auto-test/FTC2003.sh | 26 +- test/auto-test/FTC3000.sh | 30 +- test/auto-test/FTC_HELM_E_RELEASE.sh | 92 +- test/auto-test/PM_EI_DEMO.sh | 60 +- test/auto-test/README.md | 8 +- .../auto-test/testdata/{ecs => ics}/ei-type-1.json | 0 .../auto-test/testdata/{ecs => ics}/ei-type-2.json | 0 .../auto-test/testdata/{ecs => ics}/ei-type-3.json | 0 .../auto-test/testdata/{ecs => ics}/ei-type-4.json | 0 .../auto-test/testdata/{ecs => ics}/ei-type-5.json | 0 .../auto-test/testdata/{ecs => ics}/ei-type-6.json | 0 .../testdata/{ecs => ics}/empty-type.json | 0 .../testdata/{ecs => ics}/info-type-1.json | 0 .../testdata/{ecs => ics}/info-type-2.json | 0 .../testdata/{ecs => ics}/info-type-3.json | 0 .../testdata/{ecs => ics}/info-type-4.json | 0 .../testdata/{ecs => ics}/info-type-5.json | 0 .../testdata/{ecs => ics}/info-type-50.json | 0 .../testdata/{ecs => ics}/info-type-6.json | 0 .../testdata/{ecs => ics}/info-type-60.json | 0 .../testdata/{ecs => ics}/info-type-info.json | 0 .../testdata/{ecs => ics}/job-template.json | 0 .../testdata/{ecs => ics}/job-template2.json | 0 test/common/README.md | 158 +- test/common/api_curl.sh | 18 +- test/common/cp_api_functions.sh | 12 +- test/common/cr_api_functions.sh | 12 +- test/common/dmaapadp_api_functions.sh | 4 +- test/common/dmaapmed_api_functions.sh | 4 +- .../{ecs_api_functions.sh => ics_api_functions.sh} | 536 +++---- test/common/mr_api_functions.sh | 2 +- test/common/ngw_api_functions.sh | 12 +- test/common/pa_api_functions.sh | 2 +- test/common/prodstub_api_functions.sh | 12 +- test/common/rc_api_functions.sh | 4 +- test/common/sdnc_api_functions.sh | 2 +- test/common/test_env-onap-honolulu.sh | 48 +- test/common/test_env-onap-istanbul.sh | 48 +- test/common/test_env-oran-cherry.sh | 52 +- test/common/test_env-oran-d-release.sh | 58 +- test/common/test_env-oran-e-release.sh | 60 +- test/common/testcase_common.sh | 8 +- test/common/testengine_config.sh | 6 +- .../control_panel/application.properties | 4 +- test/simulator-group/control_panel/nginx.conf | 4 +- test/simulator-group/dmaapadp/application.yaml | 2 +- test/simulator-group/dmaapmed/app.yaml | 2 +- test/simulator-group/dmaapmed/docker-compose.yml | 2 +- test/simulator-group/ecs/app.yaml | 45 - test/simulator-group/ecs/mnt/.gitignore | 1 - test/simulator-group/ecs/svc.yaml | 21 - test/simulator-group/{ecs => ics}/.gitignore | 0 test/simulator-group/ics/app.yaml | 45 + test/simulator-group/{ecs => ics}/application.yaml | 16 +- .../{ecs => ics}/docker-compose.yml | 20 +- test/simulator-group/{ecs => ics}/pv.yaml | 10 +- test/simulator-group/{ecs => ics}/pvc.yaml | 8 +- test/simulator-group/ics/svc.yaml | 21 + test/simulator-group/ngw/application.yaml | 4 +- test/simulator-group/sim-monitor.js | 236 +-- 63 files changed, 2008 insertions(+), 2001 deletions(-) rename test/auto-test/testdata/{ecs => ics}/ei-type-1.json (100%) rename test/auto-test/testdata/{ecs => ics}/ei-type-2.json (100%) rename test/auto-test/testdata/{ecs => ics}/ei-type-3.json (100%) rename test/auto-test/testdata/{ecs => ics}/ei-type-4.json (100%) rename test/auto-test/testdata/{ecs => ics}/ei-type-5.json (100%) rename test/auto-test/testdata/{ecs => ics}/ei-type-6.json (100%) rename test/auto-test/testdata/{ecs => ics}/empty-type.json (100%) rename test/auto-test/testdata/{ecs => ics}/info-type-1.json (100%) rename test/auto-test/testdata/{ecs => ics}/info-type-2.json (100%) rename test/auto-test/testdata/{ecs => ics}/info-type-3.json (100%) rename test/auto-test/testdata/{ecs => ics}/info-type-4.json (100%) rename test/auto-test/testdata/{ecs => ics}/info-type-5.json (100%) rename test/auto-test/testdata/{ecs => ics}/info-type-50.json (100%) rename test/auto-test/testdata/{ecs => ics}/info-type-6.json (100%) rename test/auto-test/testdata/{ecs => ics}/info-type-60.json (100%) rename test/auto-test/testdata/{ecs => ics}/info-type-info.json (100%) rename test/auto-test/testdata/{ecs => ics}/job-template.json (100%) rename test/auto-test/testdata/{ecs => ics}/job-template2.json (100%) rename test/common/{ecs_api_functions.sh => ics_api_functions.sh} (82%) delete mode 100644 test/simulator-group/ecs/app.yaml delete mode 100644 test/simulator-group/ecs/mnt/.gitignore delete mode 100644 test/simulator-group/ecs/svc.yaml rename test/simulator-group/{ecs => ics}/.gitignore (100%) create mode 100644 test/simulator-group/ics/app.yaml rename test/simulator-group/{ecs => ics}/application.yaml (78%) rename test/simulator-group/{ecs => ics}/docker-compose.yml (69%) rename test/simulator-group/{ecs => ics}/pv.yaml (58%) rename test/simulator-group/{ecs => ics}/pvc.yaml (67%) create mode 100644 test/simulator-group/ics/svc.yaml diff --git a/test/auto-test/FTC1100.sh b/test/auto-test/FTC1100.sh index cc23abb5..cf172a06 100755 --- a/test/auto-test/FTC1100.sh +++ b/test/auto-test/FTC1100.sh @@ -18,13 +18,13 @@ # -TC_ONELINE_DESCR="ECS full interfaces walkthrough" +TC_ONELINE_DESCR="ICS full interfaces walkthrough" #App names to include in the test when running docker, space separated list -DOCKER_INCLUDED_IMAGES="ECS PRODSTUB CR RICSIM CP HTTPPROXY NGW KUBEPROXY" +DOCKER_INCLUDED_IMAGES="ICS PRODSTUB CR RICSIM CP HTTPPROXY NGW KUBEPROXY" #App names to include in the test when running kubernetes, space separated list -KUBE_INCLUDED_IMAGES="PRODSTUB CR ECS RICSIM CP HTTPPROXY KUBEPROXY NGW" +KUBE_INCLUDED_IMAGES="PRODSTUB CR ICS RICSIM CP HTTPPROXY KUBEPROXY NGW" #Prestarted app (not started by script) to include in the test when running kubernetes, space separated list KUBE_PRESTARTED_IMAGES="" @@ -50,7 +50,7 @@ clean_environment start_kube_proxy -use_ecs_rest_https +use_ics_rest_https use_prod_stub_https @@ -60,15 +60,15 @@ use_cr_https start_http_proxy -start_ecs NOPROXY $SIM_GROUP/$ECS_COMPOSE_DIR/$ECS_CONFIG_FILE #Change NOPROXY to PROXY to run with http proxy +start_ics NOPROXY $SIM_GROUP/$ICS_COMPOSE_DIR/$ICS_CONFIG_FILE #Change NOPROXY to PROXY to run with http proxy if [ $RUNMODE == "KUBE" ]; then - ecs_api_admin_reset + ics_api_admin_reset fi start_prod_stub -set_ecs_debug +set_ics_debug start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE @@ -116,72 +116,72 @@ INFOSTATUS110="$CR_SERVICE_APP_PATH_0/info-job110-status" INFOSTATUS150="$CR_SERVICE_APP_PATH_0/info-job150-status" INFOSTATUS160="$CR_SERVICE_APP_PATH_0/info-job160-status" -if [[ "$ECS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then +if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then #Type registration status callbacks TYPESTATUS1="$CR_SERVICE_APP_PATH_0/type-status1" TYPESTATUS2="$CR_SERVICE_APP_PATH_0/type-status2" - ecs_api_idc_put_subscription 201 subscription-id-1 owner1 $TYPESTATUS1 + ics_api_idc_put_subscription 201 subscription-id-1 owner1 $TYPESTATUS1 - ecs_api_idc_get_subscription_ids 200 NOOWNER subscription-id-1 + ics_api_idc_get_subscription_ids 200 NOOWNER subscription-id-1 - ecs_api_idc_get_subscription_ids 200 owner1 subscription-id-1 + ics_api_idc_get_subscription_ids 200 owner1 subscription-id-1 - ecs_api_idc_get_subscription_ids 200 test EMPTY + ics_api_idc_get_subscription_ids 200 test EMPTY - ecs_api_idc_get_subscription 200 subscription-id-1 owner1 $TYPESTATUS1 + ics_api_idc_get_subscription 200 subscription-id-1 owner1 $TYPESTATUS1 - ecs_api_idc_get_subscription 404 test + ics_api_idc_get_subscription 404 test - ecs_api_idc_put_subscription 200 subscription-id-1 owner1 $TYPESTATUS1 + ics_api_idc_put_subscription 200 subscription-id-1 owner1 $TYPESTATUS1 - ecs_api_idc_put_subscription 200 subscription-id-1 owner1 $TYPESTATUS1 + ics_api_idc_put_subscription 200 subscription-id-1 owner1 $TYPESTATUS1 - ecs_api_idc_put_subscription 201 subscription-id-2 owner2 $TYPESTATUS2 + ics_api_idc_put_subscription 201 subscription-id-2 owner2 $TYPESTATUS2 - ecs_api_idc_get_subscription_ids 200 NOOWNER subscription-id-1 subscription-id-2 + ics_api_idc_get_subscription_ids 200 NOOWNER subscription-id-1 subscription-id-2 - ecs_api_idc_get_subscription_ids 200 owner1 subscription-id-1 + ics_api_idc_get_subscription_ids 200 owner1 subscription-id-1 - ecs_api_idc_get_subscription_ids 200 owner2 subscription-id-2 + ics_api_idc_get_subscription_ids 200 owner2 subscription-id-2 - ecs_api_idc_get_subscription 200 subscription-id-1 owner1 $TYPESTATUS1 - ecs_api_idc_get_subscription 200 subscription-id-2 owner2 $TYPESTATUS2 + ics_api_idc_get_subscription 200 subscription-id-1 owner1 $TYPESTATUS1 + ics_api_idc_get_subscription 200 subscription-id-2 owner2 $TYPESTATUS2 - ecs_api_idc_delete_subscription 204 subscription-id-2 + ics_api_idc_delete_subscription 204 subscription-id-2 - ecs_api_idc_get_subscription_ids 200 NOOWNER subscription-id-1 + ics_api_idc_get_subscription_ids 200 NOOWNER subscription-id-1 - ecs_api_edp_put_type_2 201 type1 testdata/ecs/ei-type-1.json + ics_api_edp_put_type_2 201 type1 testdata/ics/ei-type-1.json cr_equal 0 received_callbacks 1 30 cr_equal 0 received_callbacks?id=type-status1 1 - cr_api_check_all_ecs_subscription_events 200 0 type-status1 type1 testdata/ecs/ei-type-1.json REGISTERED + cr_api_check_all_ics_subscription_events 200 0 type-status1 type1 testdata/ics/ei-type-1.json REGISTERED - ecs_api_edp_delete_type_2 204 type1 + ics_api_edp_delete_type_2 204 type1 cr_equal 0 received_callbacks 2 30 cr_equal 0 received_callbacks?id=type-status1 2 - cr_api_check_all_ecs_subscription_events 200 0 type-status1 type1 testdata/ecs/ei-type-1.json DEREGISTERED + cr_api_check_all_ics_subscription_events 200 0 type-status1 type1 testdata/ics/ei-type-1.json DEREGISTERED - ecs_api_idc_put_subscription 201 subscription-id-2 owner2 $TYPESTATUS2 - ecs_api_idc_get_subscription_ids 200 NOOWNER subscription-id-1 subscription-id-2 + ics_api_idc_put_subscription 201 subscription-id-2 owner2 $TYPESTATUS2 + ics_api_idc_get_subscription_ids 200 NOOWNER subscription-id-1 subscription-id-2 - ecs_api_edp_put_type_2 201 type1 testdata/ecs/ei-type-1.json + ics_api_edp_put_type_2 201 type1 testdata/ics/ei-type-1.json cr_equal 0 received_callbacks 4 30 cr_equal 0 received_callbacks?id=type-status1 3 cr_equal 0 received_callbacks?id=type-status2 1 - cr_api_check_all_ecs_subscription_events 200 0 type-status1 type1 testdata/ecs/ei-type-1.json REGISTERED + cr_api_check_all_ics_subscription_events 200 0 type-status1 type1 testdata/ics/ei-type-1.json REGISTERED - ecs_api_idc_delete_subscription 204 subscription-id-2 + ics_api_idc_delete_subscription 204 subscription-id-2 - ecs_api_edp_delete_type_2 204 type1 + ics_api_edp_delete_type_2 204 type1 cr_equal 0 received_callbacks 5 30 cr_equal 0 received_callbacks?id=type-status1 4 cr_equal 0 received_callbacks?id=type-status2 1 - cr_api_check_all_ecs_subscription_events 200 0 type-status1 type1 testdata/ecs/ei-type-1.json DEREGISTERED + cr_api_check_all_ics_subscription_events 200 0 type-status1 type1 testdata/ics/ei-type-1.json DEREGISTERED cr_api_reset 0 fi @@ -239,462 +239,462 @@ prodstub_arm_job_create 200 prod-d job8 prodstub_arm_job_create 200 prod-e job10 prodstub_arm_job_create 200 prod-f job10 -### ecs status -ecs_api_service_status 200 +### ics status +ics_api_service_status 200 cr_equal 0 received_callbacks 0 ### Initial tests - no config made ### GET: type ids, types, producer ids, producers, job ids, jobs ### DELETE: jobs -ecs_api_a1_get_type_ids 200 EMPTY -ecs_api_a1_get_type 404 test-type +ics_api_a1_get_type_ids 200 EMPTY +ics_api_a1_get_type 404 test-type -ecs_api_edp_get_type_ids 200 EMPTY -if [ $ECS_VERSION == "V1-1" ]; then - ecs_api_edp_get_type 404 test-type +ics_api_edp_get_type_ids 200 EMPTY +if [ $ICS_VERSION == "V1-1" ]; then + ics_api_edp_get_type 404 test-type else - ecs_api_edp_get_type_2 404 test-type + ics_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 +if [ $ICS_VERSION == "V1-1" ]; then + ics_api_edp_get_producer_ids 200 EMPTY + ics_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 + ics_api_edp_get_producer_ids_2 200 NOTYPE EMPTY + ics_api_edp_get_producer_2 404 test-prod fi -ecs_api_edp_get_producer_status 404 test-prod +ics_api_edp_get_producer_status 404 test-prod -ecs_api_edp_delete_producer 404 test-prod +ics_api_edp_delete_producer 404 test-prod if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_get_job_ids 404 test-type NOWNER - ecs_api_a1_get_job_ids 404 test-type test-owner + ics_api_a1_get_job_ids 404 test-type NOWNER + ics_api_a1_get_job_ids 404 test-type test-owner - ecs_api_a1_get_job 404 test-type test-job + ics_api_a1_get_job 404 test-type test-job - ecs_api_a1_get_job_status 404 test-type test-job + ics_api_a1_get_job_status 404 test-type test-job else - ecs_api_a1_get_job_ids 200 test-type NOWNER EMPTY - ecs_api_a1_get_job_ids 200 test-type test-owner EMPTY + ics_api_a1_get_job_ids 200 test-type NOWNER EMPTY + ics_api_a1_get_job_ids 200 test-type test-owner EMPTY - ecs_api_a1_get_job 404 test-job + ics_api_a1_get_job 404 test-job - ecs_api_a1_get_job_status 404 test-job + ics_api_a1_get_job_status 404 test-job fi if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_delete_job 404 test-type test-job + ics_api_a1_delete_job 404 test-type test-job else - ecs_api_a1_delete_job 404 test-job + ics_api_a1_delete_job 404 test-job fi -if [ $ECS_VERSION == "V1-1" ]; then - ecs_api_edp_get_producer_jobs 404 test-prod +if [ $ICS_VERSION == "V1-1" ]; then + ics_api_edp_get_producer_jobs 404 test-prod else - ecs_api_edp_get_producer_jobs_2 404 test-prod + ics_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 +if [ $ICS_VERSION == "V1-2" ]; then + ics_api_edp_get_type_2 404 test-type + ics_api_edp_delete_type_2 404 test-type fi ### Setup of producer/job and testing apis ### ## Setup prod-a -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 +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_put_producer 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 testdata/ics/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 + ics_api_edp_get_type_ids 200 EMPTY + ics_api_edp_get_type_2 404 type1 + ics_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 - if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPE-INFO"* ]]; then - ecs_api_edp_put_type_2 201 type1 testdata/ecs/ei-type-1.json testdata/ecs/info-type-info.json + ics_api_edp_put_type_2 201 type1 testdata/ics/ei-type-1.json + ics_api_edp_get_type_2 200 type1 + ics_api_edp_get_type_ids 200 type1 + ics_api_edp_delete_type_2 204 type1 + ics_api_edp_get_type_2 404 type1 + ics_api_edp_get_type_ids 200 EMPTY + if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPE-INFO"* ]]; then + ics_api_edp_put_type_2 201 type1 testdata/ics/ei-type-1.json testdata/ics/info-type-info.json else - ecs_api_edp_put_type_2 201 type1 testdata/ecs/ei-type-1.json + ics_api_edp_put_type_2 201 type1 testdata/ics/ei-type-1.json fi - ecs_api_edp_get_type_ids 200 type1 - if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPE-INFO"* ]]; then - ecs_api_edp_get_type_2 200 type1 testdata/ecs/ei-type-1.json testdata/ecs/info-type-info.json + ics_api_edp_get_type_ids 200 type1 + if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPE-INFO"* ]]; then + ics_api_edp_get_type_2 200 type1 testdata/ics/ei-type-1.json testdata/ics/info-type-info.json else - ecs_api_edp_get_type_2 200 type1 testdata/ecs/ei-type-1.json + ics_api_edp_get_type_2 200 type1 testdata/ics/ei-type-1.json fi - 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 + ics_api_edp_put_producer_2 201 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 + ics_api_edp_put_producer_2 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 - if [[ "$ECS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then + if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then cr_equal 0 received_callbacks 3 30 cr_equal 0 received_callbacks?id=type-status1 3 - cr_api_check_all_ecs_subscription_events 200 0 type-status1 type1 testdata/ecs/ei-type-1.json REGISTERED type1 testdata/ecs/ei-type-1.json DEREGISTERED type1 testdata/ecs/ei-type-1.json REGISTERED + cr_api_check_all_ics_subscription_events 200 0 type-status1 type1 testdata/ics/ei-type-1.json REGISTERED type1 testdata/ics/ei-type-1.json DEREGISTERED type1 testdata/ics/ei-type-1.json REGISTERED else cr_equal 0 received_callbacks 0 fi fi -ecs_api_a1_get_type_ids 200 type1 +ics_api_a1_get_type_ids 200 type1 if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_get_type 200 type1 testdata/ecs/ei-type-1.json + ics_api_a1_get_type 200 type1 testdata/ics/ei-type-1.json else - ecs_api_a1_get_type 200 type1 testdata/ecs/empty-type.json + ics_api_a1_get_type 200 type1 testdata/ics/empty-type.json fi -ecs_api_edp_get_type_ids 200 type1 -if [ $ECS_VERSION == "V1-1" ]; then - ecs_api_edp_get_type 200 type1 testdata/ecs/ei-type-1.json prod-a +ics_api_edp_get_type_ids 200 type1 +if [ $ICS_VERSION == "V1-1" ]; then + ics_api_edp_get_type 200 type1 testdata/ics/ei-type-1.json prod-a else - if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPE-INFO"* ]]; then - ecs_api_edp_get_type_2 200 type1 testdata/ecs/ei-type-1.json testdata/ecs/info-type-info.json + if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPE-INFO"* ]]; then + ics_api_edp_get_type_2 200 type1 testdata/ics/ei-type-1.json testdata/ics/info-type-info.json else - ecs_api_edp_get_type_2 200 type1 testdata/ecs/ei-type-1.json + ics_api_edp_get_type_2 200 type1 testdata/ics/ei-type-1.json fi fi -if [ $ECS_VERSION == "V1-1" ]; then - ecs_api_edp_get_producer_ids 200 prod-a +if [ $ICS_VERSION == "V1-1" ]; then + ics_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 + ics_api_edp_get_producer_ids_2 200 NOTYPE prod-a + ics_api_edp_get_producer_ids_2 200 type1 prod-a + ics_api_edp_get_producer_ids_2 200 type2 EMPTY 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 +if [ $ICS_VERSION == "V1-1" ]; then + ics_api_edp_get_producer 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 testdata/ics/ei-type-1.json else - ecs_api_edp_get_producer_2 200 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 -ecs_api_edp_get_producer_status 200 prod-a ENABLED +ics_api_edp_get_producer_status 200 prod-a ENABLED -ecs_api_a1_get_job_ids 200 type1 NOWNER EMPTY -ecs_api_a1_get_job_ids 200 type1 test-owner EMPTY +ics_api_a1_get_job_ids 200 type1 NOWNER EMPTY +ics_api_a1_get_job_ids 200 type1 test-owner EMPTY if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_get_job 404 type1 test-job + ics_api_a1_get_job 404 type1 test-job - ecs_api_a1_get_job_status 404 type1 test-job + ics_api_a1_get_job_status 404 type1 test-job else - ecs_api_a1_get_job 404 test-job + ics_api_a1_get_job 404 test-job - ecs_api_a1_get_job_status 404 test-job + ics_api_a1_get_job_status 404 test-job fi -if [ $ECS_VERSION == "V1-1" ]; then - ecs_api_edp_get_producer_jobs 200 prod-a EMPTY +if [ $ICS_VERSION == "V1-1" ]; then + ics_api_edp_get_producer_jobs 200 prod-a EMPTY else - ecs_api_edp_get_producer_jobs_2 200 prod-a EMPTY + ics_api_edp_get_producer_jobs_2 200 prod-a EMPTY fi ## Create a job for prod-a ## job1 - prod-a if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_put_job 201 type1 job1 $TARGET1 ricsim_g3_1 testdata/ecs/job-template.json + ics_api_a1_put_job 201 type1 job1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json else - ecs_api_a1_put_job 201 job1 type1 $TARGET1 ricsim_g3_1 $STATUS1 testdata/ecs/job-template.json + ics_api_a1_put_job 201 job1 type1 $TARGET1 ricsim_g3_1 $STATUS1 testdata/ics/job-template.json fi # Check the job data in the producer -if [ $ECS_VERSION == "V1-1" ]; then - prodstub_check_jobdata 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ecs/job-template.json +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 [[ "$ECS_FEATURE_LEVEL" != *"INFO-TYPES"* ]]; then - prodstub_check_jobdata_2 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ecs/job-template.json + 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/ecs/job-template.json + prodstub_check_jobdata_3 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json fi fi -ecs_api_a1_get_job_ids 200 type1 NOWNER job1 -ecs_api_a1_get_job_ids 200 type1 ricsim_g3_1 job1 +ics_api_a1_get_job_ids 200 type1 NOWNER job1 +ics_api_a1_get_job_ids 200 type1 ricsim_g3_1 job1 if [ ! -z "$FLAT_A1_EI" ]; then - ecs_api_a1_get_job_ids 200 NOTYPE NOWNER job1 + ics_api_a1_get_job_ids 200 NOTYPE NOWNER job1 fi if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_get_job 200 type1 job1 $TARGET1 ricsim_g3_1 testdata/ecs/job-template.json + ics_api_a1_get_job 200 type1 job1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json - ecs_api_a1_get_job_status 200 type1 job1 ENABLED + ics_api_a1_get_job_status 200 type1 job1 ENABLED else - ecs_api_a1_get_job 200 job1 type1 $TARGET1 ricsim_g3_1 $STATUS1 testdata/ecs/job-template.json + ics_api_a1_get_job 200 job1 type1 $TARGET1 ricsim_g3_1 $STATUS1 testdata/ics/job-template.json - ecs_api_a1_get_job_status 200 job1 ENABLED + ics_api_a1_get_job_status 200 job1 ENABLED fi prodstub_equal create/prod-a/job1 1 -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 +if [ $ICS_VERSION == "V1-1" ]; then + ics_api_edp_get_producer_jobs 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ics/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 + ics_api_edp_get_producer_jobs_2 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json fi ## Create a second job for prod-a ## job2 - prod-a if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_put_job 201 type1 job2 $TARGET2 ricsim_g3_2 testdata/ecs/job-template.json + ics_api_a1_put_job 201 type1 job2 $TARGET2 ricsim_g3_2 testdata/ics/job-template.json else - ecs_api_a1_put_job 201 job2 type1 $TARGET2 ricsim_g3_2 $STATUS2 testdata/ecs/job-template.json + ics_api_a1_put_job 201 job2 type1 $TARGET2 ricsim_g3_2 $STATUS2 testdata/ics/job-template.json fi # Check the job data in the producer -if [ $ECS_VERSION == "V1-1" ]; then - prodstub_check_jobdata 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ecs/job-template.json +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 [[ "$ECS_FEATURE_LEVEL" != *"INFO-TYPES"* ]]; then - prodstub_check_jobdata_2 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ecs/job-template.json + 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/ecs/job-template.json + prodstub_check_jobdata_3 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ics/job-template.json fi 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 +ics_api_a1_get_job_ids 200 type1 NOWNER job1 job2 +ics_api_a1_get_job_ids 200 type1 ricsim_g3_1 job1 +ics_api_a1_get_job_ids 200 type1 ricsim_g3_2 job2 if [ ! -z "$FLAT_A1_EI" ]; then - ecs_api_a1_get_job_ids 200 NOTYPE NOWNER job1 job2 + ics_api_a1_get_job_ids 200 NOTYPE NOWNER job1 job2 fi if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_get_job 200 type1 job2 $TARGET2 ricsim_g3_2 testdata/ecs/job-template.json + ics_api_a1_get_job 200 type1 job2 $TARGET2 ricsim_g3_2 testdata/ics/job-template.json - ecs_api_a1_get_job_status 200 type1 job2 ENABLED + ics_api_a1_get_job_status 200 type1 job2 ENABLED else - ecs_api_a1_get_job 200 job2 type1 $TARGET2 ricsim_g3_2 $STATUS2 testdata/ecs/job-template.json + ics_api_a1_get_job 200 job2 type1 $TARGET2 ricsim_g3_2 $STATUS2 testdata/ics/job-template.json - ecs_api_a1_get_job_status 200 job2 ENABLED + ics_api_a1_get_job_status 200 job2 ENABLED fi prodstub_equal create/prod-a/job2 1 -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 +if [ $ICS_VERSION == "V1-1" ]; then + ics_api_edp_get_producer_jobs 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json job2 type1 $TARGET2 ricsim_g3_2 testdata/ics/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 + ics_api_edp_get_producer_jobs_2 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json job2 type1 $TARGET2 ricsim_g3_2 testdata/ics/job-template.json fi ## Setup prod-b -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 +if [ $ICS_VERSION == "V1-1" ]; then + ics_api_edp_put_producer 201 prod-b $CB_JOB/prod-b $CB_SV/prod-b type2 testdata/ics/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 - if [[ "$ECS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then + ics_api_edp_put_type_2 201 type2 testdata/ics/ei-type-2.json + ics_api_edp_put_producer_2 201 prod-b $CB_JOB/prod-b $CB_SV/prod-b type2 + if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then cr_equal 0 received_callbacks 4 30 cr_equal 0 received_callbacks?id=type-status1 4 - cr_api_check_all_ecs_subscription_events 200 0 type-status1 type2 testdata/ecs/ei-type-2.json REGISTERED + cr_api_check_all_ics_subscription_events 200 0 type-status1 type2 testdata/ics/ei-type-2.json REGISTERED else cr_equal 0 received_callbacks 0 fi fi -ecs_api_a1_get_type_ids 200 type1 type2 +ics_api_a1_get_type_ids 200 type1 type2 if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_get_type 200 type1 testdata/ecs/ei-type-1.json - ecs_api_a1_get_type 200 type2 testdata/ecs/ei-type-2.json + ics_api_a1_get_type 200 type1 testdata/ics/ei-type-1.json + ics_api_a1_get_type 200 type2 testdata/ics/ei-type-2.json else - ecs_api_a1_get_type 200 type1 testdata/ecs/empty-type.json - ecs_api_a1_get_type 200 type2 testdata/ecs/empty-type.json + ics_api_a1_get_type 200 type1 testdata/ics/empty-type.json + ics_api_a1_get_type 200 type2 testdata/ics/empty-type.json fi -ecs_api_edp_get_type_ids 200 type1 type2 -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 +ics_api_edp_get_type_ids 200 type1 type2 +if [ $ICS_VERSION == "V1-1" ]; then + ics_api_edp_get_type 200 type1 testdata/ics/ei-type-1.json prod-a + ics_api_edp_get_type 200 type2 testdata/ics/ei-type-2.json prod-b else - if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPE-INFO"* ]]; then - ecs_api_edp_get_type_2 200 type1 testdata/ecs/ei-type-1.json testdata/ecs/info-type-info.json + if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPE-INFO"* ]]; then + ics_api_edp_get_type_2 200 type1 testdata/ics/ei-type-1.json testdata/ics/info-type-info.json else - ecs_api_edp_get_type_2 200 type1 testdata/ecs/ei-type-1.json + ics_api_edp_get_type_2 200 type1 testdata/ics/ei-type-1.json fi - ecs_api_edp_get_type_2 200 type2 testdata/ecs/ei-type-2.json + ics_api_edp_get_type_2 200 type2 testdata/ics/ei-type-2.json fi -if [ $ECS_VERSION == "V1-1" ]; then - ecs_api_edp_get_producer_ids 200 prod-a prod-b +if [ $ICS_VERSION == "V1-1" ]; then + ics_api_edp_get_producer_ids 200 prod-a prod-b else - ecs_api_edp_get_producer_ids_2 200 NOTYPE prod-a prod-b + ics_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 +if [ $ICS_VERSION == "V1-1" ]; then + ics_api_edp_get_producer 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 testdata/ics/ei-type-1.json + ics_api_edp_get_producer 200 prod-b $CB_JOB/prod-b $CB_SV/prod-b type2 testdata/ics/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 + ics_api_edp_get_producer_2 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 + ics_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 +ics_api_edp_get_producer_status 200 prod-b ENABLED ## Create job for prod-b ## job3 - prod-b if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_put_job 201 type2 job3 $TARGET3 ricsim_g3_3 testdata/ecs/job-template.json + ics_api_a1_put_job 201 type2 job3 $TARGET3 ricsim_g3_3 testdata/ics/job-template.json else - ecs_api_a1_put_job 201 job3 type2 $TARGET3 ricsim_g3_3 $STATUS3 testdata/ecs/job-template.json + ics_api_a1_put_job 201 job3 type2 $TARGET3 ricsim_g3_3 $STATUS3 testdata/ics/job-template.json fi prodstub_equal create/prod-b/job3 1 # Check the job data in the producer -if [ $ECS_VERSION == "V1-1" ]; then - prodstub_check_jobdata 200 prod-b job3 type2 $TARGET3 ricsim_g3_3 testdata/ecs/job-template.json +if [ $ICS_VERSION == "V1-1" ]; then + prodstub_check_jobdata 200 prod-b job3 type2 $TARGET3 ricsim_g3_3 testdata/ics/job-template.json else - if [[ "$ECS_FEATURE_LEVEL" != *"INFO-TYPES"* ]]; then - prodstub_check_jobdata_2 200 prod-b job3 type2 $TARGET3 ricsim_g3_3 testdata/ecs/job-template.json + if [[ "$ICS_FEATURE_LEVEL" != *"INFO-TYPES"* ]]; then + prodstub_check_jobdata_2 200 prod-b job3 type2 $TARGET3 ricsim_g3_3 testdata/ics/job-template.json else - prodstub_check_jobdata_3 200 prod-b job3 type2 $TARGET3 ricsim_g3_3 testdata/ecs/job-template.json + prodstub_check_jobdata_3 200 prod-b job3 type2 $TARGET3 ricsim_g3_3 testdata/ics/job-template.json fi 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_ids 200 type1 ricsim_g3_1 job1 -ecs_api_a1_get_job_ids 200 type1 ricsim_g3_2 job2 -ecs_api_a1_get_job_ids 200 type2 ricsim_g3_3 job3 +ics_api_a1_get_job_ids 200 type1 NOWNER job1 job2 +ics_api_a1_get_job_ids 200 type2 NOWNER job3 +ics_api_a1_get_job_ids 200 type1 ricsim_g3_1 job1 +ics_api_a1_get_job_ids 200 type1 ricsim_g3_2 job2 +ics_api_a1_get_job_ids 200 type2 ricsim_g3_3 job3 if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_get_job 200 type2 job3 $TARGET3 ricsim_g3_3 testdata/ecs/job-template.json + ics_api_a1_get_job 200 type2 job3 $TARGET3 ricsim_g3_3 testdata/ics/job-template.json - ecs_api_a1_get_job_status 200 type2 job3 ENABLED + ics_api_a1_get_job_status 200 type2 job3 ENABLED else - ecs_api_a1_get_job 200 job3 type2 $TARGET3 ricsim_g3_3 $STATUS3 testdata/ecs/job-template.json + ics_api_a1_get_job 200 job3 type2 $TARGET3 ricsim_g3_3 $STATUS3 testdata/ics/job-template.json - ecs_api_a1_get_job_status 200 job3 ENABLED + ics_api_a1_get_job_status 200 job3 ENABLED fi -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 +if [ $ICS_VERSION == "V1-1" ]; then + ics_api_edp_get_producer_jobs 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json job2 type1 $TARGET2 ricsim_g3_2 testdata/ics/job-template.json + ics_api_edp_get_producer_jobs 200 prod-b job3 type2 $TARGET3 ricsim_g3_3 testdata/ics/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 + ics_api_edp_get_producer_jobs_2 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json job2 type1 $TARGET2 ricsim_g3_2 testdata/ics/job-template.json + ics_api_edp_get_producer_jobs_2 200 prod-b job3 type2 $TARGET3 ricsim_g3_3 testdata/ics/job-template.json fi ## Setup prod-c (no types) -if [ $ECS_VERSION == "V1-1" ]; then - ecs_api_edp_put_producer 201 prod-c $CB_JOB/prod-c $CB_SV/prod-c NOTYPE +if [ $ICS_VERSION == "V1-1" ]; then + ics_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 + ics_api_edp_put_producer_2 201 prod-c $CB_JOB/prod-c $CB_SV/prod-c NOTYPE fi -if [ $ECS_VERSION == "V1-1" ]; then - ecs_api_edp_get_producer_ids 200 prod-a prod-b prod-c +if [ $ICS_VERSION == "V1-1" ]; then + ics_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 + ics_api_edp_get_producer_ids_2 200 NOTYPE prod-a prod-b prod-c 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 - ecs_api_edp_get_producer 200 prod-c $CB_JOB/prod-c $CB_SV/prod-c EMPTY +if [ $ICS_VERSION == "V1-1" ]; then + ics_api_edp_get_producer 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 testdata/ics/ei-type-1.json + ics_api_edp_get_producer 200 prod-b $CB_JOB/prod-b $CB_SV/prod-b type2 testdata/ics/ei-type-2.json + ics_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 + ics_api_edp_get_producer_2 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 + ics_api_edp_get_producer_2 200 prod-b $CB_JOB/prod-b $CB_SV/prod-b type2 + ics_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 +ics_api_edp_get_producer_status 200 prod-c ENABLED ## Delete job3 and prod-b and re-create if different order # Delete job then producer -ecs_api_a1_get_job_ids 200 NOTYPE NOWNER job1 job2 job3 -if [ $ECS_VERSION == "V1-1" ]; then - ecs_api_edp_get_producer_ids 200 prod-a prod-b prod-c +ics_api_a1_get_job_ids 200 NOTYPE NOWNER job1 job2 job3 +if [ $ICS_VERSION == "V1-1" ]; then + ics_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 + ics_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 + ics_api_a1_delete_job 204 type2 job3 else - ecs_api_a1_delete_job 204 job3 + ics_api_a1_delete_job 204 job3 fi -ecs_api_a1_get_job_ids 200 NOTYPE NOWNER job1 job2 -if [ $ECS_VERSION == "V1-1" ]; then - ecs_api_edp_get_producer_ids 200 prod-a prod-b prod-c +ics_api_a1_get_job_ids 200 NOTYPE NOWNER job1 job2 +if [ $ICS_VERSION == "V1-1" ]; then + ics_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 + ics_api_edp_get_producer_ids_2 200 NOTYPE prod-a prod-b prod-c fi -ecs_api_edp_delete_producer 204 prod-b +ics_api_edp_delete_producer 204 prod-b -ecs_api_edp_get_producer_status 404 prod-b +ics_api_edp_get_producer_status 404 prod-b -ecs_api_a1_get_job_ids 200 NOTYPE NOWNER job1 job2 -if [ $ECS_VERSION == "V1-1" ]; then - ecs_api_edp_get_producer_ids 200 prod-a prod-c +ics_api_a1_get_job_ids 200 NOTYPE NOWNER job1 job2 +if [ $ICS_VERSION == "V1-1" ]; then + ics_api_edp_get_producer_ids 200 prod-a prod-c else - ecs_api_edp_get_producer_ids_2 200 NOTYPE prod-a prod-c + ics_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 + ics_api_a1_put_job 404 type2 job3 $TARGET3 ricsim_g3_3 testdata/ics/job-template.json else - if [ $ECS_VERSION == "V1-1" ]; then - ecs_api_a1_put_job 404 job3 type2 $TARGET3 ricsim_g3_3 $STATUS3 testdata/ecs/job-template.json + if [ $ICS_VERSION == "V1-1" ]; then + ics_api_a1_put_job 404 job3 type2 $TARGET3 ricsim_g3_3 $STATUS3 testdata/ics/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 + ics_api_a1_put_job 201 job3 type2 $TARGET3 ricsim_g3_3 $STATUS3 testdata/ics/job-template.json + ics_api_a1_get_job_status 200 job3 DISABLED fi fi # Put producer then job -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 +if [ $ICS_VERSION == "V1-1" ]; then + ics_api_edp_put_producer 201 prod-b $CB_JOB/prod-b $CB_SV/prod-b type2 testdata/ics/ei-type-2.json else - ecs_api_edp_put_producer_2 201 prod-b $CB_JOB/prod-b $CB_SV/prod-b type2 + ics_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 +ics_api_edp_get_producer_status 200 prod-b ENABLED 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 + ics_api_a1_put_job 201 type2 job3 $TARGET3 ricsim_g3_3 testdata/ics/job-template2.json + ics_api_a1_get_job_status 200 type2 job3 ENABLED else - if [ $ECS_VERSION == "V1-1" ]; then - ecs_api_a1_put_job 201 job3 type2 $TARGET3 ricsim_g3_3 $STATUS3 testdata/ecs/job-template2.json + if [ $ICS_VERSION == "V1-1" ]; then + ics_api_a1_put_job 201 job3 type2 $TARGET3 ricsim_g3_3 $STATUS3 testdata/ics/job-template2.json else - ecs_api_a1_put_job 200 job3 type2 $TARGET3 ricsim_g3_3 $STATUS3 testdata/ecs/job-template2.json + ics_api_a1_put_job 200 job3 type2 $TARGET3 ricsim_g3_3 $STATUS3 testdata/ics/job-template2.json fi - ecs_api_a1_get_job_status 200 job3 ENABLED + ics_api_a1_get_job_status 200 job3 ENABLED fi -if [ $ECS_VERSION == "V1-1" ]; then - prodstub_check_jobdata 200 prod-b job3 type2 $TARGET3 ricsim_g3_3 testdata/ecs/job-template2.json +if [ $ICS_VERSION == "V1-1" ]; then + prodstub_check_jobdata 200 prod-b job3 type2 $TARGET3 ricsim_g3_3 testdata/ics/job-template2.json else - if [[ "$ECS_FEATURE_LEVEL" != *"INFO-TYPES"* ]]; then - prodstub_check_jobdata_2 200 prod-b job3 type2 $TARGET3 ricsim_g3_3 testdata/ecs/job-template2.json + if [[ "$ICS_FEATURE_LEVEL" != *"INFO-TYPES"* ]]; then + prodstub_check_jobdata_2 200 prod-b job3 type2 $TARGET3 ricsim_g3_3 testdata/ics/job-template2.json else - prodstub_check_jobdata_3 200 prod-b job3 type2 $TARGET3 ricsim_g3_3 testdata/ecs/job-template2.json + prodstub_check_jobdata_3 200 prod-b job3 type2 $TARGET3 ricsim_g3_3 testdata/ics/job-template2.json fi fi -ecs_api_a1_get_job_ids 200 NOTYPE NOWNER job1 job2 job3 -if [ $ECS_VERSION == "V1-1" ]; then - ecs_api_edp_get_producer_ids 200 prod-a prod-b prod-c +ics_api_a1_get_job_ids 200 NOTYPE NOWNER job1 job2 job3 +if [ $ICS_VERSION == "V1-1" ]; then + ics_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 + ics_api_edp_get_producer_ids_2 200 NOTYPE prod-a prod-b prod-c fi -if [ $ECS_VERSION == "V1-1" ]; then +if [ $ICS_VERSION == "V1-1" ]; then prodstub_equal create/prod-b/job3 2 else prodstub_equal create/prod-b/job3 3 @@ -702,420 +702,420 @@ fi prodstub_equal delete/prod-b/job3 1 # Delete only the producer -ecs_api_edp_delete_producer 204 prod-b +ics_api_edp_delete_producer 204 prod-b -ecs_api_edp_get_producer_status 404 prod-b +ics_api_edp_get_producer_status 404 prod-b -ecs_api_a1_get_job_ids 200 NOTYPE NOWNER job1 job2 job3 -if [ $ECS_VERSION == "V1-1" ]; then - ecs_api_edp_get_producer_ids 200 prod-a prod-c +ics_api_a1_get_job_ids 200 NOTYPE NOWNER job1 job2 job3 +if [ $ICS_VERSION == "V1-1" ]; then + ics_api_edp_get_producer_ids 200 prod-a prod-c else - ecs_api_edp_get_producer_ids_2 200 NOTYPE prod-a prod-c + ics_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 + ics_api_a1_get_job_status 200 type2 job3 DISABLED else - ecs_api_a1_get_job_status 200 job3 DISABLED + ics_api_a1_get_job_status 200 job3 DISABLED fi -if [[ "$ECS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then +if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then cr_equal 0 received_callbacks 5 30 cr_equal 0 received_callbacks?id=type-status1 4 cr_equal 0 received_callbacks?id=job3-status 1 - cr_api_check_all_ecs_events 200 0 job3-status DISABLED + cr_api_check_all_ics_events 200 0 job3-status DISABLED else cr_equal 0 received_callbacks 1 30 cr_equal 0 received_callbacks?id=job3-status 1 - cr_api_check_all_ecs_events 200 0 job3-status DISABLED + cr_api_check_all_ics_events 200 0 job3-status DISABLED fi # Re-create the producer -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 +if [ $ICS_VERSION == "V1-1" ]; then + ics_api_edp_put_producer 201 prod-b $CB_JOB/prod-b $CB_SV/prod-b type2 testdata/ics/ei-type-2.json else - ecs_api_edp_put_producer_2 201 prod-b $CB_JOB/prod-b $CB_SV/prod-b type2 + ics_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 +ics_api_edp_get_producer_status 200 prod-b ENABLED if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_get_job_status 200 type2 job3 ENABLED + ics_api_a1_get_job_status 200 type2 job3 ENABLED else - ecs_api_a1_get_job_status 200 job3 ENABLED + ics_api_a1_get_job_status 200 job3 ENABLED fi -if [[ "$ECS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then +if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then cr_equal 0 received_callbacks 6 30 cr_equal 0 received_callbacks?id=type-status1 4 cr_equal 0 received_callbacks?id=job3-status 2 - cr_api_check_all_ecs_events 200 0 job3-status ENABLED + cr_api_check_all_ics_events 200 0 job3-status ENABLED else cr_equal 0 received_callbacks 2 30 cr_equal 0 received_callbacks?id=job3-status 2 - cr_api_check_all_ecs_events 200 0 job3-status ENABLED + cr_api_check_all_ics_events 200 0 job3-status ENABLED fi -if [ $ECS_VERSION == "V1-1" ]; then - prodstub_check_jobdata 200 prod-b job3 type2 $TARGET3 ricsim_g3_3 testdata/ecs/job-template2.json +if [ $ICS_VERSION == "V1-1" ]; then + prodstub_check_jobdata 200 prod-b job3 type2 $TARGET3 ricsim_g3_3 testdata/ics/job-template2.json else - if [[ "$ECS_FEATURE_LEVEL" != *"INFO-TYPES"* ]]; then - prodstub_check_jobdata_2 200 prod-b job3 type2 $TARGET3 ricsim_g3_3 testdata/ecs/job-template2.json + if [[ "$ICS_FEATURE_LEVEL" != *"INFO-TYPES"* ]]; then + prodstub_check_jobdata_2 200 prod-b job3 type2 $TARGET3 ricsim_g3_3 testdata/ics/job-template2.json else - prodstub_check_jobdata_3 200 prod-b job3 type2 $TARGET3 ricsim_g3_3 testdata/ecs/job-template2.json + prodstub_check_jobdata_3 200 prod-b job3 type2 $TARGET3 ricsim_g3_3 testdata/ics/job-template2.json fi fi ## Setup prod-d -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 +if [ $ICS_VERSION == "V1-1" ]; then + ics_api_edp_put_producer 201 prod-d $CB_JOB/prod-d $CB_SV/prod-d type4 testdata/ics/ei-type-4.json else - ecs_api_edp_put_type_2 201 type4 testdata/ecs/ei-type-4.json - ecs_api_edp_put_producer_2 201 prod-d $CB_JOB/prod-d $CB_SV/prod-d type4 + ics_api_edp_put_type_2 201 type4 testdata/ics/ei-type-4.json + ics_api_edp_put_producer_2 201 prod-d $CB_JOB/prod-d $CB_SV/prod-d type4 fi -if [[ "$ECS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then +if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then cr_equal 0 received_callbacks 7 30 cr_equal 0 received_callbacks?id=type-status1 5 - cr_api_check_all_ecs_subscription_events 200 0 type-status1 type4 testdata/ecs/ei-type-4.json REGISTERED + cr_api_check_all_ics_subscription_events 200 0 type-status1 type4 testdata/ics/ei-type-4.json REGISTERED fi -ecs_api_a1_get_job_ids 200 type4 NOWNER EMPTY +ics_api_a1_get_job_ids 200 type4 NOWNER EMPTY if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_put_job 201 type4 job8 $TARGET8 ricsim_g3_4 testdata/ecs/job-template.json + ics_api_a1_put_job 201 type4 job8 $TARGET8 ricsim_g3_4 testdata/ics/job-template.json else - ecs_api_a1_put_job 201 job8 type4 $TARGET8 ricsim_g3_4 $STATUS8 testdata/ecs/job-template.json + ics_api_a1_put_job 201 job8 type4 $TARGET8 ricsim_g3_4 $STATUS8 testdata/ics/job-template.json fi -if [ $ECS_VERSION == "V1-1" ]; then - prodstub_check_jobdata 200 prod-d job8 type4 $TARGET8 ricsim_g3_4 testdata/ecs/job-template.json +if [ $ICS_VERSION == "V1-1" ]; then + prodstub_check_jobdata 200 prod-d job8 type4 $TARGET8 ricsim_g3_4 testdata/ics/job-template.json else - if [[ "$ECS_FEATURE_LEVEL" != *"INFO-TYPES"* ]]; then - prodstub_check_jobdata_2 200 prod-d job8 type4 $TARGET8 ricsim_g3_4 testdata/ecs/job-template.json + if [[ "$ICS_FEATURE_LEVEL" != *"INFO-TYPES"* ]]; then + prodstub_check_jobdata_2 200 prod-d job8 type4 $TARGET8 ricsim_g3_4 testdata/ics/job-template.json else - prodstub_check_jobdata_3 200 prod-d job8 type4 $TARGET8 ricsim_g3_4 testdata/ecs/job-template.json + prodstub_check_jobdata_3 200 prod-d job8 type4 $TARGET8 ricsim_g3_4 testdata/ics/job-template.json fi fi prodstub_equal create/prod-d/job8 1 prodstub_equal delete/prod-d/job8 0 -ecs_api_a1_get_job_ids 200 type4 NOWNER job8 +ics_api_a1_get_job_ids 200 type4 NOWNER job8 if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_get_job_status 200 type4 job8 ENABLED + ics_api_a1_get_job_status 200 type4 job8 ENABLED else - ecs_api_a1_get_job_status 200 job8 ENABLED + ics_api_a1_get_job_status 200 job8 ENABLED fi # Re-PUT the producer with zero types -if [ $ECS_VERSION == "V1-1" ]; then - ecs_api_edp_put_producer 200 prod-d $CB_JOB/prod-d $CB_SV/prod-d NOTYPE +if [ $ICS_VERSION == "V1-1" ]; then + ics_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 + ics_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 + ics_api_a1_get_job_ids 404 type4 NOWNER else - ecs_api_a1_get_job_ids 200 type4 NOWNER job8 - ecs_api_a1_get_job_ids 200 NOTYPE NOWNER job1 job2 job3 job8 + ics_api_a1_get_job_ids 200 type4 NOWNER job8 + ics_api_a1_get_job_ids 200 NOTYPE NOWNER job1 job2 job3 job8 fi if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_get_job_status 200 type4 job8 DISABLED + ics_api_a1_get_job_status 200 type4 job8 DISABLED else - ecs_api_a1_get_job_status 200 job8 DISABLED + ics_api_a1_get_job_status 200 job8 DISABLED fi -if [[ "$ECS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then +if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then cr_equal 0 received_callbacks 8 30 cr_equal 0 received_callbacks?id=type-status1 5 cr_equal 0 received_callbacks?id=job8-status 1 - cr_api_check_all_ecs_events 200 0 job8-status DISABLED + cr_api_check_all_ics_events 200 0 job8-status DISABLED else cr_equal 0 received_callbacks 3 30 cr_equal 0 received_callbacks?id=job8-status 1 - cr_api_check_all_ecs_events 200 0 job8-status DISABLED + cr_api_check_all_ics_events 200 0 job8-status DISABLED fi prodstub_equal create/prod-d/job8 1 prodstub_equal delete/prod-d/job8 0 ## Re-setup prod-d -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 +if [ $ICS_VERSION == "V1-1" ]; then + ics_api_edp_put_producer 200 prod-d $CB_JOB/prod-d $CB_SV/prod-d type4 testdata/ics/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 + ics_api_edp_put_type_2 200 type4 testdata/ics/ei-type-4.json + ics_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 + ics_api_a1_get_job_ids 404 type4 NOWNER else - ecs_api_a1_get_job_ids 200 type4 NOWNER job8 - ecs_api_a1_get_job_ids 200 NOTYPE NOWNER job1 job2 job3 job8 + ics_api_a1_get_job_ids 200 type4 NOWNER job8 + ics_api_a1_get_job_ids 200 NOTYPE NOWNER job1 job2 job3 job8 fi if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_get_job_status 200 type4 job8 ENABLED + ics_api_a1_get_job_status 200 type4 job8 ENABLED else - ecs_api_a1_get_job_status 200 job8 ENABLED + ics_api_a1_get_job_status 200 job8 ENABLED fi -ecs_api_edp_get_producer_status 200 prod-a ENABLED -ecs_api_edp_get_producer_status 200 prod-b ENABLED -ecs_api_edp_get_producer_status 200 prod-c ENABLED -ecs_api_edp_get_producer_status 200 prod-d ENABLED +ics_api_edp_get_producer_status 200 prod-a ENABLED +ics_api_edp_get_producer_status 200 prod-b ENABLED +ics_api_edp_get_producer_status 200 prod-c ENABLED +ics_api_edp_get_producer_status 200 prod-d ENABLED -if [[ "$ECS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then +if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then cr_equal 0 received_callbacks 10 30 cr_equal 0 received_callbacks?id=type-status1 6 - cr_api_check_all_ecs_subscription_events 200 0 type-status1 type4 testdata/ecs/ei-type-4.json REGISTERED + cr_api_check_all_ics_subscription_events 200 0 type-status1 type4 testdata/ics/ei-type-4.json REGISTERED cr_equal 0 received_callbacks?id=job8-status 2 - cr_api_check_all_ecs_events 200 0 job8-status ENABLED + cr_api_check_all_ics_events 200 0 job8-status ENABLED else cr_equal 0 received_callbacks 4 30 cr_equal 0 received_callbacks?id=job8-status 2 - cr_api_check_all_ecs_events 200 0 job8-status ENABLED + cr_api_check_all_ics_events 200 0 job8-status ENABLED fi prodstub_equal create/prod-d/job8 2 prodstub_equal delete/prod-d/job8 0 ## Setup prod-e -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 +if [ $ICS_VERSION == "V1-1" ]; then + ics_api_edp_put_producer 201 prod-e $CB_JOB/prod-e $CB_SV/prod-e type6 testdata/ics/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 + ics_api_edp_put_type_2 201 type6 testdata/ics/ei-type-6.json + ics_api_edp_put_producer_2 201 prod-e $CB_JOB/prod-e $CB_SV/prod-e type6 fi -if [[ "$ECS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then +if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then cr_equal 0 received_callbacks 11 30 cr_equal 0 received_callbacks?id=type-status1 7 - cr_api_check_all_ecs_subscription_events 200 0 type-status1 type6 testdata/ecs/ei-type-6.json REGISTERED + cr_api_check_all_ics_subscription_events 200 0 type-status1 type6 testdata/ics/ei-type-6.json REGISTERED fi -ecs_api_a1_get_job_ids 200 type6 NOWNER EMPTY +ics_api_a1_get_job_ids 200 type6 NOWNER EMPTY if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_put_job 201 type6 job10 $TARGET10 ricsim_g3_4 testdata/ecs/job-template.json + ics_api_a1_put_job 201 type6 job10 $TARGET10 ricsim_g3_4 testdata/ics/job-template.json else - ecs_api_a1_put_job 201 job10 type6 $TARGET10 ricsim_g3_4 $STATUS10 testdata/ecs/job-template.json + ics_api_a1_put_job 201 job10 type6 $TARGET10 ricsim_g3_4 $STATUS10 testdata/ics/job-template.json fi -if [ $ECS_VERSION == "V1-1" ]; then - prodstub_check_jobdata 200 prod-e job10 type6 $TARGET10 ricsim_g3_4 testdata/ecs/job-template.json +if [ $ICS_VERSION == "V1-1" ]; then + prodstub_check_jobdata 200 prod-e job10 type6 $TARGET10 ricsim_g3_4 testdata/ics/job-template.json else - if [[ "$ECS_FEATURE_LEVEL" != *"INFO-TYPES"* ]]; then - prodstub_check_jobdata_2 200 prod-e job10 type6 $TARGET10 ricsim_g3_4 testdata/ecs/job-template.json + if [[ "$ICS_FEATURE_LEVEL" != *"INFO-TYPES"* ]]; then + prodstub_check_jobdata_2 200 prod-e job10 type6 $TARGET10 ricsim_g3_4 testdata/ics/job-template.json else - prodstub_check_jobdata_3 200 prod-e job10 type6 $TARGET10 ricsim_g3_4 testdata/ecs/job-template.json + prodstub_check_jobdata_3 200 prod-e job10 type6 $TARGET10 ricsim_g3_4 testdata/ics/job-template.json fi fi prodstub_equal create/prod-e/job10 1 prodstub_equal delete/prod-e/job10 0 -ecs_api_a1_get_job_ids 200 type6 NOWNER job10 +ics_api_a1_get_job_ids 200 type6 NOWNER job10 if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_get_job_status 200 type6 job10 ENABLED + ics_api_a1_get_job_status 200 type6 job10 ENABLED else - ecs_api_a1_get_job_status 200 job10 ENABLED + ics_api_a1_get_job_status 200 job10 ENABLED fi ## Setup prod-f -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 +if [ $ICS_VERSION == "V1-1" ]; then + ics_api_edp_put_producer 201 prod-f $CB_JOB/prod-f $CB_SV/prod-f type6 testdata/ics/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 + ics_api_edp_put_type_2 200 type6 testdata/ics/ei-type-6.json + ics_api_edp_put_producer_2 201 prod-f $CB_JOB/prod-f $CB_SV/prod-f type6 fi -if [[ "$ECS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then +if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then cr_equal 0 received_callbacks 12 30 cr_equal 0 received_callbacks?id=type-status1 8 - cr_api_check_all_ecs_subscription_events 200 0 type-status1 type6 testdata/ecs/ei-type-6.json REGISTERED + cr_api_check_all_ics_subscription_events 200 0 type-status1 type6 testdata/ics/ei-type-6.json REGISTERED fi -ecs_api_a1_get_job_ids 200 type6 NOWNER job10 +ics_api_a1_get_job_ids 200 type6 NOWNER job10 -if [ $ECS_VERSION == "V1-1" ]; then - prodstub_check_jobdata 200 prod-f job10 type6 $TARGET10 ricsim_g3_4 testdata/ecs/job-template.json +if [ $ICS_VERSION == "V1-1" ]; then + prodstub_check_jobdata 200 prod-f job10 type6 $TARGET10 ricsim_g3_4 testdata/ics/job-template.json else - if [[ "$ECS_FEATURE_LEVEL" != *"INFO-TYPES"* ]]; then - prodstub_check_jobdata_2 200 prod-f job10 type6 $TARGET10 ricsim_g3_4 testdata/ecs/job-template.json + if [[ "$ICS_FEATURE_LEVEL" != *"INFO-TYPES"* ]]; then + prodstub_check_jobdata_2 200 prod-f job10 type6 $TARGET10 ricsim_g3_4 testdata/ics/job-template.json else - prodstub_check_jobdata_3 200 prod-f job10 type6 $TARGET10 ricsim_g3_4 testdata/ecs/job-template.json + prodstub_check_jobdata_3 200 prod-f job10 type6 $TARGET10 ricsim_g3_4 testdata/ics/job-template.json fi fi prodstub_equal create/prod-f/job10 1 prodstub_equal delete/prod-f/job10 0 -ecs_api_a1_get_job_ids 200 type6 NOWNER job10 +ics_api_a1_get_job_ids 200 type6 NOWNER job10 if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_get_job_status 200 type6 job10 ENABLED + ics_api_a1_get_job_status 200 type6 job10 ENABLED else - ecs_api_a1_get_job_status 200 job10 ENABLED + ics_api_a1_get_job_status 200 job10 ENABLED fi ## Status updates prod-a and jobs -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 +if [ $ICS_VERSION == "V1-1" ]; then + ics_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 + ics_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 -ecs_api_edp_get_producer_status 200 prod-c ENABLED -ecs_api_edp_get_producer_status 200 prod-d ENABLED -ecs_api_edp_get_producer_status 200 prod-e ENABLED -ecs_api_edp_get_producer_status 200 prod-f ENABLED +ics_api_edp_get_producer_status 200 prod-a ENABLED +ics_api_edp_get_producer_status 200 prod-b ENABLED +ics_api_edp_get_producer_status 200 prod-c ENABLED +ics_api_edp_get_producer_status 200 prod-d ENABLED +ics_api_edp_get_producer_status 200 prod-e ENABLED +ics_api_edp_get_producer_status 200 prod-f ENABLED # Arm producer prod-a for supervision failure 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 +ics_api_edp_get_producer_status 200 prod-a DISABLED 360 -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 +if [ $ICS_VERSION == "V1-1" ]; then + ics_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 + ics_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 -ecs_api_edp_get_producer_status 200 prod-c ENABLED -ecs_api_edp_get_producer_status 200 prod-d ENABLED -ecs_api_edp_get_producer_status 200 prod-e ENABLED -ecs_api_edp_get_producer_status 200 prod-f ENABLED +ics_api_edp_get_producer_status 200 prod-a DISABLED +ics_api_edp_get_producer_status 200 prod-b ENABLED +ics_api_edp_get_producer_status 200 prod-c ENABLED +ics_api_edp_get_producer_status 200 prod-d ENABLED +ics_api_edp_get_producer_status 200 prod-e ENABLED +ics_api_edp_get_producer_status 200 prod-f ENABLED if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_get_job_status 200 type1 job1 ENABLED - ecs_api_a1_get_job_status 200 type1 job2 ENABLED - ecs_api_a1_get_job_status 200 type2 job3 ENABLED - ecs_api_a1_get_job_status 200 type4 job8 ENABLED - ecs_api_a1_get_job_status 200 type6 job10 ENABLED + ics_api_a1_get_job_status 200 type1 job1 ENABLED + ics_api_a1_get_job_status 200 type1 job2 ENABLED + ics_api_a1_get_job_status 200 type2 job3 ENABLED + ics_api_a1_get_job_status 200 type4 job8 ENABLED + ics_api_a1_get_job_status 200 type6 job10 ENABLED else - ecs_api_a1_get_job_status 200 job1 ENABLED - ecs_api_a1_get_job_status 200 job2 ENABLED - ecs_api_a1_get_job_status 200 job3 ENABLED - ecs_api_a1_get_job_status 200 job8 ENABLED - ecs_api_a1_get_job_status 200 job10 ENABLED + ics_api_a1_get_job_status 200 job1 ENABLED + ics_api_a1_get_job_status 200 job2 ENABLED + ics_api_a1_get_job_status 200 job3 ENABLED + ics_api_a1_get_job_status 200 job8 ENABLED + ics_api_a1_get_job_status 200 job10 ENABLED fi # Arm producer prod-a for supervision 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 +ics_api_edp_get_producer_status 200 prod-a ENABLED 360 -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 +if [ $ICS_VERSION == "V1-1" ]; then + ics_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 + ics_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 -ecs_api_edp_get_producer_status 200 prod-c ENABLED -ecs_api_edp_get_producer_status 200 prod-d ENABLED -ecs_api_edp_get_producer_status 200 prod-e ENABLED -ecs_api_edp_get_producer_status 200 prod-f ENABLED +ics_api_edp_get_producer_status 200 prod-a ENABLED +ics_api_edp_get_producer_status 200 prod-b ENABLED +ics_api_edp_get_producer_status 200 prod-c ENABLED +ics_api_edp_get_producer_status 200 prod-d ENABLED +ics_api_edp_get_producer_status 200 prod-e ENABLED +ics_api_edp_get_producer_status 200 prod-f ENABLED if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_get_job_status 200 type1 job1 ENABLED - ecs_api_a1_get_job_status 200 type1 job2 ENABLED - ecs_api_a1_get_job_status 200 type2 job3 ENABLED - ecs_api_a1_get_job_status 200 type4 job8 ENABLED - ecs_api_a1_get_job_status 200 type6 job10 ENABLED + ics_api_a1_get_job_status 200 type1 job1 ENABLED + ics_api_a1_get_job_status 200 type1 job2 ENABLED + ics_api_a1_get_job_status 200 type2 job3 ENABLED + ics_api_a1_get_job_status 200 type4 job8 ENABLED + ics_api_a1_get_job_status 200 type6 job10 ENABLED else - ecs_api_a1_get_job_status 200 job1 ENABLED - ecs_api_a1_get_job_status 200 job2 ENABLED - ecs_api_a1_get_job_status 200 job3 ENABLED - ecs_api_a1_get_job_status 200 job8 ENABLED - ecs_api_a1_get_job_status 200 job10 ENABLED + ics_api_a1_get_job_status 200 job1 ENABLED + ics_api_a1_get_job_status 200 job2 ENABLED + ics_api_a1_get_job_status 200 job3 ENABLED + ics_api_a1_get_job_status 200 job8 ENABLED + ics_api_a1_get_job_status 200 job10 ENABLED fi # Arm producer prod-a for supervision failure 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 +ics_api_edp_get_producer_status 200 prod-a DISABLED 360 -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 +if [ $ICS_VERSION == "V1-1" ]; then + ics_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 + ics_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 -ecs_api_edp_get_producer_status 200 prod-c ENABLED -ecs_api_edp_get_producer_status 200 prod-d ENABLED -ecs_api_edp_get_producer_status 200 prod-e ENABLED -ecs_api_edp_get_producer_status 200 prod-f ENABLED +ics_api_edp_get_producer_status 200 prod-a DISABLED +ics_api_edp_get_producer_status 200 prod-b ENABLED +ics_api_edp_get_producer_status 200 prod-c ENABLED +ics_api_edp_get_producer_status 200 prod-d ENABLED +ics_api_edp_get_producer_status 200 prod-e ENABLED +ics_api_edp_get_producer_status 200 prod-f ENABLED if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_get_job_status 200 type1 job1 ENABLED - ecs_api_a1_get_job_status 200 type1 job2 ENABLED - ecs_api_a1_get_job_status 200 type2 job3 ENABLED - ecs_api_a1_get_job_status 200 type4 job8 ENABLED - ecs_api_a1_get_job_status 200 type6 job10 ENABLED + ics_api_a1_get_job_status 200 type1 job1 ENABLED + ics_api_a1_get_job_status 200 type1 job2 ENABLED + ics_api_a1_get_job_status 200 type2 job3 ENABLED + ics_api_a1_get_job_status 200 type4 job8 ENABLED + ics_api_a1_get_job_status 200 type6 job10 ENABLED else - ecs_api_a1_get_job_status 200 job1 ENABLED - ecs_api_a1_get_job_status 200 job2 ENABLED - ecs_api_a1_get_job_status 200 job3 ENABLED - ecs_api_a1_get_job_status 200 job8 ENABLED - ecs_api_a1_get_job_status 200 job10 ENABLED + ics_api_a1_get_job_status 200 job1 ENABLED + ics_api_a1_get_job_status 200 job2 ENABLED + ics_api_a1_get_job_status 200 job3 ENABLED + ics_api_a1_get_job_status 200 job8 ENABLED + ics_api_a1_get_job_status 200 job10 ENABLED fi # Wait for producer prod-a to be removed -if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then - ecs_equal json:data-producer/v1/info-producers 5 1000 +if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then + ics_equal json:data-producer/v1/info-producers 5 1000 else - ecs_equal json:ei-producer/v1/eiproducers 5 1000 + ics_equal json:ei-producer/v1/eiproducers 5 1000 fi -if [ $ECS_VERSION == "V1-1" ]; then - ecs_api_edp_get_producer_ids 200 prod-b prod-c prod-d prod-e prod-f +if [ $ICS_VERSION == "V1-1" ]; then + ics_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 + ics_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-c ENABLED -ecs_api_edp_get_producer_status 200 prod-d ENABLED -ecs_api_edp_get_producer_status 200 prod-e ENABLED -ecs_api_edp_get_producer_status 200 prod-f ENABLED +ics_api_edp_get_producer_status 404 prod-a +ics_api_edp_get_producer_status 200 prod-b ENABLED +ics_api_edp_get_producer_status 200 prod-c ENABLED +ics_api_edp_get_producer_status 200 prod-d ENABLED +ics_api_edp_get_producer_status 200 prod-e ENABLED +ics_api_edp_get_producer_status 200 prod-f ENABLED if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_get_job_status 200 type1 job1 DISABLED - ecs_api_a1_get_job_status 200 type1 job2 DISABLED - ecs_api_a1_get_job_status 200 type2 job3 ENABLED - ecs_api_a1_get_job_status 200 type4 job8 ENABLED - ecs_api_a1_get_job_status 200 type6 job10 ENABLED + ics_api_a1_get_job_status 200 type1 job1 DISABLED + ics_api_a1_get_job_status 200 type1 job2 DISABLED + ics_api_a1_get_job_status 200 type2 job3 ENABLED + ics_api_a1_get_job_status 200 type4 job8 ENABLED + ics_api_a1_get_job_status 200 type6 job10 ENABLED else - ecs_api_a1_get_job_status 200 job1 DISABLED - ecs_api_a1_get_job_status 200 job2 DISABLED - ecs_api_a1_get_job_status 200 job3 ENABLED - ecs_api_a1_get_job_status 200 job8 ENABLED - ecs_api_a1_get_job_status 200 job10 ENABLED + ics_api_a1_get_job_status 200 job1 DISABLED + ics_api_a1_get_job_status 200 job2 DISABLED + ics_api_a1_get_job_status 200 job3 ENABLED + ics_api_a1_get_job_status 200 job8 ENABLED + ics_api_a1_get_job_status 200 job10 ENABLED fi -if [[ "$ECS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then +if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then cr_equal 0 received_callbacks 14 30 else cr_equal 0 received_callbacks 6 30 @@ -1124,40 +1124,40 @@ fi cr_equal 0 received_callbacks?id=job1-status 1 cr_equal 0 received_callbacks?id=job2-status 1 -cr_api_check_all_ecs_events 200 0 job1-status DISABLED -cr_api_check_all_ecs_events 200 0 job2-status DISABLED +cr_api_check_all_ics_events 200 0 job1-status DISABLED +cr_api_check_all_ics_events 200 0 job2-status DISABLED # Arm producer prod-e for supervision failure prodstub_arm_producer 200 prod-e 400 -ecs_api_edp_get_producer_status 200 prod-e DISABLED 1000 +ics_api_edp_get_producer_status 200 prod-e DISABLED 1000 -if [ $ECS_VERSION == "V1-1" ]; then - ecs_api_edp_get_producer_ids 200 prod-b prod-c prod-d prod-e prod-f +if [ $ICS_VERSION == "V1-1" ]; then + ics_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 + ics_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-c ENABLED -ecs_api_edp_get_producer_status 200 prod-d ENABLED -ecs_api_edp_get_producer_status 200 prod-e DISABLED -ecs_api_edp_get_producer_status 200 prod-f ENABLED +ics_api_edp_get_producer_status 404 prod-a +ics_api_edp_get_producer_status 200 prod-b ENABLED +ics_api_edp_get_producer_status 200 prod-c ENABLED +ics_api_edp_get_producer_status 200 prod-d ENABLED +ics_api_edp_get_producer_status 200 prod-e DISABLED +ics_api_edp_get_producer_status 200 prod-f ENABLED if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_get_job_status 200 type1 job1 DISABLED - ecs_api_a1_get_job_status 200 type1 job2 DISABLED - ecs_api_a1_get_job_status 200 type2 job3 ENABLED - ecs_api_a1_get_job_status 200 type4 job8 ENABLED - ecs_api_a1_get_job_status 200 type6 job10 ENABLED + ics_api_a1_get_job_status 200 type1 job1 DISABLED + ics_api_a1_get_job_status 200 type1 job2 DISABLED + ics_api_a1_get_job_status 200 type2 job3 ENABLED + ics_api_a1_get_job_status 200 type4 job8 ENABLED + ics_api_a1_get_job_status 200 type6 job10 ENABLED else - ecs_api_a1_get_job_status 200 job1 DISABLED - ecs_api_a1_get_job_status 200 job2 DISABLED - ecs_api_a1_get_job_status 200 job3 ENABLED - ecs_api_a1_get_job_status 200 job8 ENABLED - ecs_api_a1_get_job_status 200 job10 ENABLED + ics_api_a1_get_job_status 200 job1 DISABLED + ics_api_a1_get_job_status 200 job2 DISABLED + ics_api_a1_get_job_status 200 job3 ENABLED + ics_api_a1_get_job_status 200 job8 ENABLED + ics_api_a1_get_job_status 200 job10 ENABLED fi #Disable create for job10 in prod-e @@ -1165,83 +1165,83 @@ prodstub_arm_job_create 200 prod-e job10 400 #Update tjob 10 - only prod-f will be updated if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_put_job 200 type6 job10 $TARGET10 ricsim_g3_4 testdata/ecs/job-template2.json + ics_api_a1_put_job 200 type6 job10 $TARGET10 ricsim_g3_4 testdata/ics/job-template2.json else - ecs_api_a1_put_job 200 job10 type6 $TARGET10 ricsim_g3_4 $STATUS10 testdata/ecs/job-template2.json + ics_api_a1_put_job 200 job10 type6 $TARGET10 ricsim_g3_4 $STATUS10 testdata/ics/job-template2.json fi #Reset producer and job responses prodstub_arm_producer 200 prod-e 200 prodstub_arm_job_create 200 prod-e job10 200 -ecs_api_edp_get_producer_status 200 prod-e ENABLED 360 +ics_api_edp_get_producer_status 200 prod-e ENABLED 360 -if [ $ECS_VERSION == "V1-1" ]; then - ecs_api_edp_get_producer_ids 200 prod-b prod-c prod-d prod-e prod-f +if [ $ICS_VERSION == "V1-1" ]; then + ics_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 + ics_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 -if [ $ECS_VERSION == "V1-1" ]; then - prodstub_check_jobdata 200 prod-f job10 type6 $TARGET10 ricsim_g3_4 testdata/ecs/job-template2.json +if [ $ICS_VERSION == "V1-1" ]; then + prodstub_check_jobdata 200 prod-f job10 type6 $TARGET10 ricsim_g3_4 testdata/ics/job-template2.json else - if [[ "$ECS_FEATURE_LEVEL" != *"INFO-TYPES"* ]]; then - prodstub_check_jobdata_2 200 prod-f job10 type6 $TARGET10 ricsim_g3_4 testdata/ecs/job-template2.json + if [[ "$ICS_FEATURE_LEVEL" != *"INFO-TYPES"* ]]; then + prodstub_check_jobdata_2 200 prod-f job10 type6 $TARGET10 ricsim_g3_4 testdata/ics/job-template2.json else - prodstub_check_jobdata_3 200 prod-f job10 type6 $TARGET10 ricsim_g3_4 testdata/ecs/job-template2.json + prodstub_check_jobdata_3 200 prod-f job10 type6 $TARGET10 ricsim_g3_4 testdata/ics/job-template2.json fi fi prodstub_arm_producer 200 prod-f 400 -ecs_api_edp_get_producer_status 200 prod-f DISABLED 360 +ics_api_edp_get_producer_status 200 prod-f DISABLED 360 -if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then - ecs_equal json:data-producer/v1/info-producers 4 1000 +if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then + ics_equal json:data-producer/v1/info-producers 4 1000 else - ecs_equal json:ei-producer/v1/eiproducers 4 1000 + ics_equal json:ei-producer/v1/eiproducers 4 1000 fi -if [ $ECS_VERSION == "V1-1" ]; then - ecs_api_edp_get_producer_ids 200 prod-b prod-c prod-d prod-e +if [ $ICS_VERSION == "V1-1" ]; then + ics_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 + ics_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 -ecs_api_edp_get_producer_status 200 prod-c ENABLED -ecs_api_edp_get_producer_status 200 prod-d ENABLED -ecs_api_edp_get_producer_status 200 prod-e ENABLED -ecs_api_edp_get_producer_status 404 prod-f +ics_api_edp_get_producer_status 404 prod-a +ics_api_edp_get_producer_status 200 prod-b ENABLED +ics_api_edp_get_producer_status 200 prod-c ENABLED +ics_api_edp_get_producer_status 200 prod-d ENABLED +ics_api_edp_get_producer_status 200 prod-e ENABLED +ics_api_edp_get_producer_status 404 prod-f if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_get_job_status 200 type1 job1 DISABLED - ecs_api_a1_get_job_status 200 type1 job2 DISABLED - ecs_api_a1_get_job_status 200 type2 job3 ENABLED - ecs_api_a1_get_job_status 200 type4 job8 ENABLED - ecs_api_a1_get_job_status 200 type6 job10 ENABLED + ics_api_a1_get_job_status 200 type1 job1 DISABLED + ics_api_a1_get_job_status 200 type1 job2 DISABLED + ics_api_a1_get_job_status 200 type2 job3 ENABLED + ics_api_a1_get_job_status 200 type4 job8 ENABLED + ics_api_a1_get_job_status 200 type6 job10 ENABLED else - ecs_api_a1_get_job_status 200 job1 DISABLED - ecs_api_a1_get_job_status 200 job2 DISABLED - ecs_api_a1_get_job_status 200 job3 ENABLED - ecs_api_a1_get_job_status 200 job8 ENABLED - ecs_api_a1_get_job_status 200 job10 ENABLED + ics_api_a1_get_job_status 200 job1 DISABLED + ics_api_a1_get_job_status 200 job2 DISABLED + ics_api_a1_get_job_status 200 job3 ENABLED + ics_api_a1_get_job_status 200 job8 ENABLED + ics_api_a1_get_job_status 200 job10 ENABLED fi -if [[ "$ECS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then +if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then cr_equal 0 received_callbacks 14 30 else cr_equal 0 received_callbacks 6 30 fi -if [[ "$ECS_FEATURE_LEVEL" != *"INFO-TYPES"* ]]; then +if [[ "$ICS_FEATURE_LEVEL" != *"INFO-TYPES"* ]]; then # End test if info types is not impl in tested version - check_ecs_logs + check_ics_logs store_logs END @@ -1320,338 +1320,342 @@ prodstub_arm_job_create 200 prod-if job110 ### Initial tests - no config made ### GET: type ids, types, producer ids, producers, job ids, jobs ### DELETE: jobs -ecs_api_idc_get_type_ids 200 type1 type2 type4 type6 -ecs_api_idc_get_type 404 test-type +ics_api_idc_get_type_ids 200 type1 type2 type4 type6 +ics_api_idc_get_type 404 test-type -ecs_api_edp_get_type_ids 200 type1 type2 type4 type6 -ecs_api_edp_get_type_2 404 test-type +ics_api_edp_get_type_ids 200 type1 type2 type4 type6 +ics_api_edp_get_type_2 404 test-type -ecs_api_edp_get_producer_ids_2 200 NOTYPE prod-b prod-c prod-d prod-e -ecs_api_edp_get_producer_2 404 test-prod -ecs_api_edp_get_producer_status 404 test-prod +ics_api_edp_get_producer_ids_2 200 NOTYPE prod-b prod-c prod-d prod-e +ics_api_edp_get_producer_2 404 test-prod +ics_api_edp_get_producer_status 404 test-prod -ecs_api_edp_delete_producer 404 test-prod +ics_api_edp_delete_producer 404 test-prod -ecs_api_idc_get_job_ids 200 test-type NOWNER EMPTY -ecs_api_idc_get_job_ids 200 test-type test-owner EMPTY +ics_api_idc_get_job_ids 200 test-type NOWNER EMPTY +ics_api_idc_get_job_ids 200 test-type test-owner EMPTY -ecs_api_idc_get_job 404 test-job +ics_api_idc_get_job 404 test-job -ecs_api_idc_get_job_status2 404 test-job +ics_api_idc_get_job_status2 404 test-job -ecs_api_idc_delete_job 404 test-job +ics_api_idc_delete_job 404 test-job -ecs_api_edp_get_producer_jobs_2 404 test-prod +ics_api_edp_get_producer_jobs_2 404 test-prod -ecs_api_edp_get_type_2 404 test-type -ecs_api_edp_delete_type_2 404 test-type +ics_api_edp_get_type_2 404 test-type +ics_api_edp_delete_type_2 404 test-type ### Setup of producer/job and testing apis ### ## Setup prod-ia -ecs_api_edp_get_type_ids 200 type1 type2 type4 type6 -ecs_api_edp_get_type_2 404 type101 -ecs_api_edp_put_producer_2 404 prod-ia $CB_JOB/prod-ia $CB_SV/prod-ia type101 +ics_api_edp_get_type_ids 200 type1 type2 type4 type6 +ics_api_edp_get_type_2 404 type101 +ics_api_edp_put_producer_2 404 prod-ia $CB_JOB/prod-ia $CB_SV/prod-ia type101 # Create type, delete and create again -ecs_api_edp_put_type_2 201 type101 testdata/ecs/info-type-1.json -ecs_api_edp_get_type_2 200 type101 -ecs_api_edp_get_type_ids 200 type101 type1 type2 type4 type6 -ecs_api_edp_delete_type_2 204 type101 -ecs_api_edp_get_type_2 404 type101 -ecs_api_edp_get_type_ids 200 type1 type2 type4 type6 -ecs_api_edp_put_type_2 201 type101 testdata/ecs/info-type-1.json -ecs_api_edp_get_type_ids 200 type101 type1 type2 type4 type6 -ecs_api_edp_get_type_2 200 type101 testdata/ecs/info-type-1.json - -ecs_api_edp_put_producer_2 201 prod-ia $CB_JOB/prod-ia $CB_SV/prod-ia type101 -ecs_api_edp_put_producer_2 200 prod-ia $CB_JOB/prod-ia $CB_SV/prod-ia type101 - -ecs_api_edp_delete_type_2 406 type101 - -if [[ "$ECS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then +ics_api_edp_put_type_2 201 type101 testdata/ics/info-type-1.json +ics_api_edp_get_type_2 200 type101 +ics_api_edp_get_type_ids 200 type101 type1 type2 type4 type6 +ics_api_edp_delete_type_2 204 type101 +ics_api_edp_get_type_2 404 type101 +ics_api_edp_get_type_ids 200 type1 type2 type4 type6 +ics_api_edp_put_type_2 201 type101 testdata/ics/info-type-1.json +ics_api_edp_get_type_ids 200 type101 type1 type2 type4 type6 +ics_api_edp_get_type_2 200 type101 testdata/ics/info-type-1.json + +ics_api_edp_put_producer_2 201 prod-ia $CB_JOB/prod-ia $CB_SV/prod-ia type101 +ics_api_edp_put_producer_2 200 prod-ia $CB_JOB/prod-ia $CB_SV/prod-ia type101 + +if [[ "$ICS_FEATURE_LEVEL" == *"RESP_CODE_CHANGE_1" ]]; then + ics_api_edp_delete_type_2 409 type101 +else + ics_api_edp_delete_type_2 406 type101 +fi + +if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then cr_equal 0 received_callbacks 17 30 cr_equal 0 received_callbacks?id=type-status1 11 - cr_api_check_all_ecs_subscription_events 200 0 type-status1 type101 testdata/ecs/info-type-1.json REGISTERED type101 testdata/ecs/info-type-1.json DEREGISTERED type101 testdata/ecs/info-type-1.json REGISTERED + cr_api_check_all_ics_subscription_events 200 0 type-status1 type101 testdata/ics/info-type-1.json REGISTERED type101 testdata/ics/info-type-1.json DEREGISTERED type101 testdata/ics/info-type-1.json REGISTERED else cr_equal 0 received_callbacks 6 fi -ecs_api_edp_get_type_ids 200 type101 type1 type2 type4 type6 -ecs_api_edp_get_type_2 200 type101 testdata/ecs/info-type-1.json +ics_api_edp_get_type_ids 200 type101 type1 type2 type4 type6 +ics_api_edp_get_type_2 200 type101 testdata/ics/info-type-1.json -ecs_api_edp_get_producer_ids_2 200 NOTYPE prod-ia prod-b prod-c prod-d prod-e -ecs_api_edp_get_producer_ids_2 200 type101 prod-ia -ecs_api_edp_get_producer_ids_2 200 type102 EMPTY +ics_api_edp_get_producer_ids_2 200 NOTYPE prod-ia prod-b prod-c prod-d prod-e +ics_api_edp_get_producer_ids_2 200 type101 prod-ia +ics_api_edp_get_producer_ids_2 200 type102 EMPTY -ecs_api_edp_get_producer_2 200 prod-ia $CB_JOB/prod-ia $CB_SV/prod-ia type101 +ics_api_edp_get_producer_2 200 prod-ia $CB_JOB/prod-ia $CB_SV/prod-ia type101 -ecs_api_edp_get_producer_status 200 prod-ia ENABLED +ics_api_edp_get_producer_status 200 prod-ia ENABLED -ecs_api_idc_get_job_ids 200 type101 NOWNER EMPTY -ecs_api_idc_get_job_ids 200 type101 test-owner EMPTY +ics_api_idc_get_job_ids 200 type101 NOWNER EMPTY +ics_api_idc_get_job_ids 200 type101 test-owner EMPTY -ecs_api_idc_get_job 404 test-job +ics_api_idc_get_job 404 test-job -ecs_api_idc_get_job_status2 404 test-job -ecs_api_edp_get_producer_jobs_2 200 prod-ia EMPTY +ics_api_idc_get_job_status2 404 test-job +ics_api_edp_get_producer_jobs_2 200 prod-ia EMPTY ## Create a job for prod-ia ## job101 - prod-ia -ecs_api_idc_put_job 201 job101 type101 $TARGET101 info-owner-1 $INFOSTATUS101 testdata/ecs/job-template.json VALIDATE +ics_api_idc_put_job 201 job101 type101 $TARGET101 info-owner-1 $INFOSTATUS101 testdata/ics/job-template.json VALIDATE # Check the job data in the producer -prodstub_check_jobdata_3 200 prod-ia job101 type101 $TARGET101 info-owner-1 testdata/ecs/job-template.json +prodstub_check_jobdata_3 200 prod-ia job101 type101 $TARGET101 info-owner-1 testdata/ics/job-template.json -ecs_api_idc_get_job_ids 200 type101 NOWNER job101 -ecs_api_idc_get_job_ids 200 type101 info-owner-1 job101 +ics_api_idc_get_job_ids 200 type101 NOWNER job101 +ics_api_idc_get_job_ids 200 type101 info-owner-1 job101 -ecs_api_idc_get_job_ids 200 NOTYPE NOWNER job101 job1 job2 job3 job8 job10 +ics_api_idc_get_job_ids 200 NOTYPE NOWNER job101 job1 job2 job3 job8 job10 -ecs_api_idc_get_job 200 job101 type101 $TARGET101 info-owner-1 $INFOSTATUS101 testdata/ecs/job-template.json +ics_api_idc_get_job 200 job101 type101 $TARGET101 info-owner-1 $INFOSTATUS101 testdata/ics/job-template.json -ecs_api_idc_get_job_status2 200 job101 ENABLED 1 prod-ia +ics_api_idc_get_job_status2 200 job101 ENABLED 1 prod-ia prodstub_equal create/prod-ia/job101 1 -ecs_api_edp_get_producer_jobs_2 200 prod-ia job101 type101 $TARGET101 info-owner-1 testdata/ecs/job-template.json +ics_api_edp_get_producer_jobs_2 200 prod-ia job101 type101 $TARGET101 info-owner-1 testdata/ics/job-template.json ## Create a second job for prod-ia ## job102 - prod-ia -ecs_api_idc_put_job 201 job102 type101 $TARGET102 info-owner-2 $INFOSTATUS102 testdata/ecs/job-template.json VALIDATE +ics_api_idc_put_job 201 job102 type101 $TARGET102 info-owner-2 $INFOSTATUS102 testdata/ics/job-template.json VALIDATE # Check the job data in the producer -prodstub_check_jobdata_3 200 prod-ia job102 type101 $TARGET102 info-owner-2 testdata/ecs/job-template.json -ecs_api_idc_get_job_ids 200 type101 NOWNER job101 job102 -ecs_api_idc_get_job_ids 200 type101 info-owner-1 job101 -ecs_api_idc_get_job_ids 200 type101 info-owner-2 job102 -ecs_api_idc_get_job_ids 200 NOTYPE NOWNER job101 job102 job1 job2 job3 job8 job10 +prodstub_check_jobdata_3 200 prod-ia job102 type101 $TARGET102 info-owner-2 testdata/ics/job-template.json +ics_api_idc_get_job_ids 200 type101 NOWNER job101 job102 +ics_api_idc_get_job_ids 200 type101 info-owner-1 job101 +ics_api_idc_get_job_ids 200 type101 info-owner-2 job102 +ics_api_idc_get_job_ids 200 NOTYPE NOWNER job101 job102 job1 job2 job3 job8 job10 -ecs_api_idc_get_job 200 job102 type101 $TARGET102 info-owner-2 $INFOSTATUS102 testdata/ecs/job-template.json +ics_api_idc_get_job 200 job102 type101 $TARGET102 info-owner-2 $INFOSTATUS102 testdata/ics/job-template.json -ecs_api_idc_get_job_status2 200 job102 ENABLED 1 prod-ia +ics_api_idc_get_job_status2 200 job102 ENABLED 1 prod-ia prodstub_equal create/prod-ia/job102 1 -ecs_api_edp_get_producer_jobs_2 200 prod-ia job101 type101 $TARGET101 info-owner-1 testdata/ecs/job-template.json job102 type101 $TARGET102 info-owner-2 testdata/ecs/job-template.json +ics_api_edp_get_producer_jobs_2 200 prod-ia job101 type101 $TARGET101 info-owner-1 testdata/ics/job-template.json job102 type101 $TARGET102 info-owner-2 testdata/ics/job-template.json ## Setup prod-ib -ecs_api_edp_put_type_2 201 type102 testdata/ecs/info-type-2.json -ecs_api_edp_put_producer_2 201 prod-ib $CB_JOB/prod-ib $CB_SV/prod-ib type102 +ics_api_edp_put_type_2 201 type102 testdata/ics/info-type-2.json +ics_api_edp_put_producer_2 201 prod-ib $CB_JOB/prod-ib $CB_SV/prod-ib type102 -if [[ "$ECS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then +if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then cr_equal 0 received_callbacks 18 30 cr_equal 0 received_callbacks?id=type-status1 12 - cr_api_check_all_ecs_subscription_events 200 0 type-status1 type102 testdata/ecs/info-type-2.json REGISTERED + cr_api_check_all_ics_subscription_events 200 0 type-status1 type102 testdata/ics/info-type-2.json REGISTERED else cr_equal 0 received_callbacks 6 fi -ecs_api_idc_get_type_ids 200 type101 type102 type1 type2 type4 type6 +ics_api_idc_get_type_ids 200 type101 type102 type1 type2 type4 type6 -if [[ "$ECS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then - ecs_api_idc_get_type 200 type101 testdata/ecs/info-type-1.json ENABLED 1 +if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then + ics_api_idc_get_type 200 type101 testdata/ics/info-type-1.json ENABLED 1 - ecs_api_idc_get_type 200 type102 testdata/ecs/info-type-2.json ENABLED 1 + ics_api_idc_get_type 200 type102 testdata/ics/info-type-2.json ENABLED 1 else - ecs_api_idc_get_type 200 type101 testdata/ecs/info-type-1.json + ics_api_idc_get_type 200 type101 testdata/ics/info-type-1.json - ecs_api_idc_get_type 200 type102 testdata/ecs/info-type-2.json + ics_api_idc_get_type 200 type102 testdata/ics/info-type-2.json fi -ecs_api_edp_get_type_ids 200 type101 type102 type1 type2 type4 type6 -ecs_api_edp_get_type_2 200 type101 testdata/ecs/info-type-1.json -ecs_api_edp_get_type_2 200 type102 testdata/ecs/info-type-2.json +ics_api_edp_get_type_ids 200 type101 type102 type1 type2 type4 type6 +ics_api_edp_get_type_2 200 type101 testdata/ics/info-type-1.json +ics_api_edp_get_type_2 200 type102 testdata/ics/info-type-2.json -ecs_api_edp_get_producer_ids_2 200 NOTYPE prod-ia prod-ib prod-b prod-c prod-d prod-e +ics_api_edp_get_producer_ids_2 200 NOTYPE prod-ia prod-ib prod-b prod-c prod-d prod-e -ecs_api_edp_get_producer_2 200 prod-ia $CB_JOB/prod-ia $CB_SV/prod-ia type101 -ecs_api_edp_get_producer_2 200 prod-ib $CB_JOB/prod-ib $CB_SV/prod-ib type102 +ics_api_edp_get_producer_2 200 prod-ia $CB_JOB/prod-ia $CB_SV/prod-ia type101 +ics_api_edp_get_producer_2 200 prod-ib $CB_JOB/prod-ib $CB_SV/prod-ib type102 -ecs_api_edp_get_producer_status 200 prod-ib ENABLED +ics_api_edp_get_producer_status 200 prod-ib ENABLED ## Create job for prod-ib ## job103 - prod-ib -ecs_api_idc_put_job 201 job103 type102 $TARGET103 info-owner-3 $INFOSTATUS103 testdata/ecs/job-template.json VALIDATE +ics_api_idc_put_job 201 job103 type102 $TARGET103 info-owner-3 $INFOSTATUS103 testdata/ics/job-template.json VALIDATE prodstub_equal create/prod-ib/job103 1 # Check the job data in the producer -prodstub_check_jobdata_3 200 prod-ib job103 type102 $TARGET103 info-owner-3 testdata/ecs/job-template.json +prodstub_check_jobdata_3 200 prod-ib job103 type102 $TARGET103 info-owner-3 testdata/ics/job-template.json -ecs_api_idc_get_job_ids 200 type101 NOWNER job101 job102 -ecs_api_idc_get_job_ids 200 type102 NOWNER job103 -ecs_api_idc_get_job_ids 200 type101 info-owner-1 job101 -ecs_api_idc_get_job_ids 200 type101 info-owner-2 job102 -ecs_api_idc_get_job_ids 200 type102 info-owner-3 job103 +ics_api_idc_get_job_ids 200 type101 NOWNER job101 job102 +ics_api_idc_get_job_ids 200 type102 NOWNER job103 +ics_api_idc_get_job_ids 200 type101 info-owner-1 job101 +ics_api_idc_get_job_ids 200 type101 info-owner-2 job102 +ics_api_idc_get_job_ids 200 type102 info-owner-3 job103 -ecs_api_idc_get_job 200 job103 type102 $TARGET103 info-owner-3 $INFOSTATUS103 testdata/ecs/job-template.json +ics_api_idc_get_job 200 job103 type102 $TARGET103 info-owner-3 $INFOSTATUS103 testdata/ics/job-template.json -ecs_api_idc_get_job_status2 200 job103 ENABLED 1 prod-ib +ics_api_idc_get_job_status2 200 job103 ENABLED 1 prod-ib -ecs_api_edp_get_producer_jobs_2 200 prod-ia job101 type101 $TARGET101 info-owner-1 testdata/ecs/job-template.json job102 type101 $TARGET102 info-owner-2 testdata/ecs/job-template.json -ecs_api_edp_get_producer_jobs_2 200 prod-ib job103 type102 $TARGET103 info-owner-3 testdata/ecs/job-template.json +ics_api_edp_get_producer_jobs_2 200 prod-ia job101 type101 $TARGET101 info-owner-1 testdata/ics/job-template.json job102 type101 $TARGET102 info-owner-2 testdata/ics/job-template.json +ics_api_edp_get_producer_jobs_2 200 prod-ib job103 type102 $TARGET103 info-owner-3 testdata/ics/job-template.json ## Setup prod-ic (no types) -ecs_api_edp_put_producer_2 201 prod-ic $CB_JOB/prod-ic $CB_SV/prod-ic NOTYPE +ics_api_edp_put_producer_2 201 prod-ic $CB_JOB/prod-ic $CB_SV/prod-ic NOTYPE -ecs_api_edp_get_producer_ids_2 200 NOTYPE prod-ia prod-ib prod-ic prod-b prod-c prod-d prod-e +ics_api_edp_get_producer_ids_2 200 NOTYPE prod-ia prod-ib prod-ic prod-b prod-c prod-d prod-e -ecs_api_edp_get_producer_2 200 prod-ia $CB_JOB/prod-ia $CB_SV/prod-ia type101 -ecs_api_edp_get_producer_2 200 prod-ib $CB_JOB/prod-ib $CB_SV/prod-ib type102 -ecs_api_edp_get_producer_2 200 prod-ic $CB_JOB/prod-ic $CB_SV/prod-ic EMPTY +ics_api_edp_get_producer_2 200 prod-ia $CB_JOB/prod-ia $CB_SV/prod-ia type101 +ics_api_edp_get_producer_2 200 prod-ib $CB_JOB/prod-ib $CB_SV/prod-ib type102 +ics_api_edp_get_producer_2 200 prod-ic $CB_JOB/prod-ic $CB_SV/prod-ic EMPTY -ecs_api_edp_get_producer_status 200 prod-ic ENABLED +ics_api_edp_get_producer_status 200 prod-ic ENABLED ## Delete job103 and prod-ib and re-create if different order # Delete job then producer -ecs_api_idc_get_job_ids 200 NOTYPE NOWNER job101 job102 job103 job1 job2 job3 job8 job10 -ecs_api_edp_get_producer_ids_2 200 NOTYPE prod-ia prod-ib prod-ic prod-b prod-c prod-d prod-e +ics_api_idc_get_job_ids 200 NOTYPE NOWNER job101 job102 job103 job1 job2 job3 job8 job10 +ics_api_edp_get_producer_ids_2 200 NOTYPE prod-ia prod-ib prod-ic prod-b prod-c prod-d prod-e -ecs_api_idc_delete_job 204 job103 +ics_api_idc_delete_job 204 job103 -ecs_api_idc_get_job_ids 200 NOTYPE NOWNER job101 job102 job1 job2 job3 job8 job10 -ecs_api_edp_get_producer_ids_2 200 NOTYPE prod-ia prod-ib prod-ic prod-b prod-c prod-d prod-e +ics_api_idc_get_job_ids 200 NOTYPE NOWNER job101 job102 job1 job2 job3 job8 job10 +ics_api_edp_get_producer_ids_2 200 NOTYPE prod-ia prod-ib prod-ic prod-b prod-c prod-d prod-e -ecs_api_edp_delete_producer 204 prod-ib +ics_api_edp_delete_producer 204 prod-ib -ecs_api_edp_get_producer_status 404 prod-ib +ics_api_edp_get_producer_status 404 prod-ib -ecs_api_idc_get_job_ids 200 NOTYPE NOWNER job101 job102 job1 job2 job3 job8 job10 -ecs_api_edp_get_producer_ids_2 200 NOTYPE prod-ia prod-ic prod-b prod-c prod-d prod-e +ics_api_idc_get_job_ids 200 NOTYPE NOWNER job101 job102 job1 job2 job3 job8 job10 +ics_api_edp_get_producer_ids_2 200 NOTYPE prod-ia prod-ic prod-b prod-c prod-d prod-e prodstub_equal delete/prod-ib/job103 1 -ecs_api_idc_put_job 201 job103 type102 $TARGET103 info-owner-3 $INFOSTATUS103 testdata/ecs/job-template.json VALIDATE -ecs_api_idc_get_job_status2 200 job103 DISABLED EMPTYPROD +ics_api_idc_put_job 201 job103 type102 $TARGET103 info-owner-3 $INFOSTATUS103 testdata/ics/job-template.json VALIDATE +ics_api_idc_get_job_status2 200 job103 DISABLED EMPTYPROD # Put producer then job -ecs_api_edp_put_producer_2 201 prod-ib $CB_JOB/prod-ib $CB_SV/prod-ib type102 +ics_api_edp_put_producer_2 201 prod-ib $CB_JOB/prod-ib $CB_SV/prod-ib type102 -ecs_api_edp_get_producer_status 200 prod-ib ENABLED +ics_api_edp_get_producer_status 200 prod-ib ENABLED -ecs_api_idc_put_job 200 job103 type102 $TARGET103 info-owner-3 $INFOSTATUS103 testdata/ecs/job-template2.json VALIDATE -ecs_api_idc_get_job_status2 200 job103 ENABLED 1 prod-ib +ics_api_idc_put_job 200 job103 type102 $TARGET103 info-owner-3 $INFOSTATUS103 testdata/ics/job-template2.json VALIDATE +ics_api_idc_get_job_status2 200 job103 ENABLED 1 prod-ib -prodstub_check_jobdata_3 200 prod-ib job103 type102 $TARGET103 info-owner-3 testdata/ecs/job-template2.json +prodstub_check_jobdata_3 200 prod-ib job103 type102 $TARGET103 info-owner-3 testdata/ics/job-template2.json -ecs_api_idc_get_job_ids 200 NOTYPE NOWNER job101 job102 job103 job1 job2 job3 job8 job10 -ecs_api_edp_get_producer_ids_2 200 NOTYPE prod-ia prod-ib prod-ic prod-b prod-c prod-d prod-e +ics_api_idc_get_job_ids 200 NOTYPE NOWNER job101 job102 job103 job1 job2 job3 job8 job10 +ics_api_edp_get_producer_ids_2 200 NOTYPE prod-ia prod-ib prod-ic prod-b prod-c prod-d prod-e prodstub_equal create/prod-ib/job103 3 prodstub_equal delete/prod-ib/job103 1 # Delete only the producer -ecs_api_edp_delete_producer 204 prod-ib +ics_api_edp_delete_producer 204 prod-ib -ecs_api_edp_get_producer_status 404 prod-ib +ics_api_edp_get_producer_status 404 prod-ib -ecs_api_idc_get_job_ids 200 NOTYPE NOWNER job101 job102 job103 job1 job2 job3 job8 job10 -ecs_api_edp_get_producer_ids_2 200 NOTYPE prod-ia prod-ic prod-b prod-c prod-d prod-e +ics_api_idc_get_job_ids 200 NOTYPE NOWNER job101 job102 job103 job1 job2 job3 job8 job10 +ics_api_edp_get_producer_ids_2 200 NOTYPE prod-ia prod-ic prod-b prod-c prod-d prod-e -ecs_api_idc_get_job_status2 200 job103 DISABLED EMPTYPROD +ics_api_idc_get_job_status2 200 job103 DISABLED EMPTYPROD -if [[ "$ECS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then +if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then cr_equal 0 received_callbacks 19 30 cr_equal 0 received_callbacks?id=info-job103-status 1 - cr_api_check_all_ecs_events 200 0 info-job103-status DISABLED + cr_api_check_all_ics_events 200 0 info-job103-status DISABLED else cr_equal 0 received_callbacks 7 30 cr_equal 0 received_callbacks?id=info-job103-status 1 - cr_api_check_all_ecs_events 200 0 info-job103-status DISABLED + cr_api_check_all_ics_events 200 0 info-job103-status DISABLED fi # Re-create the producer -ecs_api_edp_put_producer_2 201 prod-ib $CB_JOB/prod-ib $CB_SV/prod-ib type102 +ics_api_edp_put_producer_2 201 prod-ib $CB_JOB/prod-ib $CB_SV/prod-ib type102 -ecs_api_edp_get_producer_status 200 prod-ib ENABLED +ics_api_edp_get_producer_status 200 prod-ib ENABLED -ecs_api_idc_get_job_status2 200 job103 ENABLED 1 prod-ib +ics_api_idc_get_job_status2 200 job103 ENABLED 1 prod-ib -if [[ "$ECS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then +if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then cr_equal 0 received_callbacks 20 30 cr_equal 0 received_callbacks?id=info-job103-status 2 - cr_api_check_all_ecs_events 200 0 info-job103-status ENABLED + cr_api_check_all_ics_events 200 0 info-job103-status ENABLED else cr_equal 0 received_callbacks 8 30 cr_equal 0 received_callbacks?id=info-job103-status 2 - cr_api_check_all_ecs_events 200 0 info-job103-status ENABLED + cr_api_check_all_ics_events 200 0 info-job103-status ENABLED fi -prodstub_check_jobdata_3 200 prod-ib job103 type102 $TARGET103 info-owner-3 testdata/ecs/job-template2.json +prodstub_check_jobdata_3 200 prod-ib job103 type102 $TARGET103 info-owner-3 testdata/ics/job-template2.json ## Setup prod-id -ecs_api_edp_put_type_2 201 type104 testdata/ecs/info-type-4.json -ecs_api_edp_put_producer_2 201 prod-id $CB_JOB/prod-id $CB_SV/prod-id type104 +ics_api_edp_put_type_2 201 type104 testdata/ics/info-type-4.json +ics_api_edp_put_producer_2 201 prod-id $CB_JOB/prod-id $CB_SV/prod-id type104 -ecs_api_idc_get_job_ids 200 type104 NOWNER EMPTY +ics_api_idc_get_job_ids 200 type104 NOWNER EMPTY -ecs_api_idc_put_job 201 job108 type104 $TARGET108 info-owner-4 $INFOSTATUS108 testdata/ecs/job-template.json VALIDATE +ics_api_idc_put_job 201 job108 type104 $TARGET108 info-owner-4 $INFOSTATUS108 testdata/ics/job-template.json VALIDATE -prodstub_check_jobdata_3 200 prod-id job108 type104 $TARGET108 info-owner-4 testdata/ecs/job-template.json +prodstub_check_jobdata_3 200 prod-id job108 type104 $TARGET108 info-owner-4 testdata/ics/job-template.json prodstub_equal create/prod-id/job108 1 prodstub_equal delete/prod-id/job108 0 -ecs_api_idc_get_job_ids 200 type104 NOWNER job108 +ics_api_idc_get_job_ids 200 type104 NOWNER job108 -ecs_api_idc_get_job_status2 200 job108 ENABLED 1 prod-id +ics_api_idc_get_job_status2 200 job108 ENABLED 1 prod-id # Re-PUT the producer with zero types -ecs_api_edp_put_producer_2 200 prod-id $CB_JOB/prod-id $CB_SV/prod-id NOTYPE +ics_api_edp_put_producer_2 200 prod-id $CB_JOB/prod-id $CB_SV/prod-id NOTYPE -ecs_api_idc_get_job_ids 200 type104 NOWNER job108 -ecs_api_idc_get_job_ids 200 NOTYPE NOWNER job101 job102 job103 job108 job1 job2 job3 job8 job10 +ics_api_idc_get_job_ids 200 type104 NOWNER job108 +ics_api_idc_get_job_ids 200 NOTYPE NOWNER job101 job102 job103 job108 job1 job2 job3 job8 job10 -ecs_api_idc_get_job_status2 200 job108 DISABLED EMPTYPROD +ics_api_idc_get_job_status2 200 job108 DISABLED EMPTYPROD -if [[ "$ECS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then +if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then cr_equal 0 received_callbacks 22 30 cr_equal 0 received_callbacks?id=type-status1 13 - cr_api_check_all_ecs_subscription_events 200 0 type-status1 type104 testdata/ecs/info-type-4.json REGISTERED + cr_api_check_all_ics_subscription_events 200 0 type-status1 type104 testdata/ics/info-type-4.json REGISTERED cr_equal 0 received_callbacks?id=info-job108-status 1 - cr_api_check_all_ecs_events 200 0 info-job108-status DISABLED + cr_api_check_all_ics_events 200 0 info-job108-status DISABLED else cr_equal 0 received_callbacks 9 30 cr_equal 0 received_callbacks?id=info-job108-status 1 - cr_api_check_all_ecs_events 200 0 info-job108-status DISABLED + cr_api_check_all_ics_events 200 0 info-job108-status DISABLED fi prodstub_equal create/prod-id/job108 1 prodstub_equal delete/prod-id/job108 0 ## Re-setup prod-id -ecs_api_edp_put_type_2 200 type104 testdata/ecs/info-type-4.json -ecs_api_edp_put_producer_2 200 prod-id $CB_JOB/prod-id $CB_SV/prod-id type104 +ics_api_edp_put_type_2 200 type104 testdata/ics/info-type-4.json +ics_api_edp_put_producer_2 200 prod-id $CB_JOB/prod-id $CB_SV/prod-id type104 -ecs_api_idc_get_job_ids 200 type104 NOWNER job108 -ecs_api_idc_get_job_ids 200 NOTYPE NOWNER job101 job102 job103 job108 job1 job2 job3 job8 job10 +ics_api_idc_get_job_ids 200 type104 NOWNER job108 +ics_api_idc_get_job_ids 200 NOTYPE NOWNER job101 job102 job103 job108 job1 job2 job3 job8 job10 -ecs_api_idc_get_job_status2 200 job108 ENABLED 1 prod-id +ics_api_idc_get_job_status2 200 job108 ENABLED 1 prod-id -ecs_api_edp_get_producer_status 200 prod-ia ENABLED -ecs_api_edp_get_producer_status 200 prod-ib ENABLED -ecs_api_edp_get_producer_status 200 prod-ic ENABLED -ecs_api_edp_get_producer_status 200 prod-id ENABLED +ics_api_edp_get_producer_status 200 prod-ia ENABLED +ics_api_edp_get_producer_status 200 prod-ib ENABLED +ics_api_edp_get_producer_status 200 prod-ic ENABLED +ics_api_edp_get_producer_status 200 prod-id ENABLED -if [[ "$ECS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then +if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then cr_equal 0 received_callbacks 24 30 cr_equal 0 received_callbacks?id=type-status1 14 - cr_api_check_all_ecs_subscription_events 200 0 type-status1 type104 testdata/ecs/info-type-4.json REGISTERED + cr_api_check_all_ics_subscription_events 200 0 type-status1 type104 testdata/ics/info-type-4.json REGISTERED cr_equal 0 received_callbacks?id=info-job108-status 2 - cr_api_check_all_ecs_events 200 0 info-job108-status ENABLED + cr_api_check_all_ics_events 200 0 info-job108-status ENABLED else cr_equal 0 received_callbacks 10 30 cr_equal 0 received_callbacks?id=info-job108-status 2 - cr_api_check_all_ecs_events 200 0 info-job108-status ENABLED + cr_api_check_all_ics_events 200 0 info-job108-status ENABLED fi prodstub_equal create/prod-id/job108 2 @@ -1659,296 +1663,296 @@ prodstub_equal delete/prod-id/job108 0 ## Setup prod-ie -ecs_api_edp_put_type_2 201 type106 testdata/ecs/info-type-6.json -ecs_api_edp_put_producer_2 201 prod-ie $CB_JOB/prod-ie $CB_SV/prod-ie type106 +ics_api_edp_put_type_2 201 type106 testdata/ics/info-type-6.json +ics_api_edp_put_producer_2 201 prod-ie $CB_JOB/prod-ie $CB_SV/prod-ie type106 -ecs_api_idc_get_job_ids 200 type106 NOWNER EMPTY +ics_api_idc_get_job_ids 200 type106 NOWNER EMPTY -ecs_api_idc_put_job 201 job110 type106 $TARGET110 info-owner-4 $INFOSTATUS110 testdata/ecs/job-template.json VALIDATE +ics_api_idc_put_job 201 job110 type106 $TARGET110 info-owner-4 $INFOSTATUS110 testdata/ics/job-template.json VALIDATE -prodstub_check_jobdata_3 200 prod-ie job110 type106 $TARGET110 info-owner-4 testdata/ecs/job-template.json +prodstub_check_jobdata_3 200 prod-ie job110 type106 $TARGET110 info-owner-4 testdata/ics/job-template.json prodstub_equal create/prod-ie/job110 1 prodstub_equal delete/prod-ie/job110 0 -ecs_api_idc_get_job_ids 200 type106 NOWNER job110 +ics_api_idc_get_job_ids 200 type106 NOWNER job110 -ecs_api_idc_get_job_status2 200 job110 ENABLED 1 prod-ie +ics_api_idc_get_job_status2 200 job110 ENABLED 1 prod-ie ## Setup prod-if -ecs_api_edp_put_type_2 200 type106 testdata/ecs/info-type-6.json -ecs_api_edp_put_producer_2 201 prod-if $CB_JOB/prod-if $CB_SV/prod-if type106 +ics_api_edp_put_type_2 200 type106 testdata/ics/info-type-6.json +ics_api_edp_put_producer_2 201 prod-if $CB_JOB/prod-if $CB_SV/prod-if type106 -if [[ "$ECS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then +if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then cr_equal 0 received_callbacks 26 30 cr_equal 0 received_callbacks?id=type-status1 16 - cr_api_check_all_ecs_subscription_events 200 0 type-status1 type106 testdata/ecs/info-type-6.json REGISTERED type106 testdata/ecs/info-type-6.json REGISTERED + cr_api_check_all_ics_subscription_events 200 0 type-status1 type106 testdata/ics/info-type-6.json REGISTERED type106 testdata/ics/info-type-6.json REGISTERED fi -ecs_api_idc_get_job_ids 200 type106 NOWNER job110 +ics_api_idc_get_job_ids 200 type106 NOWNER job110 -prodstub_check_jobdata_3 200 prod-if job110 type106 $TARGET110 info-owner-4 testdata/ecs/job-template.json +prodstub_check_jobdata_3 200 prod-if job110 type106 $TARGET110 info-owner-4 testdata/ics/job-template.json prodstub_equal create/prod-if/job110 1 prodstub_equal delete/prod-if/job110 0 -ecs_api_idc_get_job_ids 200 type106 NOWNER job110 +ics_api_idc_get_job_ids 200 type106 NOWNER job110 -ecs_api_idc_get_job_status2 200 job110 ENABLED 2 prod-ie prod-if +ics_api_idc_get_job_status2 200 job110 ENABLED 2 prod-ie prod-if ## Status updates prod-ia and jobs -ecs_api_edp_get_producer_ids_2 200 NOTYPE prod-ia prod-ib prod-ic prod-id prod-ie prod-if prod-b prod-c prod-d prod-e +ics_api_edp_get_producer_ids_2 200 NOTYPE prod-ia prod-ib prod-ic prod-id prod-ie prod-if prod-b prod-c prod-d prod-e -ecs_api_edp_get_producer_status 200 prod-ia ENABLED -ecs_api_edp_get_producer_status 200 prod-ib ENABLED -ecs_api_edp_get_producer_status 200 prod-ic ENABLED -ecs_api_edp_get_producer_status 200 prod-id ENABLED -ecs_api_edp_get_producer_status 200 prod-ie ENABLED -ecs_api_edp_get_producer_status 200 prod-if ENABLED +ics_api_edp_get_producer_status 200 prod-ia ENABLED +ics_api_edp_get_producer_status 200 prod-ib ENABLED +ics_api_edp_get_producer_status 200 prod-ic ENABLED +ics_api_edp_get_producer_status 200 prod-id ENABLED +ics_api_edp_get_producer_status 200 prod-ie ENABLED +ics_api_edp_get_producer_status 200 prod-if ENABLED # Arm producer prod-ia for supervision failure prodstub_arm_producer 200 prod-ia 400 # Wait for producer prod-ia to go disabled -ecs_api_edp_get_producer_status 200 prod-ia DISABLED 360 +ics_api_edp_get_producer_status 200 prod-ia DISABLED 360 -ecs_api_edp_get_producer_ids_2 200 NOTYPE prod-ia prod-ib prod-ic prod-id prod-ie prod-if prod-b prod-c prod-d prod-e +ics_api_edp_get_producer_ids_2 200 NOTYPE prod-ia prod-ib prod-ic prod-id prod-ie prod-if prod-b prod-c prod-d prod-e -ecs_api_edp_get_producer_status 200 prod-ia DISABLED -ecs_api_edp_get_producer_status 200 prod-ib ENABLED -ecs_api_edp_get_producer_status 200 prod-ic ENABLED -ecs_api_edp_get_producer_status 200 prod-id ENABLED -ecs_api_edp_get_producer_status 200 prod-ie ENABLED -ecs_api_edp_get_producer_status 200 prod-if ENABLED +ics_api_edp_get_producer_status 200 prod-ia DISABLED +ics_api_edp_get_producer_status 200 prod-ib ENABLED +ics_api_edp_get_producer_status 200 prod-ic ENABLED +ics_api_edp_get_producer_status 200 prod-id ENABLED +ics_api_edp_get_producer_status 200 prod-ie ENABLED +ics_api_edp_get_producer_status 200 prod-if ENABLED -ecs_api_idc_get_job_status2 200 job101 ENABLED 1 prod-ia -ecs_api_idc_get_job_status2 200 job102 ENABLED 1 prod-ia -ecs_api_idc_get_job_status2 200 job103 ENABLED 1 prod-ib -ecs_api_idc_get_job_status2 200 job108 ENABLED 1 prod-id -ecs_api_idc_get_job_status2 200 job110 ENABLED 2 prod-ie prod-if +ics_api_idc_get_job_status2 200 job101 ENABLED 1 prod-ia +ics_api_idc_get_job_status2 200 job102 ENABLED 1 prod-ia +ics_api_idc_get_job_status2 200 job103 ENABLED 1 prod-ib +ics_api_idc_get_job_status2 200 job108 ENABLED 1 prod-id +ics_api_idc_get_job_status2 200 job110 ENABLED 2 prod-ie prod-if # Arm producer prod-ia for supervision prodstub_arm_producer 200 prod-ia 200 # Wait for producer prod-ia to go enabled -ecs_api_edp_get_producer_status 200 prod-ia ENABLED 360 +ics_api_edp_get_producer_status 200 prod-ia ENABLED 360 -ecs_api_edp_get_producer_ids_2 200 NOTYPE prod-ia prod-ib prod-ic prod-id prod-ie prod-if prod-b prod-c prod-d prod-e +ics_api_edp_get_producer_ids_2 200 NOTYPE prod-ia prod-ib prod-ic prod-id prod-ie prod-if prod-b prod-c prod-d prod-e -ecs_api_edp_get_producer_status 200 prod-ia ENABLED -ecs_api_edp_get_producer_status 200 prod-ib ENABLED -ecs_api_edp_get_producer_status 200 prod-ic ENABLED -ecs_api_edp_get_producer_status 200 prod-id ENABLED -ecs_api_edp_get_producer_status 200 prod-ie ENABLED -ecs_api_edp_get_producer_status 200 prod-if ENABLED +ics_api_edp_get_producer_status 200 prod-ia ENABLED +ics_api_edp_get_producer_status 200 prod-ib ENABLED +ics_api_edp_get_producer_status 200 prod-ic ENABLED +ics_api_edp_get_producer_status 200 prod-id ENABLED +ics_api_edp_get_producer_status 200 prod-ie ENABLED +ics_api_edp_get_producer_status 200 prod-if ENABLED -ecs_api_idc_get_job_status2 200 job101 ENABLED 1 prod-ia -ecs_api_idc_get_job_status2 200 job102 ENABLED 1 prod-ia -ecs_api_idc_get_job_status2 200 job103 ENABLED 1 prod-ib -ecs_api_idc_get_job_status2 200 job108 ENABLED 1 prod-id -ecs_api_idc_get_job_status2 200 job110 ENABLED 2 prod-ie prod-if +ics_api_idc_get_job_status2 200 job101 ENABLED 1 prod-ia +ics_api_idc_get_job_status2 200 job102 ENABLED 1 prod-ia +ics_api_idc_get_job_status2 200 job103 ENABLED 1 prod-ib +ics_api_idc_get_job_status2 200 job108 ENABLED 1 prod-id +ics_api_idc_get_job_status2 200 job110 ENABLED 2 prod-ie prod-if # Arm producer prod-ia for supervision failure prodstub_arm_producer 200 prod-ia 400 # Wait for producer prod-ia to go disabled -ecs_api_edp_get_producer_status 200 prod-ia DISABLED 360 +ics_api_edp_get_producer_status 200 prod-ia DISABLED 360 -ecs_api_edp_get_producer_ids_2 200 NOTYPE prod-ia prod-ib prod-ic prod-id prod-ie prod-if prod-b prod-c prod-d prod-e +ics_api_edp_get_producer_ids_2 200 NOTYPE prod-ia prod-ib prod-ic prod-id prod-ie prod-if prod-b prod-c prod-d prod-e -ecs_api_edp_get_producer_status 200 prod-ia DISABLED -ecs_api_edp_get_producer_status 200 prod-ib ENABLED -ecs_api_edp_get_producer_status 200 prod-ic ENABLED -ecs_api_edp_get_producer_status 200 prod-id ENABLED -ecs_api_edp_get_producer_status 200 prod-ie ENABLED -ecs_api_edp_get_producer_status 200 prod-if ENABLED +ics_api_edp_get_producer_status 200 prod-ia DISABLED +ics_api_edp_get_producer_status 200 prod-ib ENABLED +ics_api_edp_get_producer_status 200 prod-ic ENABLED +ics_api_edp_get_producer_status 200 prod-id ENABLED +ics_api_edp_get_producer_status 200 prod-ie ENABLED +ics_api_edp_get_producer_status 200 prod-if ENABLED -ecs_api_idc_get_job_status2 200 job101 ENABLED 1 prod-ia -ecs_api_idc_get_job_status2 200 job102 ENABLED 1 prod-ia -ecs_api_idc_get_job_status2 200 job103 ENABLED 1 prod-ib -ecs_api_idc_get_job_status2 200 job108 ENABLED 1 prod-id -ecs_api_idc_get_job_status2 200 job110 ENABLED 2 prod-ie prod-if +ics_api_idc_get_job_status2 200 job101 ENABLED 1 prod-ia +ics_api_idc_get_job_status2 200 job102 ENABLED 1 prod-ia +ics_api_idc_get_job_status2 200 job103 ENABLED 1 prod-ib +ics_api_idc_get_job_status2 200 job108 ENABLED 1 prod-id +ics_api_idc_get_job_status2 200 job110 ENABLED 2 prod-ie prod-if # Wait for producer prod-ia to be removed -if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then - ecs_equal json:data-producer/v1/info-producers 9 1000 +if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then + ics_equal json:data-producer/v1/info-producers 9 1000 else - ecs_equal json:ei-producer/v1/eiproducers 9 1000 + ics_equal json:ei-producer/v1/eiproducers 9 1000 fi -ecs_api_edp_get_producer_ids_2 200 NOTYPE prod-ib prod-ic prod-id prod-ie prod-if prod-b prod-c prod-d prod-e +ics_api_edp_get_producer_ids_2 200 NOTYPE prod-ib prod-ic prod-id prod-ie prod-if prod-b prod-c prod-d prod-e -ecs_api_edp_get_producer_status 404 prod-ia -ecs_api_edp_get_producer_status 200 prod-ib ENABLED -ecs_api_edp_get_producer_status 200 prod-ic ENABLED -ecs_api_edp_get_producer_status 200 prod-id ENABLED -ecs_api_edp_get_producer_status 200 prod-ie ENABLED -ecs_api_edp_get_producer_status 200 prod-if ENABLED +ics_api_edp_get_producer_status 404 prod-ia +ics_api_edp_get_producer_status 200 prod-ib ENABLED +ics_api_edp_get_producer_status 200 prod-ic ENABLED +ics_api_edp_get_producer_status 200 prod-id ENABLED +ics_api_edp_get_producer_status 200 prod-ie ENABLED +ics_api_edp_get_producer_status 200 prod-if ENABLED -ecs_api_idc_get_job_status2 200 job101 DISABLED EMPTYPROD -ecs_api_idc_get_job_status2 200 job102 DISABLED EMPTYPROD -ecs_api_idc_get_job_status2 200 job103 ENABLED 1 prod-ib -ecs_api_idc_get_job_status2 200 job108 ENABLED 1 prod-id -ecs_api_idc_get_job_status2 200 job110 ENABLED 2 prod-ie prod-if +ics_api_idc_get_job_status2 200 job101 DISABLED EMPTYPROD +ics_api_idc_get_job_status2 200 job102 DISABLED EMPTYPROD +ics_api_idc_get_job_status2 200 job103 ENABLED 1 prod-ib +ics_api_idc_get_job_status2 200 job108 ENABLED 1 prod-id +ics_api_idc_get_job_status2 200 job110 ENABLED 2 prod-ie prod-if -if [[ "$ECS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then +if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then cr_equal 0 received_callbacks 28 30 cr_equal 0 received_callbacks?id=info-job101-status 1 cr_equal 0 received_callbacks?id=info-job102-status 1 - cr_api_check_all_ecs_events 200 0 info-job101-status DISABLED - cr_api_check_all_ecs_events 200 0 info-job102-status DISABLED + cr_api_check_all_ics_events 200 0 info-job101-status DISABLED + cr_api_check_all_ics_events 200 0 info-job102-status DISABLED else cr_equal 0 received_callbacks 12 30 cr_equal 0 received_callbacks?id=info-job101-status 1 cr_equal 0 received_callbacks?id=info-job102-status 1 - cr_api_check_all_ecs_events 200 0 info-job101-status DISABLED - cr_api_check_all_ecs_events 200 0 info-job102-status DISABLED + cr_api_check_all_ics_events 200 0 info-job101-status DISABLED + cr_api_check_all_ics_events 200 0 info-job102-status DISABLED fi # Arm producer prod-ie for supervision failure prodstub_arm_producer 200 prod-ie 400 -ecs_api_edp_get_producer_status 200 prod-ie DISABLED 1000 +ics_api_edp_get_producer_status 200 prod-ie DISABLED 1000 -ecs_api_edp_get_producer_ids_2 200 NOTYPE prod-ib prod-ic prod-id prod-ie prod-if prod-b prod-c prod-d prod-e +ics_api_edp_get_producer_ids_2 200 NOTYPE prod-ib prod-ic prod-id prod-ie prod-if prod-b prod-c prod-d prod-e -ecs_api_edp_get_producer_status 404 prod-ia -ecs_api_edp_get_producer_status 200 prod-ib ENABLED -ecs_api_edp_get_producer_status 200 prod-ic ENABLED -ecs_api_edp_get_producer_status 200 prod-id ENABLED -ecs_api_edp_get_producer_status 200 prod-ie DISABLED -ecs_api_edp_get_producer_status 200 prod-if ENABLED +ics_api_edp_get_producer_status 404 prod-ia +ics_api_edp_get_producer_status 200 prod-ib ENABLED +ics_api_edp_get_producer_status 200 prod-ic ENABLED +ics_api_edp_get_producer_status 200 prod-id ENABLED +ics_api_edp_get_producer_status 200 prod-ie DISABLED +ics_api_edp_get_producer_status 200 prod-if ENABLED -ecs_api_idc_get_job_status2 200 job101 DISABLED EMPTYPROD -ecs_api_idc_get_job_status2 200 job102 DISABLED EMPTYPROD -ecs_api_idc_get_job_status2 200 job103 ENABLED 1 prod-ib -ecs_api_idc_get_job_status2 200 job108 ENABLED 1 prod-id -ecs_api_idc_get_job_status2 200 job110 ENABLED 2 prod-ie prod-if +ics_api_idc_get_job_status2 200 job101 DISABLED EMPTYPROD +ics_api_idc_get_job_status2 200 job102 DISABLED EMPTYPROD +ics_api_idc_get_job_status2 200 job103 ENABLED 1 prod-ib +ics_api_idc_get_job_status2 200 job108 ENABLED 1 prod-id +ics_api_idc_get_job_status2 200 job110 ENABLED 2 prod-ie prod-if #Disable create for job110 in prod-ie prodstub_arm_job_create 200 prod-ie job110 400 #Update tjob 10 - only prod-if will be updated -ecs_api_idc_put_job 200 job110 type106 $TARGET110 info-owner-4 $INFOSTATUS110 testdata/ecs/job-template2.json VALIDATE +ics_api_idc_put_job 200 job110 type106 $TARGET110 info-owner-4 $INFOSTATUS110 testdata/ics/job-template2.json VALIDATE #Reset producer and job responses prodstub_arm_producer 200 prod-ie 200 prodstub_arm_job_create 200 prod-ie job110 200 -ecs_api_edp_get_producer_status 200 prod-ie ENABLED 360 +ics_api_edp_get_producer_status 200 prod-ie ENABLED 360 -ecs_api_edp_get_producer_ids_2 200 NOTYPE prod-ib prod-ic prod-id prod-ie prod-if prod-b prod-c prod-d prod-e +ics_api_edp_get_producer_ids_2 200 NOTYPE prod-ib prod-ic prod-id prod-ie prod-if prod-b prod-c prod-d prod-e #Wait for job to be updated sleep_wait 120 -prodstub_check_jobdata_3 200 prod-if job110 type106 $TARGET110 info-owner-4 testdata/ecs/job-template2.json +prodstub_check_jobdata_3 200 prod-if job110 type106 $TARGET110 info-owner-4 testdata/ics/job-template2.json prodstub_arm_producer 200 prod-if 400 -ecs_api_edp_get_producer_status 200 prod-if DISABLED 360 +ics_api_edp_get_producer_status 200 prod-if DISABLED 360 -if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then - ecs_equal json:data-producer/v1/info-producers 8 1000 +if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then + ics_equal json:data-producer/v1/info-producers 8 1000 else - ecs_equal json:ei-producer/v1/eiproducers 8 1000 + ics_equal json:ei-producer/v1/eiproducers 8 1000 fi -ecs_api_edp_get_producer_ids_2 200 NOTYPE prod-ib prod-ic prod-id prod-ie prod-b prod-c prod-d prod-e +ics_api_edp_get_producer_ids_2 200 NOTYPE prod-ib prod-ic prod-id prod-ie prod-b prod-c prod-d prod-e -ecs_api_edp_get_producer_status 404 prod-ia -ecs_api_edp_get_producer_status 200 prod-ib ENABLED -ecs_api_edp_get_producer_status 200 prod-ic ENABLED -ecs_api_edp_get_producer_status 200 prod-id ENABLED -ecs_api_edp_get_producer_status 200 prod-ie ENABLED -ecs_api_edp_get_producer_status 404 prod-if +ics_api_edp_get_producer_status 404 prod-ia +ics_api_edp_get_producer_status 200 prod-ib ENABLED +ics_api_edp_get_producer_status 200 prod-ic ENABLED +ics_api_edp_get_producer_status 200 prod-id ENABLED +ics_api_edp_get_producer_status 200 prod-ie ENABLED +ics_api_edp_get_producer_status 404 prod-if -ecs_api_idc_get_job_status2 200 job101 DISABLED EMPTYPROD -ecs_api_idc_get_job_status2 200 job102 DISABLED EMPTYPROD -ecs_api_idc_get_job_status2 200 job103 ENABLED 1 prod-ib -ecs_api_idc_get_job_status2 200 job108 ENABLED 1 prod-id -ecs_api_idc_get_job_status2 200 job110 ENABLED 1 prod-ie +ics_api_idc_get_job_status2 200 job101 DISABLED EMPTYPROD +ics_api_idc_get_job_status2 200 job102 DISABLED EMPTYPROD +ics_api_idc_get_job_status2 200 job103 ENABLED 1 prod-ib +ics_api_idc_get_job_status2 200 job108 ENABLED 1 prod-id +ics_api_idc_get_job_status2 200 job110 ENABLED 1 prod-ie -if [[ "$ECS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then +if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then cr_equal 0 received_callbacks 28 else cr_equal 0 received_callbacks 12 fi ### Test of pre and post validation -ecs_api_idc_get_type_ids 200 type1 type2 type4 type6 type101 type102 type104 type106 -ecs_api_idc_put_job 404 job150 type150 $TARGET150 info-owner-1 $INFOSTATUS150 testdata/ecs/job-template.json VALIDATE -ecs_api_idc_put_job 201 job160 type160 $TARGET160 info-owner-1 $INFOSTATUS160 testdata/ecs/job-template.json +ics_api_idc_get_type_ids 200 type1 type2 type4 type6 type101 type102 type104 type106 +ics_api_idc_put_job 404 job150 type150 $TARGET150 info-owner-1 $INFOSTATUS150 testdata/ics/job-template.json VALIDATE +ics_api_idc_put_job 201 job160 type160 $TARGET160 info-owner-1 $INFOSTATUS160 testdata/ics/job-template.json -ecs_api_idc_get_job_status2 404 job150 -ecs_api_idc_get_job_status2 200 job160 DISABLED EMPTYPROD 60 +ics_api_idc_get_job_status2 404 job150 +ics_api_idc_get_job_status2 200 job160 DISABLED EMPTYPROD 60 prodstub_arm_producer 200 prod-ig prodstub_arm_job_create 200 prod-ig job150 prodstub_arm_job_create 200 prod-ig job160 -ecs_api_edp_put_producer_2 201 prod-ig $CB_JOB/prod-ig $CB_SV/prod-ig NOTYPE -ecs_api_edp_get_producer_status 200 prod-ig ENABLED 360 +ics_api_edp_put_producer_2 201 prod-ig $CB_JOB/prod-ig $CB_SV/prod-ig NOTYPE +ics_api_edp_get_producer_status 200 prod-ig ENABLED 360 -ecs_api_edp_get_producer_2 200 prod-ig $CB_JOB/prod-ig $CB_SV/prod-ig EMPTY +ics_api_edp_get_producer_2 200 prod-ig $CB_JOB/prod-ig $CB_SV/prod-ig EMPTY -ecs_api_idc_get_job_status2 404 job150 -ecs_api_idc_get_job_status2 200 job160 DISABLED EMPTYPROD 60 +ics_api_idc_get_job_status2 404 job150 +ics_api_idc_get_job_status2 200 job160 DISABLED EMPTYPROD 60 prodstub_arm_type 200 prod-ig type160 -ecs_api_edp_put_type_2 201 type160 testdata/ecs/info-type-60.json -ecs_api_idc_get_type_ids 200 type1 type2 type4 type6 type101 type102 type104 type106 type160 +ics_api_edp_put_type_2 201 type160 testdata/ics/info-type-60.json +ics_api_idc_get_type_ids 200 type1 type2 type4 type6 type101 type102 type104 type106 type160 -ecs_api_edp_put_producer_2 200 prod-ig $CB_JOB/prod-ig $CB_SV/prod-ig type160 -ecs_api_edp_get_producer_status 200 prod-ig ENABLED 360 -ecs_api_edp_get_producer_2 200 prod-ig $CB_JOB/prod-ig $CB_SV/prod-ig type160 +ics_api_edp_put_producer_2 200 prod-ig $CB_JOB/prod-ig $CB_SV/prod-ig type160 +ics_api_edp_get_producer_status 200 prod-ig ENABLED 360 +ics_api_edp_get_producer_2 200 prod-ig $CB_JOB/prod-ig $CB_SV/prod-ig type160 -ecs_api_idc_put_job 404 job150 type150 $TARGET150 info-owner-1 $INFOSTATUS150 testdata/ecs/job-template.json VALIDATE +ics_api_idc_put_job 404 job150 type150 $TARGET150 info-owner-1 $INFOSTATUS150 testdata/ics/job-template.json VALIDATE -ecs_api_idc_get_job_status2 404 job150 -ecs_api_idc_get_job_status2 200 job160 ENABLED 1 prod-ig 60 +ics_api_idc_get_job_status2 404 job150 +ics_api_idc_get_job_status2 200 job160 ENABLED 1 prod-ig 60 -prodstub_check_jobdata_3 200 prod-ig job160 type160 $TARGET160 info-owner-1 testdata/ecs/job-template.json +prodstub_check_jobdata_3 200 prod-ig job160 type160 $TARGET160 info-owner-1 testdata/ics/job-template.json prodstub_equal create/prod-ig/job160 1 prodstub_equal delete/prod-ig/job160 0 prodstub_arm_type 200 prod-ig type150 -ecs_api_edp_put_type_2 201 type150 testdata/ecs/info-type-50.json -ecs_api_idc_get_type_ids 200 type1 type2 type4 type6 type101 type102 type104 type106 type160 type150 +ics_api_edp_put_type_2 201 type150 testdata/ics/info-type-50.json +ics_api_idc_get_type_ids 200 type1 type2 type4 type6 type101 type102 type104 type106 type160 type150 -if [[ "$ECS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then +if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then cr_equal 0 received_callbacks 30 30 cr_equal 0 received_callbacks?id=type-status1 18 - cr_api_check_all_ecs_subscription_events 200 0 type-status1 type160 testdata/ecs/info-type-60.json REGISTERED type150 testdata/ecs/info-type-50.json REGISTERED + cr_api_check_all_ics_subscription_events 200 0 type-status1 type160 testdata/ics/info-type-60.json REGISTERED type150 testdata/ics/info-type-50.json REGISTERED else cr_equal 0 received_callbacks 12 fi -ecs_api_edp_put_producer_2 200 prod-ig $CB_JOB/prod-ig $CB_SV/prod-ig type160 type150 -ecs_api_edp_get_producer_status 200 prod-ig ENABLED 360 +ics_api_edp_put_producer_2 200 prod-ig $CB_JOB/prod-ig $CB_SV/prod-ig type160 type150 +ics_api_edp_get_producer_status 200 prod-ig ENABLED 360 -ecs_api_edp_get_producer_2 200 prod-ig $CB_JOB/prod-ig $CB_SV/prod-ig type160 type150 +ics_api_edp_get_producer_2 200 prod-ig $CB_JOB/prod-ig $CB_SV/prod-ig type160 type150 -ecs_api_idc_get_job_status2 404 job150 -ecs_api_idc_get_job_status2 200 job160 ENABLED 1 prod-ig +ics_api_idc_get_job_status2 404 job150 +ics_api_idc_get_job_status2 200 job160 ENABLED 1 prod-ig -ecs_api_idc_put_job 201 job150 type150 $TARGET150 info-owner-1 $INFOSTATUS150 testdata/ecs/job-template.json VALIDATE +ics_api_idc_put_job 201 job150 type150 $TARGET150 info-owner-1 $INFOSTATUS150 testdata/ics/job-template.json VALIDATE -ecs_api_idc_get_job_status2 200 job150 ENABLED 1 prod-ig 60 -ecs_api_idc_get_job_status2 200 job160 ENABLED 1 prod-ig +ics_api_idc_get_job_status2 200 job150 ENABLED 1 prod-ig 60 +ics_api_idc_get_job_status2 200 job160 ENABLED 1 prod-ig -if [[ "$ECS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then +if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then cr_equal 0 received_callbacks 30 30 cr_equal 0 received_callbacks?id=type-status1 18 else @@ -1957,29 +1961,33 @@ fi # Test job deletion at type delete -if [[ "$ECS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then +if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then - ecs_api_edp_delete_type_2 406 type104 + if [[ "$ICS_FEATURE_LEVEL" == *"RESP_CODE_CHANGE_1" ]]; then + ics_api_edp_delete_type_2 409 type104 + else + ics_api_edp_delete_type_2 406 type104 + fi - ecs_api_edp_delete_producer 204 prod-id + ics_api_edp_delete_producer 204 prod-id - ecs_api_edp_delete_type_2 204 type104 + ics_api_edp_delete_type_2 204 type104 cr_equal 0 received_callbacks 32 30 cr_equal 0 received_callbacks?id=info-job108-status 3 cr_equal 0 received_callbacks?id=type-status1 19 - cr_api_check_all_ecs_subscription_events 200 0 type-status1 type104 testdata/ecs/info-type-4.json DEREGISTERED - cr_api_check_all_ecs_events 200 0 info-job108-status DISABLED + cr_api_check_all_ics_subscription_events 200 0 type-status1 type104 testdata/ics/info-type-4.json DEREGISTERED + cr_api_check_all_ics_events 200 0 info-job108-status DISABLED - ecs_api_edp_get_producer 404 prod-id + ics_api_edp_get_producer 404 prod-id - ecs_api_idc_get_job 404 job-108 + ics_api_idc_get_job 404 job-108 else cr_equal 0 received_callbacks 12 fi -check_ecs_logs +check_ics_logs store_logs END diff --git a/test/auto-test/FTC1800.sh b/test/auto-test/FTC1800.sh index 232f901b..0948b650 100755 --- a/test/auto-test/FTC1800.sh +++ b/test/auto-test/FTC1800.sh @@ -18,13 +18,13 @@ # -TC_ONELINE_DESCR="ECS Create 10000 jobs (ei and info) restart, test job persistency" +TC_ONELINE_DESCR="ICS Create 10000 jobs (ei and info) restart, test job persistency" #App names to include in the test when running docker, space separated list -DOCKER_INCLUDED_IMAGES="ECS PRODSTUB CR CP NGW KUBEPROXY" +DOCKER_INCLUDED_IMAGES="ICS PRODSTUB CR CP NGW KUBEPROXY" #App names to include in the test when running kubernetes, space separated list -KUBE_INCLUDED_IMAGES="ECS PRODSTUB CP CR KUBEPROXY NGW" +KUBE_INCLUDED_IMAGES="ICS PRODSTUB CP CR KUBEPROXY NGW" #Prestarted app (not started by script) to include in the test when running kubernetes, space separated list KUBE_PRESTARTED_IMAGES="" @@ -50,15 +50,15 @@ clean_environment start_kube_proxy -use_ecs_rest_http +use_ics_rest_http use_prod_stub_http -start_ecs NOPROXY $SIM_GROUP/$ECS_COMPOSE_DIR/$ECS_CONFIG_FILE +start_ics NOPROXY $SIM_GROUP/$ICS_COMPOSE_DIR/$ICS_CONFIG_FILE start_prod_stub -set_ecs_trace +set_ics_trace start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE @@ -74,23 +74,23 @@ 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 +if [[ "$ICS_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 +if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then #Type registration status callbacks TYPESTATUS1="$CR_SERVICE_APP_PATH_0/type-status1" TYPESTATUS2="$CR_SERVICE_APP_PATH_0/type-status2" - ecs_api_idc_put_subscription 201 subscription-id-1 owner1 $TYPESTATUS1 + ics_api_idc_put_subscription 201 subscription-id-1 owner1 $TYPESTATUS1 - ecs_api_idc_get_subscription_ids 200 owner1 subscription-id-1 + ics_api_idc_get_subscription_ids 200 owner1 subscription-id-1 - ecs_api_idc_put_subscription 201 subscription-id-2 owner2 $TYPESTATUS2 + ics_api_idc_put_subscription 201 subscription-id-2 owner2 $TYPESTATUS2 - ecs_api_idc_get_subscription_ids 200 owner2 subscription-id-2 + ics_api_idc_get_subscription_ids 200 owner2 subscription-id-2 fi @@ -176,179 +176,179 @@ if [ $use_info_jobs ]; then fi -if [ $ECS_VERSION == "V1-1" ]; then +if [ $ICS_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 + ics_api_edp_put_producer 201 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 testdata/ics/ei-type-1.json - ecs_api_edp_put_producer 201 prod-b $CB_JOB/prod-b $CB_SV/prod-b type1 testdata/ecs/ei-type-1.json type2 testdata/ecs/ei-type-2.json + ics_api_edp_put_producer 201 prod-b $CB_JOB/prod-b $CB_SV/prod-b type1 testdata/ics/ei-type-1.json type2 testdata/ics/ei-type-2.json - ecs_api_edp_put_producer 201 prod-c $CB_JOB/prod-c $CB_SV/prod-c type1 testdata/ecs/ei-type-1.json type2 testdata/ecs/ei-type-2.json type3 testdata/ecs/ei-type-3.json + ics_api_edp_put_producer 201 prod-c $CB_JOB/prod-c $CB_SV/prod-c type1 testdata/ics/ei-type-1.json type2 testdata/ics/ei-type-2.json type3 testdata/ics/ei-type-3.json - ecs_api_edp_put_producer 201 prod-d $CB_JOB/prod-d $CB_SV/prod-d type4 testdata/ecs/ei-type-4.json type5 testdata/ecs/ei-type-5.json + ics_api_edp_put_producer 201 prod-d $CB_JOB/prod-d $CB_SV/prod-d type4 testdata/ics/ei-type-4.json type5 testdata/ics/ei-type-5.json else - ecs_api_edp_put_type_2 201 type1 testdata/ecs/ei-type-1.json - ecs_api_edp_put_type_2 201 type2 testdata/ecs/ei-type-2.json - ecs_api_edp_put_type_2 201 type3 testdata/ecs/ei-type-3.json - ecs_api_edp_put_type_2 201 type4 testdata/ecs/ei-type-4.json - ecs_api_edp_put_type_2 201 type5 testdata/ecs/ei-type-5.json + ics_api_edp_put_type_2 201 type1 testdata/ics/ei-type-1.json + ics_api_edp_put_type_2 201 type2 testdata/ics/ei-type-2.json + ics_api_edp_put_type_2 201 type3 testdata/ics/ei-type-3.json + ics_api_edp_put_type_2 201 type4 testdata/ics/ei-type-4.json + ics_api_edp_put_type_2 201 type5 testdata/ics/ei-type-5.json - ecs_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 - ecs_api_edp_put_producer_2 201 prod-b $CB_JOB/prod-b $CB_SV/prod-b type1 type2 + ics_api_edp_put_producer_2 201 prod-b $CB_JOB/prod-b $CB_SV/prod-b type1 type2 - ecs_api_edp_put_producer_2 201 prod-c $CB_JOB/prod-c $CB_SV/prod-c type1 type2 type3 + ics_api_edp_put_producer_2 201 prod-c $CB_JOB/prod-c $CB_SV/prod-c type1 type2 type3 - ecs_api_edp_put_producer_2 201 prod-d $CB_JOB/prod-d $CB_SV/prod-d type4 type5 + ics_api_edp_put_producer_2 201 prod-d $CB_JOB/prod-d $CB_SV/prod-d type4 type5 if [ $use_info_jobs ]; then - ecs_api_edp_put_type_2 201 type101 testdata/ecs/info-type-1.json - ecs_api_edp_put_type_2 201 type102 testdata/ecs/info-type-2.json - ecs_api_edp_put_type_2 201 type103 testdata/ecs/info-type-3.json - 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 + ics_api_edp_put_type_2 201 type101 testdata/ics/info-type-1.json + ics_api_edp_put_type_2 201 type102 testdata/ics/info-type-2.json + ics_api_edp_put_type_2 201 type103 testdata/ics/info-type-3.json + ics_api_edp_put_type_2 201 type104 testdata/ics/info-type-4.json + ics_api_edp_put_type_2 201 type105 testdata/ics/info-type-5.json - if [[ "$ECS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then + if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then cr_equal 0 received_callbacks 20 30 cr_equal 0 received_callbacks?id=type-status1 10 cr_equal 0 received_callbacks?id=type-status2 10 - cr_api_check_all_ecs_subscription_events 200 0 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_ics_subscription_events 200 0 type-status1 \ + type1 testdata/ics/ei-type-1.json REGISTERED \ + type2 testdata/ics/ei-type-2.json REGISTERED \ + type3 testdata/ics/ei-type-3.json REGISTERED \ + type4 testdata/ics/ei-type-4.json REGISTERED \ + type5 testdata/ics/ei-type-5.json REGISTERED \ + type101 testdata/ics/info-type-1.json REGISTERED \ + type102 testdata/ics/info-type-2.json REGISTERED \ + type103 testdata/ics/info-type-3.json REGISTERED \ + type104 testdata/ics/info-type-4.json REGISTERED \ + type105 testdata/ics/info-type-5.json REGISTERED - cr_api_check_all_ecs_subscription_events 200 0 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 + cr_api_check_all_ics_subscription_events 200 0 type-status2 \ + type1 testdata/ics/ei-type-1.json REGISTERED \ + type2 testdata/ics/ei-type-2.json REGISTERED \ + type3 testdata/ics/ei-type-3.json REGISTERED \ + type4 testdata/ics/ei-type-4.json REGISTERED \ + type5 testdata/ics/ei-type-5.json REGISTERED \ + type101 testdata/ics/info-type-1.json REGISTERED \ + type102 testdata/ics/info-type-2.json REGISTERED \ + type103 testdata/ics/info-type-3.json REGISTERED \ + type104 testdata/ics/info-type-4.json REGISTERED \ + type105 testdata/ics/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 + ics_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 + ics_api_edp_put_producer_2 200 prod-b $CB_JOB/prod-b $CB_SV/prod-b type1 type2 type101 type102 - ecs_api_edp_put_producer_2 200 prod-c $CB_JOB/prod-c $CB_SV/prod-c type1 type2 type3 type101 type102 type103 + ics_api_edp_put_producer_2 200 prod-c $CB_JOB/prod-c $CB_SV/prod-c type1 type2 type3 type101 type102 type103 - ecs_api_edp_put_producer_2 200 prod-d $CB_JOB/prod-d $CB_SV/prod-d type4 type5 type104 type105 + ics_api_edp_put_producer_2 200 prod-d $CB_JOB/prod-d $CB_SV/prod-d type4 type5 type104 type105 fi fi if [ $use_info_jobs ]; then - ecs_equal json:data-producer/v1/info-producers 4 + ics_equal json:data-producer/v1/info-producers 4 else - ecs_equal json:ei-producer/v1/eiproducers 4 + ics_equal json:ei-producer/v1/eiproducers 4 fi -ecs_api_edp_get_producer_status 200 prod-a ENABLED -ecs_api_edp_get_producer_status 200 prod-b ENABLED -ecs_api_edp_get_producer_status 200 prod-c ENABLED -ecs_api_edp_get_producer_status 200 prod-d ENABLED +ics_api_edp_get_producer_status 200 prod-a ENABLED +ics_api_edp_get_producer_status 200 prod-b ENABLED +ics_api_edp_get_producer_status 200 prod-c ENABLED +ics_api_edp_get_producer_status 200 prod-d ENABLED for ((i=1; i<=$NUM_JOBS; i++)) do if [ $(($i%5)) -eq 0 ]; then - ecs_api_a1_put_job 201 job$i type1 $TARGET ric1 $CR_SERVICE_APP_PATH_0/job_status_ric1 testdata/ecs/job-template.json + ics_api_a1_put_job 201 job$i type1 $TARGET ric1 $CR_SERVICE_APP_PATH_0/job_status_ric1 testdata/ics/job-template.json if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_get_job_status 200 type1 job$i ENABLED + ics_api_a1_get_job_status 200 type1 job$i ENABLED else - ecs_api_a1_get_job_status 200 job$i ENABLED 120 + ics_api_a1_get_job_status 200 job$i ENABLED 120 fi if [ $use_info_jobs ]; then - ecs_api_idc_put_job 201 job$(($i+$NUM_JOBS)) type101 $TARGET info-owner $CR_SERVICE_APP_PATH_0/job_status_info-owner testdata/ecs/job-template.json VALIDATE - ecs_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) ENABLED 3 prod-a prod-b prod-c 120 + ics_api_idc_put_job 201 job$(($i+$NUM_JOBS)) type101 $TARGET info-owner $CR_SERVICE_APP_PATH_0/job_status_info-owner testdata/ics/job-template.json VALIDATE + ics_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 - ecs_api_a1_put_job 201 job$i type2 $TARGET ric1 $CR_SERVICE_APP_PATH_0/job_status_ric1 testdata/ecs/job-template.json + ics_api_a1_put_job 201 job$i type2 $TARGET ric1 $CR_SERVICE_APP_PATH_0/job_status_ric1 testdata/ics/job-template.json if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_get_job_status 200 type2 job$i ENABLED + ics_api_a1_get_job_status 200 type2 job$i ENABLED else - ecs_api_a1_get_job_status 200 job$i ENABLED 120 + ics_api_a1_get_job_status 200 job$i ENABLED 120 fi if [ $use_info_jobs ]; then - ecs_api_idc_put_job 201 job$(($i+$NUM_JOBS)) type102 $TARGET info-owner $CR_SERVICE_APP_PATH_0/job_status_info-owner testdata/ecs/job-template.json VALIDATE - ecs_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) ENABLED 2 prod-b prod-c 120 + ics_api_idc_put_job 201 job$(($i+$NUM_JOBS)) type102 $TARGET info-owner $CR_SERVICE_APP_PATH_0/job_status_info-owner testdata/ics/job-template.json VALIDATE + ics_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 - ecs_api_a1_put_job 201 job$i type3 $TARGET ric1 $CR_SERVICE_APP_PATH_0/job_status_ric1 testdata/ecs/job-template.json + ics_api_a1_put_job 201 job$i type3 $TARGET ric1 $CR_SERVICE_APP_PATH_0/job_status_ric1 testdata/ics/job-template.json if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_get_job_status 200 type3 job$i ENABLED + ics_api_a1_get_job_status 200 type3 job$i ENABLED else - ecs_api_a1_get_job_status 200 job$i ENABLED 120 + ics_api_a1_get_job_status 200 job$i ENABLED 120 fi if [ $use_info_jobs ]; then - ecs_api_idc_put_job 201 job$(($i+$NUM_JOBS)) type103 $TARGET info-owner $CR_SERVICE_APP_PATH_0/job_status_info-owner testdata/ecs/job-template.json VALIDATE - ecs_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) ENABLED 1 prod-c 120 + ics_api_idc_put_job 201 job$(($i+$NUM_JOBS)) type103 $TARGET info-owner $CR_SERVICE_APP_PATH_0/job_status_info-owner testdata/ics/job-template.json VALIDATE + ics_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) ENABLED 1 prod-c 120 fi fi if [ $(($i%5)) -eq 3 ]; then - ecs_api_a1_put_job 201 job$i type4 $TARGET ric1 $CR_SERVICE_APP_PATH_0/job_status_ric1 testdata/ecs/job-template.json + ics_api_a1_put_job 201 job$i type4 $TARGET ric1 $CR_SERVICE_APP_PATH_0/job_status_ric1 testdata/ics/job-template.json if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_get_job_status 200 type4 job$i ENABLED + ics_api_a1_get_job_status 200 type4 job$i ENABLED else - ecs_api_a1_get_job_status 200 job$i ENABLED 120 + ics_api_a1_get_job_status 200 job$i ENABLED 120 fi if [ $use_info_jobs ]; then - ecs_api_idc_put_job 201 job$(($i+$NUM_JOBS)) type104 $TARGET info-owner $CR_SERVICE_APP_PATH_0/job_status_info-owner testdata/ecs/job-template.json VALIDATE - ecs_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) ENABLED 1 prod-d 120 + ics_api_idc_put_job 201 job$(($i+$NUM_JOBS)) type104 $TARGET info-owner $CR_SERVICE_APP_PATH_0/job_status_info-owner testdata/ics/job-template.json VALIDATE + ics_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) ENABLED 1 prod-d 120 fi fi if [ $(($i%5)) -eq 4 ]; then - ecs_api_a1_put_job 201 job$i type5 $TARGET ric1 $CR_SERVICE_APP_PATH_0/job_status_ric1 testdata/ecs/job-template.json + ics_api_a1_put_job 201 job$i type5 $TARGET ric1 $CR_SERVICE_APP_PATH_0/job_status_ric1 testdata/ics/job-template.json if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_get_job_status 200 type5 job$i ENABLED + ics_api_a1_get_job_status 200 type5 job$i ENABLED else - ecs_api_a1_get_job_status 200 job$i ENABLED 120 + ics_api_a1_get_job_status 200 job$i ENABLED 120 fi if [ $use_info_jobs ]; then - ecs_api_idc_put_job 201 job$(($i+$NUM_JOBS)) type105 $TARGET info-owner $CR_SERVICE_APP_PATH_0/job_status_info-owner testdata/ecs/job-template.json VALIDATE - ecs_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) ENABLED 1 prod-d 120 + ics_api_idc_put_job 201 job$(($i+$NUM_JOBS)) type105 $TARGET info-owner $CR_SERVICE_APP_PATH_0/job_status_info-owner testdata/ics/job-template.json VALIDATE + ics_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) ENABLED 1 prod-d 120 fi fi done if [ -z "$FLAT_A1_EI" ]; then - ecs_equal json:A1-EI/v1/eitypes/type1/eijobs $(($NUM_JOBS/5)) - ecs_equal json:A1-EI/v1/eitypes/type2/eijobs $(($NUM_JOBS/5)) - ecs_equal json:A1-EI/v1/eitypes/type3/eijobs $(($NUM_JOBS/5)) - ecs_equal json:A1-EI/v1/eitypes/type4/eijobs $(($NUM_JOBS/5)) - ecs_equal json:A1-EI/v1/eitypes/type5/eijobs $(($NUM_JOBS/5)) + ics_equal json:A1-EI/v1/eitypes/type1/eijobs $(($NUM_JOBS/5)) + ics_equal json:A1-EI/v1/eitypes/type2/eijobs $(($NUM_JOBS/5)) + ics_equal json:A1-EI/v1/eitypes/type3/eijobs $(($NUM_JOBS/5)) + ics_equal json:A1-EI/v1/eitypes/type4/eijobs $(($NUM_JOBS/5)) + ics_equal json:A1-EI/v1/eitypes/type5/eijobs $(($NUM_JOBS/5)) else - ecs_equal json:A1-EI/v1/eijobs?eiTypeId=type1 $(($NUM_JOBS/5)) - ecs_equal json:A1-EI/v1/eijobs?eiTypeId=type2 $(($NUM_JOBS/5)) - ecs_equal json:A1-EI/v1/eijobs?eiTypeId=type3 $(($NUM_JOBS/5)) - ecs_equal json:A1-EI/v1/eijobs?eiTypeId=type4 $(($NUM_JOBS/5)) - ecs_equal json:A1-EI/v1/eijobs?eiTypeId=type5 $(($NUM_JOBS/5)) + ics_equal json:A1-EI/v1/eijobs?eiTypeId=type1 $(($NUM_JOBS/5)) + ics_equal json:A1-EI/v1/eijobs?eiTypeId=type2 $(($NUM_JOBS/5)) + ics_equal json:A1-EI/v1/eijobs?eiTypeId=type3 $(($NUM_JOBS/5)) + ics_equal json:A1-EI/v1/eijobs?eiTypeId=type4 $(($NUM_JOBS/5)) + ics_equal json:A1-EI/v1/eijobs?eiTypeId=type5 $(($NUM_JOBS/5)) fi if [ $use_info_jobs ]; then - ecs_equal json:data-consumer/v1/info-jobs?infoTypeId=type101 $(($NUM_JOBS/5)) - ecs_equal json:data-consumer/v1/info-jobs?infoTypeId=type102 $(($NUM_JOBS/5)) - ecs_equal json:data-consumer/v1/info-jobs?infoTypeId=type103 $(($NUM_JOBS/5)) - ecs_equal json:data-consumer/v1/info-jobs?infoTypeId=type104 $(($NUM_JOBS/5)) - ecs_equal json:data-consumer/v1/info-jobs?infoTypeId=type105 $(($NUM_JOBS/5)) + ics_equal json:data-consumer/v1/info-jobs?infoTypeId=type101 $(($NUM_JOBS/5)) + ics_equal json:data-consumer/v1/info-jobs?infoTypeId=type102 $(($NUM_JOBS/5)) + ics_equal json:data-consumer/v1/info-jobs?infoTypeId=type103 $(($NUM_JOBS/5)) + ics_equal json:data-consumer/v1/info-jobs?infoTypeId=type104 $(($NUM_JOBS/5)) + ics_equal json:data-consumer/v1/info-jobs?infoTypeId=type105 $(($NUM_JOBS/5)) fi -if [[ "$ECS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then +if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then cr_equal 0 received_callbacks 20 30 else @@ -357,40 +357,40 @@ else fi -if [[ "$ECS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then +if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then - ecs_equal json:/data-consumer/v1/info-type-subscription 2 200 + ics_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 + ics_api_idc_get_subscription_ids 200 owner1 subscription-id-1 + ics_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 + ics_equal json:data-producer/v1/info-types 10 1000 else - ecs_equal json:ei-producer/v1/eitypes 5 1000 + ics_equal json:ei-producer/v1/eitypes 5 1000 fi fi -stop_ecs +stop_ics cr_api_reset 0 -start_stopped_ecs +start_stopped_ics -set_ecs_trace +set_ics_trace -if [[ "$ECS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then +if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then - ecs_equal json:/data-consumer/v1/info-type-subscription 2 200 + ics_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 + ics_api_idc_get_subscription_ids 200 owner1 subscription-id-1 + ics_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 + ics_equal json:data-producer/v1/info-types 10 1000 else - ecs_equal json:ei-producer/v1/eitypes 5 1000 + ics_equal json:ei-producer/v1/eitypes 5 1000 fi fi @@ -436,267 +436,267 @@ do fi done -ecs_api_edp_get_producer_status 404 prod-a -ecs_api_edp_get_producer_status 404 prod-b -ecs_api_edp_get_producer_status 404 prod-c -ecs_api_edp_get_producer_status 404 prod-d +ics_api_edp_get_producer_status 404 prod-a +ics_api_edp_get_producer_status 404 prod-b +ics_api_edp_get_producer_status 404 prod-c +ics_api_edp_get_producer_status 404 prod-d for ((i=1; i<=$NUM_JOBS; i++)) do if [ $(($i%5)) -eq 0 ]; then if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_get_job_status 200 type1 job$i DISABLED + ics_api_a1_get_job_status 200 type1 job$i DISABLED else - ecs_api_a1_get_job_status 200 job$i DISABLED 120 + ics_api_a1_get_job_status 200 job$i DISABLED 120 fi if [ $use_info_jobs ]; then - ecs_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) DISABLED EMPTYPROD 120 + ics_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) DISABLED EMPTYPROD 120 fi fi if [ $(($i%5)) -eq 1 ]; then if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_get_job_status 200 type2 job$i DISABLED + ics_api_a1_get_job_status 200 type2 job$i DISABLED else - ecs_api_a1_get_job_status 200 job$i DISABLED 120 + ics_api_a1_get_job_status 200 job$i DISABLED 120 fi if [ $use_info_jobs ]; then - ecs_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) DISABLED EMPTYPROD 120 + ics_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) DISABLED EMPTYPROD 120 fi fi if [ $(($i%5)) -eq 2 ]; then if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_get_job_status 200 type3 job$i DISABLED + ics_api_a1_get_job_status 200 type3 job$i DISABLED else - ecs_api_a1_get_job_status 200 job$i DISABLED 120 + ics_api_a1_get_job_status 200 job$i DISABLED 120 fi if [ $use_info_jobs ]; then - ecs_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) DISABLED EMPTYPROD 120 + ics_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) DISABLED EMPTYPROD 120 fi fi if [ $(($i%5)) -eq 3 ]; then if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_get_job_status 200 type4 job$i DISABLED + ics_api_a1_get_job_status 200 type4 job$i DISABLED else - ecs_api_a1_get_job_status 200 job$i DISABLED 120 + ics_api_a1_get_job_status 200 job$i DISABLED 120 fi if [ $use_info_jobs ]; then - ecs_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) DISABLED EMPTYPROD 120 + ics_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) DISABLED EMPTYPROD 120 fi fi if [ $(($i%5)) -eq 4 ]; then if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_get_job_status 200 type5 job$i DISABLED + ics_api_a1_get_job_status 200 type5 job$i DISABLED else - ecs_api_a1_get_job_status 200 job$i DISABLED 120 + ics_api_a1_get_job_status 200 job$i DISABLED 120 fi if [ $use_info_jobs ]; then - ecs_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) DISABLED EMPTYPROD 120 + ics_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) DISABLED EMPTYPROD 120 fi fi done -if [ $ECS_VERSION == "V1-1" ]; then +if [ $ICS_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 + ics_api_edp_put_producer 201 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 testdata/ics/ei-type-1.json - ecs_api_edp_put_producer 201 prod-b $CB_JOB/prod-b $CB_SV/prod-b type1 testdata/ecs/ei-type-1.json type2 testdata/ecs/ei-type-2.json + ics_api_edp_put_producer 201 prod-b $CB_JOB/prod-b $CB_SV/prod-b type1 testdata/ics/ei-type-1.json type2 testdata/ics/ei-type-2.json - ecs_api_edp_put_producer 201 prod-c $CB_JOB/prod-c $CB_SV/prod-c type1 testdata/ecs/ei-type-1.json type2 testdata/ecs/ei-type-2.json type3 testdata/ecs/ei-type-3.json + ics_api_edp_put_producer 201 prod-c $CB_JOB/prod-c $CB_SV/prod-c type1 testdata/ics/ei-type-1.json type2 testdata/ics/ei-type-2.json type3 testdata/ics/ei-type-3.json - ecs_api_edp_put_producer 201 prod-d $CB_JOB/prod-d $CB_SV/prod-d type4 testdata/ecs/ei-type-4.json type5 testdata/ecs/ei-type-5.json + ics_api_edp_put_producer 201 prod-d $CB_JOB/prod-d $CB_SV/prod-d type4 testdata/ics/ei-type-4.json type5 testdata/ics/ei-type-5.json else if [ $use_info_jobs ]; then - ecs_api_edp_put_producer_2 201 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 type101 + ics_api_edp_put_producer_2 201 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 type101 - ecs_api_edp_put_producer_2 201 prod-b $CB_JOB/prod-b $CB_SV/prod-b type1 type2 type101 type102 + ics_api_edp_put_producer_2 201 prod-b $CB_JOB/prod-b $CB_SV/prod-b type1 type2 type101 type102 - ecs_api_edp_put_producer_2 201 prod-c $CB_JOB/prod-c $CB_SV/prod-c type1 type2 type3 type101 type102 type103 + ics_api_edp_put_producer_2 201 prod-c $CB_JOB/prod-c $CB_SV/prod-c type1 type2 type3 type101 type102 type103 - ecs_api_edp_put_producer_2 201 prod-d $CB_JOB/prod-d $CB_SV/prod-d type4 type5 type104 type105 + ics_api_edp_put_producer_2 201 prod-d $CB_JOB/prod-d $CB_SV/prod-d type4 type5 type104 type105 else - ecs_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 - ecs_api_edp_put_producer_2 201 prod-b $CB_JOB/prod-b $CB_SV/prod-b type1 type2 + ics_api_edp_put_producer_2 201 prod-b $CB_JOB/prod-b $CB_SV/prod-b type1 type2 - ecs_api_edp_put_producer_2 201 prod-c $CB_JOB/prod-c $CB_SV/prod-c type1 type2 type3 + ics_api_edp_put_producer_2 201 prod-c $CB_JOB/prod-c $CB_SV/prod-c type1 type2 type3 - ecs_api_edp_put_producer_2 201 prod-d $CB_JOB/prod-d $CB_SV/prod-d type4 type5 + ics_api_edp_put_producer_2 201 prod-d $CB_JOB/prod-d $CB_SV/prod-d type4 type5 fi fi if [ $use_info_jobs ]; then - ecs_equal json:data-producer/v1/info-producers 4 + ics_equal json:data-producer/v1/info-producers 4 else - ecs_equal json:ei-producer/v1/eiproducers 4 + ics_equal json:ei-producer/v1/eiproducers 4 fi -ecs_api_edp_get_producer_status 200 prod-a ENABLED -ecs_api_edp_get_producer_status 200 prod-b ENABLED -ecs_api_edp_get_producer_status 200 prod-c ENABLED -ecs_api_edp_get_producer_status 200 prod-d ENABLED +ics_api_edp_get_producer_status 200 prod-a ENABLED +ics_api_edp_get_producer_status 200 prod-b ENABLED +ics_api_edp_get_producer_status 200 prod-c ENABLED +ics_api_edp_get_producer_status 200 prod-d ENABLED for ((i=1; i<=$NUM_JOBS; i++)) do if [ $(($i%5)) -eq 0 ]; then if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_get_job_status 200 type1 job$i ENABLED + ics_api_a1_get_job_status 200 type1 job$i ENABLED else - ecs_api_a1_get_job_status 200 job$i ENABLED 120 + ics_api_a1_get_job_status 200 job$i ENABLED 120 fi if [ $use_info_jobs ]; then - ecs_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) ENABLED 3 prod-a prod-b prod-c 120 + ics_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 if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_get_job_status 200 type2 job$i ENABLED + ics_api_a1_get_job_status 200 type2 job$i ENABLED else - ecs_api_a1_get_job_status 200 job$i ENABLED 120 + ics_api_a1_get_job_status 200 job$i ENABLED 120 fi if [ $use_info_jobs ]; then - ecs_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) ENABLED 2 prod-b prod-c 120 + ics_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 if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_get_job_status 200 type3 job$i ENABLED + ics_api_a1_get_job_status 200 type3 job$i ENABLED else - ecs_api_a1_get_job_status 200 job$i ENABLED 120 + ics_api_a1_get_job_status 200 job$i ENABLED 120 fi if [ $use_info_jobs ]; then - ecs_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) ENABLED 1 prod-c 120 + ics_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) ENABLED 1 prod-c 120 fi fi if [ $(($i%5)) -eq 3 ]; then if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_get_job_status 200 type4 job$i ENABLED + ics_api_a1_get_job_status 200 type4 job$i ENABLED else - ecs_api_a1_get_job_status 200 job$i ENABLED 120 + ics_api_a1_get_job_status 200 job$i ENABLED 120 fi if [ $use_info_jobs ]; then - ecs_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) ENABLED 1 prod-d 120 + ics_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) ENABLED 1 prod-d 120 fi fi if [ $(($i%5)) -eq 4 ]; then if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_get_job_status 200 type5 job$i ENABLED + ics_api_a1_get_job_status 200 type5 job$i ENABLED else - ecs_api_a1_get_job_status 200 job$i ENABLED 120 + ics_api_a1_get_job_status 200 job$i ENABLED 120 fi if [ $use_info_jobs ]; then - ecs_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) ENABLED 1 prod-d 120 + ics_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) ENABLED 1 prod-d 120 fi fi done if [ -z "$FLAT_A1_EI" ]; then - ecs_equal json:A1-EI/v1/eitypes/type1/eijobs $(($NUM_JOBS/5)) - ecs_equal json:A1-EI/v1/eitypes/type2/eijobs $(($NUM_JOBS/5)) - ecs_equal json:A1-EI/v1/eitypes/type3/eijobs $(($NUM_JOBS/5)) - ecs_equal json:A1-EI/v1/eitypes/type4/eijobs $(($NUM_JOBS/5)) - ecs_equal json:A1-EI/v1/eitypes/type5/eijobs $(($NUM_JOBS/5)) + ics_equal json:A1-EI/v1/eitypes/type1/eijobs $(($NUM_JOBS/5)) + ics_equal json:A1-EI/v1/eitypes/type2/eijobs $(($NUM_JOBS/5)) + ics_equal json:A1-EI/v1/eitypes/type3/eijobs $(($NUM_JOBS/5)) + ics_equal json:A1-EI/v1/eitypes/type4/eijobs $(($NUM_JOBS/5)) + ics_equal json:A1-EI/v1/eitypes/type5/eijobs $(($NUM_JOBS/5)) else - ecs_equal json:A1-EI/v1/eijobs?eiTypeId=type1 $(($NUM_JOBS/5)) - ecs_equal json:A1-EI/v1/eijobs?eiTypeId=type2 $(($NUM_JOBS/5)) - ecs_equal json:A1-EI/v1/eijobs?eiTypeId=type3 $(($NUM_JOBS/5)) - ecs_equal json:A1-EI/v1/eijobs?eiTypeId=type4 $(($NUM_JOBS/5)) - ecs_equal json:A1-EI/v1/eijobs?eiTypeId=type5 $(($NUM_JOBS/5)) + ics_equal json:A1-EI/v1/eijobs?eiTypeId=type1 $(($NUM_JOBS/5)) + ics_equal json:A1-EI/v1/eijobs?eiTypeId=type2 $(($NUM_JOBS/5)) + ics_equal json:A1-EI/v1/eijobs?eiTypeId=type3 $(($NUM_JOBS/5)) + ics_equal json:A1-EI/v1/eijobs?eiTypeId=type4 $(($NUM_JOBS/5)) + ics_equal json:A1-EI/v1/eijobs?eiTypeId=type5 $(($NUM_JOBS/5)) fi if [ $use_info_jobs ]; then - ecs_equal json:data-consumer/v1/info-jobs?infoTypeId=type101 $(($NUM_JOBS/5)) - ecs_equal json:data-consumer/v1/info-jobs?infoTypeId=type102 $(($NUM_JOBS/5)) - ecs_equal json:data-consumer/v1/info-jobs?infoTypeId=type103 $(($NUM_JOBS/5)) - ecs_equal json:data-consumer/v1/info-jobs?infoTypeId=type104 $(($NUM_JOBS/5)) - ecs_equal json:data-consumer/v1/info-jobs?infoTypeId=type105 $(($NUM_JOBS/5)) + ics_equal json:data-consumer/v1/info-jobs?infoTypeId=type101 $(($NUM_JOBS/5)) + ics_equal json:data-consumer/v1/info-jobs?infoTypeId=type102 $(($NUM_JOBS/5)) + ics_equal json:data-consumer/v1/info-jobs?infoTypeId=type103 $(($NUM_JOBS/5)) + ics_equal json:data-consumer/v1/info-jobs?infoTypeId=type104 $(($NUM_JOBS/5)) + ics_equal json:data-consumer/v1/info-jobs?infoTypeId=type105 $(($NUM_JOBS/5)) fi for ((i=1; i<=$NUM_JOBS; i++)) do if [ $(($i%5)) -eq 0 ]; then - if [ $ECS_VERSION == "V1-1" ]; then - prodstub_check_jobdata 200 prod-a job$i type1 $TARGET ric1 testdata/ecs/job-template.json - prodstub_check_jobdata 200 prod-b job$i type1 $TARGET ric1 testdata/ecs/job-template.json - prodstub_check_jobdata 200 prod-c job$i type1 $TARGET ric1 testdata/ecs/job-template.json + if [ $ICS_VERSION == "V1-1" ]; then + prodstub_check_jobdata 200 prod-a job$i type1 $TARGET ric1 testdata/ics/job-template.json + prodstub_check_jobdata 200 prod-b job$i type1 $TARGET ric1 testdata/ics/job-template.json + prodstub_check_jobdata 200 prod-c job$i type1 $TARGET ric1 testdata/ics/job-template.json else if [ $use_info_jobs ]; then - prodstub_check_jobdata_3 200 prod-a job$i type1 $TARGET ric1 testdata/ecs/job-template.json - prodstub_check_jobdata_3 200 prod-b job$i type1 $TARGET ric1 testdata/ecs/job-template.json - prodstub_check_jobdata_3 200 prod-c job$i type1 $TARGET ric1 testdata/ecs/job-template.json + prodstub_check_jobdata_3 200 prod-a job$i type1 $TARGET ric1 testdata/ics/job-template.json + prodstub_check_jobdata_3 200 prod-b job$i type1 $TARGET ric1 testdata/ics/job-template.json + prodstub_check_jobdata_3 200 prod-c job$i type1 $TARGET ric1 testdata/ics/job-template.json else - prodstub_check_jobdata_2 200 prod-a job$i type1 $TARGET ric1 testdata/ecs/job-template.json - prodstub_check_jobdata_2 200 prod-b job$i type1 $TARGET ric1 testdata/ecs/job-template.json - prodstub_check_jobdata_2 200 prod-c job$i type1 $TARGET ric1 testdata/ecs/job-template.json + prodstub_check_jobdata_2 200 prod-a job$i type1 $TARGET ric1 testdata/ics/job-template.json + prodstub_check_jobdata_2 200 prod-b job$i type1 $TARGET ric1 testdata/ics/job-template.json + prodstub_check_jobdata_2 200 prod-c job$i type1 $TARGET ric1 testdata/ics/job-template.json fi fi if [ $use_info_jobs ]; then - prodstub_check_jobdata_3 200 prod-a job$(($i+$NUM_JOBS)) type101 $TARGET info-owner testdata/ecs/job-template.json - prodstub_check_jobdata_3 200 prod-b job$(($i+$NUM_JOBS)) type101 $TARGET info-owner testdata/ecs/job-template.json - prodstub_check_jobdata_3 200 prod-c job$(($i+$NUM_JOBS)) type101 $TARGET info-owner testdata/ecs/job-template.json + prodstub_check_jobdata_3 200 prod-a job$(($i+$NUM_JOBS)) type101 $TARGET info-owner testdata/ics/job-template.json + prodstub_check_jobdata_3 200 prod-b job$(($i+$NUM_JOBS)) type101 $TARGET info-owner testdata/ics/job-template.json + prodstub_check_jobdata_3 200 prod-c job$(($i+$NUM_JOBS)) type101 $TARGET info-owner testdata/ics/job-template.json fi fi if [ $(($i%5)) -eq 1 ]; then - if [ $ECS_VERSION == "V1-1" ]; then - prodstub_check_jobdata 200 prod-b job$i type2 $TARGET ric1 testdata/ecs/job-template.json - prodstub_check_jobdata 200 prod-c job$i type2 $TARGET ric1 testdata/ecs/job-template.json + if [ $ICS_VERSION == "V1-1" ]; then + prodstub_check_jobdata 200 prod-b job$i type2 $TARGET ric1 testdata/ics/job-template.json + prodstub_check_jobdata 200 prod-c job$i type2 $TARGET ric1 testdata/ics/job-template.json else if [ $use_info_jobs ]; then - prodstub_check_jobdata_3 200 prod-b job$i type2 $TARGET ric1 testdata/ecs/job-template.json - prodstub_check_jobdata_3 200 prod-c job$i type2 $TARGET ric1 testdata/ecs/job-template.json + prodstub_check_jobdata_3 200 prod-b job$i type2 $TARGET ric1 testdata/ics/job-template.json + prodstub_check_jobdata_3 200 prod-c job$i type2 $TARGET ric1 testdata/ics/job-template.json else - prodstub_check_jobdata_2 200 prod-b job$i type2 $TARGET ric1 testdata/ecs/job-template.json - prodstub_check_jobdata_2 200 prod-c job$i type2 $TARGET ric1 testdata/ecs/job-template.json + prodstub_check_jobdata_2 200 prod-b job$i type2 $TARGET ric1 testdata/ics/job-template.json + prodstub_check_jobdata_2 200 prod-c job$i type2 $TARGET ric1 testdata/ics/job-template.json fi fi if [ $use_info_jobs ]; then - prodstub_check_jobdata_3 200 prod-b job$(($i+$NUM_JOBS)) type102 $TARGET info-owner testdata/ecs/job-template.json - prodstub_check_jobdata_3 200 prod-c job$(($i+$NUM_JOBS)) type102 $TARGET info-owner testdata/ecs/job-template.json + prodstub_check_jobdata_3 200 prod-b job$(($i+$NUM_JOBS)) type102 $TARGET info-owner testdata/ics/job-template.json + prodstub_check_jobdata_3 200 prod-c job$(($i+$NUM_JOBS)) type102 $TARGET info-owner testdata/ics/job-template.json fi fi if [ $(($i%5)) -eq 2 ]; then - if [ $ECS_VERSION == "V1-1" ]; then - prodstub_check_jobdata 200 prod-c job$i type3 $TARGET ric1 testdata/ecs/job-template.json + if [ $ICS_VERSION == "V1-1" ]; then + prodstub_check_jobdata 200 prod-c job$i type3 $TARGET ric1 testdata/ics/job-template.json else if [ $use_info_jobs ]; then - prodstub_check_jobdata_3 200 prod-c job$i type3 $TARGET ric1 testdata/ecs/job-template.json + prodstub_check_jobdata_3 200 prod-c job$i type3 $TARGET ric1 testdata/ics/job-template.json else - prodstub_check_jobdata_2 200 prod-c job$i type3 $TARGET ric1 testdata/ecs/job-template.json + prodstub_check_jobdata_2 200 prod-c job$i type3 $TARGET ric1 testdata/ics/job-template.json fi fi if [ $use_info_jobs ]; then - prodstub_check_jobdata_3 200 prod-c job$(($i+$NUM_JOBS)) type103 $TARGET info-owner testdata/ecs/job-template.json + prodstub_check_jobdata_3 200 prod-c job$(($i+$NUM_JOBS)) type103 $TARGET info-owner testdata/ics/job-template.json fi fi if [ $(($i%5)) -eq 3 ]; then - if [ $ECS_VERSION == "V1-1" ]; then - prodstub_check_jobdata 200 prod-d job$i type4 $TARGET ric1 testdata/ecs/job-template.json + if [ $ICS_VERSION == "V1-1" ]; then + prodstub_check_jobdata 200 prod-d job$i type4 $TARGET ric1 testdata/ics/job-template.json else if [ $use_info_jobs ]; then - prodstub_check_jobdata_3 200 prod-d job$i type4 $TARGET ric1 testdata/ecs/job-template.json + prodstub_check_jobdata_3 200 prod-d job$i type4 $TARGET ric1 testdata/ics/job-template.json else - prodstub_check_jobdata_2 200 prod-d job$i type4 $TARGET ric1 testdata/ecs/job-template.json + prodstub_check_jobdata_2 200 prod-d job$i type4 $TARGET ric1 testdata/ics/job-template.json fi fi if [ $use_info_jobs ]; then - prodstub_check_jobdata_3 200 prod-d job$(($i+$NUM_JOBS)) type104 $TARGET info-owner testdata/ecs/job-template.json + prodstub_check_jobdata_3 200 prod-d job$(($i+$NUM_JOBS)) type104 $TARGET info-owner testdata/ics/job-template.json fi fi if [ $(($i%5)) -eq 4 ]; then - if [ $ECS_VERSION == "V1-1" ]; then - prodstub_check_jobdata 200 prod-d job$i type5 $TARGET ric1 testdata/ecs/job-template.json + if [ $ICS_VERSION == "V1-1" ]; then + prodstub_check_jobdata 200 prod-d job$i type5 $TARGET ric1 testdata/ics/job-template.json else if [ $use_info_jobs ]; then - prodstub_check_jobdata_3 200 prod-d job$i type5 $TARGET ric1 testdata/ecs/job-template.json + prodstub_check_jobdata_3 200 prod-d job$i type5 $TARGET ric1 testdata/ics/job-template.json else - prodstub_check_jobdata_2 200 prod-d job$i type5 $TARGET ric1 testdata/ecs/job-template.json + prodstub_check_jobdata_2 200 prod-d job$i type5 $TARGET ric1 testdata/ics/job-template.json fi fi if [ $use_info_jobs ]; then - prodstub_check_jobdata_3 200 prod-d job$(($i+$NUM_JOBS)) type105 $TARGET info-owner testdata/ecs/job-template.json + prodstub_check_jobdata_3 200 prod-d job$(($i+$NUM_JOBS)) type105 $TARGET info-owner testdata/ics/job-template.json fi fi done @@ -705,104 +705,104 @@ done for ((i=1; i<=$NUM_JOBS; i++)) do if [ $(($i%5)) -eq 0 ]; then - ecs_api_a1_delete_job 204 job$i + ics_api_a1_delete_job 204 job$i if [ $use_info_jobs ]; then - ecs_api_idc_delete_job 204 job$(($i+$NUM_JOBS)) + ics_api_idc_delete_job 204 job$(($i+$NUM_JOBS)) fi fi if [ $(($i%5)) -eq 1 ]; then - ecs_api_a1_delete_job 204 job$i + ics_api_a1_delete_job 204 job$i if [ $use_info_jobs ]; then - ecs_api_idc_delete_job 204 job$(($i+$NUM_JOBS)) + ics_api_idc_delete_job 204 job$(($i+$NUM_JOBS)) fi fi if [ $(($i%5)) -eq 2 ]; then - ecs_api_a1_delete_job 204 job$i + ics_api_a1_delete_job 204 job$i if [ $use_info_jobs ]; then - ecs_api_idc_delete_job 204 job$(($i+$NUM_JOBS)) + ics_api_idc_delete_job 204 job$(($i+$NUM_JOBS)) fi fi if [ $(($i%5)) -eq 3 ]; then - ecs_api_a1_delete_job 204 job$i + ics_api_a1_delete_job 204 job$i if [ $use_info_jobs ]; then - ecs_api_idc_delete_job 204 job$(($i+$NUM_JOBS)) + ics_api_idc_delete_job 204 job$(($i+$NUM_JOBS)) fi fi if [ $(($i%5)) -eq 4 ]; then - ecs_api_a1_delete_job 204 job$i + ics_api_a1_delete_job 204 job$i if [ $use_info_jobs ]; then - ecs_api_idc_delete_job 204 job$(($i+$NUM_JOBS)) + ics_api_idc_delete_job 204 job$(($i+$NUM_JOBS)) fi fi done if [ $use_info_jobs ]; then - ecs_equal json:data-producer/v1/info-producers 4 + ics_equal json:data-producer/v1/info-producers 4 else - ecs_equal json:ei-producer/v1/eiproducers 4 + ics_equal json:ei-producer/v1/eiproducers 4 fi -ecs_api_edp_get_producer_status 200 prod-a ENABLED -ecs_api_edp_get_producer_status 200 prod-b ENABLED -ecs_api_edp_get_producer_status 200 prod-c ENABLED -ecs_api_edp_get_producer_status 200 prod-d ENABLED +ics_api_edp_get_producer_status 200 prod-a ENABLED +ics_api_edp_get_producer_status 200 prod-b ENABLED +ics_api_edp_get_producer_status 200 prod-c ENABLED +ics_api_edp_get_producer_status 200 prod-d ENABLED if [ -z "$FLAT_A1_EI" ]; then - ecs_equal json:A1-EI/v1/eitypes/type1/eijobs 0 - ecs_equal json:A1-EI/v1/eitypes/type2/eijobs 0 - ecs_equal json:A1-EI/v1/eitypes/type3/eijobs 0 - ecs_equal json:A1-EI/v1/eitypes/type4/eijobs 0 - ecs_equal json:A1-EI/v1/eitypes/type5/eijobs 0 + ics_equal json:A1-EI/v1/eitypes/type1/eijobs 0 + ics_equal json:A1-EI/v1/eitypes/type2/eijobs 0 + ics_equal json:A1-EI/v1/eitypes/type3/eijobs 0 + ics_equal json:A1-EI/v1/eitypes/type4/eijobs 0 + ics_equal json:A1-EI/v1/eitypes/type5/eijobs 0 else - ecs_equal json:A1-EI/v1/eijobs?eiTypeId=type1 0 - ecs_equal json:A1-EI/v1/eijobs?eiTypeId=type2 0 - ecs_equal json:A1-EI/v1/eijobs?eiTypeId=type3 0 - ecs_equal json:A1-EI/v1/eijobs?eiTypeId=type4 0 - ecs_equal json:A1-EI/v1/eijobs?eiTypeId=type5 0 + ics_equal json:A1-EI/v1/eijobs?eiTypeId=type1 0 + ics_equal json:A1-EI/v1/eijobs?eiTypeId=type2 0 + ics_equal json:A1-EI/v1/eijobs?eiTypeId=type3 0 + ics_equal json:A1-EI/v1/eijobs?eiTypeId=type4 0 + ics_equal json:A1-EI/v1/eijobs?eiTypeId=type5 0 fi if [ $use_info_jobs ]; then - ecs_equal json:data-consumer/v1/info-jobs?infoTypeId=type101 0 - ecs_equal json:data-consumer/v1/info-jobs?infoTypeId=type102 0 - ecs_equal json:data-consumer/v1/info-jobs?infoTypeId=type103 0 - ecs_equal json:data-consumer/v1/info-jobs?infoTypeId=type104 0 - ecs_equal json:data-consumer/v1/info-jobs?infoTypeId=type105 0 + ics_equal json:data-consumer/v1/info-jobs?infoTypeId=type101 0 + ics_equal json:data-consumer/v1/info-jobs?infoTypeId=type102 0 + ics_equal json:data-consumer/v1/info-jobs?infoTypeId=type103 0 + ics_equal json:data-consumer/v1/info-jobs?infoTypeId=type104 0 + ics_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 + if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then + ics_api_edp_put_type_2 200 type101 testdata/ics/info-type-1.json + ics_api_edp_put_type_2 200 type102 testdata/ics/info-type-2.json + ics_api_edp_put_type_2 200 type103 testdata/ics/info-type-3.json + ics_api_edp_put_type_2 200 type104 testdata/ics/info-type-4.json + ics_api_edp_put_type_2 200 type105 testdata/ics/info-type-5.json fi fi -if [[ "$ECS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then +if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then cr_equal 0 received_callbacks 10 30 cr_equal 0 received_callbacks?id=type-status1 5 cr_equal 0 received_callbacks?id=type-status2 5 - cr_api_check_all_ecs_subscription_events 200 0 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_ics_subscription_events 200 0 type-status1 \ + type101 testdata/ics/info-type-1.json REGISTERED \ + type102 testdata/ics/info-type-2.json REGISTERED \ + type103 testdata/ics/info-type-3.json REGISTERED \ + type104 testdata/ics/info-type-4.json REGISTERED \ + type105 testdata/ics/info-type-5.json REGISTERED - cr_api_check_all_ecs_subscription_events 200 0 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 + cr_api_check_all_ics_subscription_events 200 0 type-status2 \ + type101 testdata/ics/info-type-1.json REGISTERED \ + type102 testdata/ics/info-type-2.json REGISTERED \ + type103 testdata/ics/info-type-3.json REGISTERED \ + type104 testdata/ics/info-type-4.json REGISTERED \ + type105 testdata/ics/info-type-5.json REGISTERED else cr_equal 0 received_callbacks 0 30 fi -check_ecs_logs +check_ics_logs store_logs END diff --git a/test/auto-test/FTC2001.sh b/test/auto-test/FTC2001.sh index e7d511fd..fa1aea12 100755 --- a/test/auto-test/FTC2001.sh +++ b/test/auto-test/FTC2001.sh @@ -17,13 +17,13 @@ # ============LICENSE_END================================================= # -TC_ONELINE_DESCR="Testing southbound proxy for PMS and ECS" +TC_ONELINE_DESCR="Testing southbound proxy for PMS and ICS" #App names to include in the test when running docker, space separated list -DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM ECS PRODSTUB HTTPPROXY NGW KUBEPROXY" +DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM ICS PRODSTUB HTTPPROXY NGW KUBEPROXY" #App names to include in the test when running kubernetes, space separated list -KUBE_INCLUDED_IMAGES=" MR CR PA PRODSTUB RICSIM CP ECS HTTPPROXY KUBEPROXY NGW" +KUBE_INCLUDED_IMAGES=" MR CR PA PRODSTUB RICSIM CP ICS HTTPPROXY KUBEPROXY NGW" #Prestarted app (not started by script) to include in the test when running kubernetes, space separated list KUBE_PRESTARTED_IMAGES="" @@ -49,7 +49,7 @@ setup_testenvironment use_cr_https use_agent_rest_https use_simulator_https -use_ecs_rest_https +use_ics_rest_https use_prod_stub_https if [ "$PMS_VERSION" == "V2" ]; then @@ -95,11 +95,11 @@ start_cr 1 start_prod_stub -start_ecs PROXY $SIM_GROUP/$ECS_COMPOSE_DIR/$ECS_CONFIG_FILE +start_ics PROXY $SIM_GROUP/$ICS_COMPOSE_DIR/$ICS_CONFIG_FILE set_agent_trace -set_ecs_debug +set_ics_debug api_get_status 200 @@ -179,50 +179,50 @@ prodstub_arm_type 200 prod-a type1 prodstub_arm_job_create 200 prod-a job1 prodstub_arm_job_create 200 prod-a job2 -### ecs status -ecs_api_service_status 200 +### ics status +ics_api_service_status 200 -if [[ "$ECS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then +if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then #Type registration status callbacks TYPESTATUS1="$CR_SERVICE_APP_PATH_0/type-status1" - ecs_api_idc_put_subscription 201 subscription-id-1 owner1 $TYPESTATUS1 + ics_api_idc_put_subscription 201 subscription-id-1 owner1 $TYPESTATUS1 - ecs_api_idc_get_subscription_ids 200 owner1 subscription-id-1 + ics_api_idc_get_subscription_ids 200 owner1 subscription-id-1 fi ## Setup prod-a -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 +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 - ecs_api_edp_get_producer 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 testdata/ecs/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 - ecs_api_edp_put_type_2 201 type1 testdata/ecs/ei-type-1.json + ics_api_edp_put_type_2 201 type1 testdata/ics/ei-type-1.json - ecs_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 - ecs_api_edp_get_producer_2 200 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 -ecs_api_edp_get_producer_status 200 prod-a ENABLED +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 - ecs_api_a1_put_job 201 type1 job1 $TARGET1 ricsim_g3_1 testdata/ecs/job-template.json + ics_api_a1_put_job 201 type1 job1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json else - ecs_api_a1_put_job 201 job1 type1 $TARGET1 ricsim_g3_1 $STATUS1 testdata/ecs/job-template.json + ics_api_a1_put_job 201 job1 type1 $TARGET1 ricsim_g3_1 $STATUS1 testdata/ics/job-template.json fi # Check the job data in the producer -if [ $ECS_VERSION == "V1-1" ]; then - prodstub_check_jobdata 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ecs/job-template.json +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 [[ "$ECS_FEATURE_LEVEL" != *"INFO-TYPES"* ]]; then - prodstub_check_jobdata_2 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ecs/job-template.json + 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/ecs/job-template.json + prodstub_check_jobdata_3 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json fi fi @@ -230,19 +230,19 @@ fi ## Create a second job for prod-a ## job2 - prod-a if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_put_job 201 type1 job2 $TARGET2 ricsim_g3_2 testdata/ecs/job-template.json + ics_api_a1_put_job 201 type1 job2 $TARGET2 ricsim_g3_2 testdata/ics/job-template.json else - ecs_api_a1_put_job 201 job2 type1 $TARGET2 ricsim_g3_2 $STATUS2 testdata/ecs/job-template.json + ics_api_a1_put_job 201 job2 type1 $TARGET2 ricsim_g3_2 $STATUS2 testdata/ics/job-template.json fi # Check the job data in the producer -if [ $ECS_VERSION == "V1-1" ]; then - prodstub_check_jobdata 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ecs/job-template.json +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 [[ "$ECS_FEATURE_LEVEL" != *"INFO-TYPES"* ]]; then - prodstub_check_jobdata_2 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ecs/job-template.json + 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/ecs/job-template.json + prodstub_check_jobdata_3 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ics/job-template.json fi fi @@ -250,29 +250,29 @@ fi 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 +ics_api_edp_get_producer_status 200 prod-a DISABLED 360 -if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then - ecs_equal json:data-producer/v1/info-producers 0 1000 +if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then + ics_equal json:data-producer/v1/info-producers 0 1000 else - ecs_equal json:ei-producer/v1/eiproducers 0 1000 + ics_equal json:ei-producer/v1/eiproducers 0 1000 fi -if [[ "$ECS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then +if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then cr_equal 0 received_callbacks 3 30 - cr_api_check_all_ecs_subscription_events 200 0 type-status1 type1 testdata/ecs/ei-type-1.json REGISTERED - cr_api_check_all_ecs_events 200 0 job1-status DISABLED - cr_api_check_all_ecs_events 200 0 job2-status DISABLED + cr_api_check_all_ics_subscription_events 200 0 type-status1 type1 testdata/ics/ei-type-1.json REGISTERED + cr_api_check_all_ics_events 200 0 job1-status DISABLED + cr_api_check_all_ics_events 200 0 job2-status DISABLED else cr_equal 0 received_callbacks 2 30 - cr_api_check_all_ecs_events 200 0 job1-status DISABLED - cr_api_check_all_ecs_events 200 0 job2-status DISABLED + cr_api_check_all_ics_events 200 0 job1-status DISABLED + cr_api_check_all_ics_events 200 0 job2-status DISABLED fi cr_contains_str 0 remote_hosts $HTTP_PROXY_APP_NAME check_policy_agent_logs -check_ecs_logs +check_ics_logs #### TEST COMPLETE #### diff --git a/test/auto-test/FTC2003.sh b/test/auto-test/FTC2003.sh index ae0fbb60..32412b7c 100755 --- a/test/auto-test/FTC2003.sh +++ b/test/auto-test/FTC2003.sh @@ -20,10 +20,10 @@ TC_ONELINE_DESCR="Testing southbound proxy for Dmaap Adaptor" #App names to include in the test when running docker, space separated list -DOCKER_INCLUDED_IMAGES="CR MR ECS HTTPPROXY KUBEPROXY DMAAPADP" +DOCKER_INCLUDED_IMAGES="CR MR ICS HTTPPROXY KUBEPROXY DMAAPADP" #App names to include in the test when running kubernetes, space separated list -KUBE_INCLUDED_IMAGES=" CR MR ECS HTTPPROXY KUBEPROXY DMAAPADP" +KUBE_INCLUDED_IMAGES=" CR MR ICS HTTPPROXY KUBEPROXY DMAAPADP" #Prestarted app (not started by script) to include in the test when running kubernetes, space separated list KUBE_PRESTARTED_IMAGES="" @@ -52,7 +52,7 @@ NUM_JOBS=10 clean_environment use_cr_https -use_ecs_rest_https +use_ics_rest_https use_mr_https use_dmaapadp_https @@ -62,9 +62,9 @@ start_http_proxy start_cr 1 -start_ecs NOPROXY $SIM_GROUP/$ECS_COMPOSE_DIR/$ECS_CONFIG_FILE +start_ics NOPROXY $SIM_GROUP/$ICS_COMPOSE_DIR/$ICS_CONFIG_FILE -set_ecs_trace +set_ics_trace start_mr @@ -72,26 +72,26 @@ start_dmaapadp PROXY $SIM_GROUP/$DMAAP_ADP_COMPOSE_DIR/$DMAAP_ADP_CONFIG_FILE $S set_dmaapadp_trace -if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then - ecs_equal json:data-producer/v1/info-producers 1 60 +if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then + ics_equal json:data-producer/v1/info-producers 1 60 else - ecs_equal json:ei-producer/v1/eiproducers 1 60 + ics_equal json:ei-producer/v1/eiproducers 1 60 fi -ecs_api_idc_get_job_ids 200 NOTYPE NOWNER EMPTY -ecs_api_idc_get_type_ids 200 ExampleInformationType +ics_api_idc_get_job_ids 200 NOTYPE NOWNER EMPTY +ics_api_idc_get_type_ids 200 ExampleInformationType -ecs_api_edp_get_producer_ids_2 200 NOTYPE DmaapGenericInfoProducer +ics_api_edp_get_producer_ids_2 200 NOTYPE DmaapGenericInfoProducer for ((i=1; i<=$NUM_JOBS; i++)) do - ecs_api_idc_put_job 201 joby$i ExampleInformationType $CR_SERVICE_MR_PATH_0/joby-data$i info-ownery$i $CR_SERVICE_MR_PATH_0/job_status_info-ownery$i testdata/dmaap-adapter/job-template.json + ics_api_idc_put_job 201 joby$i ExampleInformationType $CR_SERVICE_MR_PATH_0/joby-data$i info-ownery$i $CR_SERVICE_MR_PATH_0/job_status_info-ownery$i testdata/dmaap-adapter/job-template.json done for ((i=1; i<=$NUM_JOBS; i++)) do - ecs_api_a1_get_job_status 200 joby$i ENABLED 30 + ics_api_a1_get_job_status 200 joby$i ENABLED 30 done diff --git a/test/auto-test/FTC3000.sh b/test/auto-test/FTC3000.sh index a1c4fcaa..04a749be 100755 --- a/test/auto-test/FTC3000.sh +++ b/test/auto-test/FTC3000.sh @@ -20,10 +20,10 @@ TC_ONELINE_DESCR="App test DMAAP Meditor and DMAAP Adapter" #App names to include in the test when running docker, space separated list -DOCKER_INCLUDED_IMAGES="ECS DMAAPMED DMAAPADP KUBEPROXY MR DMAAPMR CR" +DOCKER_INCLUDED_IMAGES="ICS DMAAPMED DMAAPADP KUBEPROXY MR DMAAPMR CR" #App names to include in the test when running kubernetes, space separated list -KUBE_INCLUDED_IMAGES=" ECS DMAAPMED DMAAPADP KUBEPROXY MR DMAAPMR CR" +KUBE_INCLUDED_IMAGES=" ICS DMAAPMED DMAAPADP KUBEPROXY MR DMAAPMR CR" #Prestarted app (not started by script) to include in the test when running kubernetes, space separated list KUBE_PRESTARTED_IMAGES="" @@ -59,7 +59,7 @@ clean_environment #use_cr_https use_cr_http -use_ecs_rest_https +use_ics_rest_https use_mr_https use_dmaapadp_https use_dmaapmed_https @@ -68,9 +68,9 @@ start_kube_proxy start_cr $NUM_CR -start_ecs NOPROXY $SIM_GROUP/$ECS_COMPOSE_DIR/$ECS_CONFIG_FILE +start_ics NOPROXY $SIM_GROUP/$ICS_COMPOSE_DIR/$ICS_CONFIG_FILE -set_ecs_trace +set_ics_trace start_mr "unauthenticated.dmaapmed.json" "/events" "dmaapmediatorproducer/STD_Fault_Messages" \ "unauthenticated.dmaapadp.json" "/events" "dmaapadapterproducer/msgs" \ @@ -82,12 +82,12 @@ set_dmaapadp_trace start_dmaapmed NOPROXY $SIM_GROUP/$DMAAP_MED_COMPOSE_DIR/$DMAAP_MED_DATA_FILE -ecs_equal json:data-producer/v1/info-producers 2 60 +ics_equal json:data-producer/v1/info-producers 2 60 # Check producers -ecs_api_idc_get_job_ids 200 NOTYPE NOWNER EMPTY -ecs_api_idc_get_type_ids 200 ExampleInformationType STD_Fault_Messages ExampleInformationTypeKafka -ecs_api_edp_get_producer_ids_2 200 NOTYPE DmaapGenericInfoProducer DMaaP_Mediator_Producer +ics_api_idc_get_job_ids 200 NOTYPE NOWNER EMPTY +ics_api_idc_get_type_ids 200 ExampleInformationType STD_Fault_Messages ExampleInformationTypeKafka +ics_api_edp_get_producer_ids_2 200 NOTYPE DmaapGenericInfoProducer DMaaP_Mediator_Producer # Create jobs for adapter - CR stores data as MD5 hash @@ -97,7 +97,7 @@ do cr_index=$(($i%$NUM_CR)) service_mr="CR_SERVICE_MR_PATH_"$cr_index service_app="CR_SERVICE_APP_PATH_"$cr_index - ecs_api_idc_put_job 201 job-adp-$i ExampleInformationType ${!service_mr}/job-adp-data$i"?storeas=md5" info-owner-adp-$i ${!service_app}/job_status_info-owner-adp-$i testdata/dmaap-adapter/job-template.json + ics_api_idc_put_job 201 job-adp-$i ExampleInformationType ${!service_mr}/job-adp-data$i"?storeas=md5" info-owner-adp-$i ${!service_app}/job_status_info-owner-adp-$i testdata/dmaap-adapter/job-template.json done print_timer @@ -109,7 +109,7 @@ do cr_index=$(($i%$NUM_CR)) service_text="CR_SERVICE_TEXT_PATH_"$cr_index service_app="CR_SERVICE_APP_PATH_"$cr_index - ecs_api_idc_put_job 201 job-adp-kafka-$i ExampleInformationTypeKafka ${!service_text}/job-adp-kafka-data$i"?storeas=md5" info-owner-adp-kafka-$i ${!service_app}/job_status_info-owner-adp-kafka-$i testdata/dmaap-adapter/job-template-1-kafka.json + ics_api_idc_put_job 201 job-adp-kafka-$i ExampleInformationTypeKafka ${!service_text}/job-adp-kafka-data$i"?storeas=md5" info-owner-adp-kafka-$i ${!service_app}/job_status_info-owner-adp-kafka-$i testdata/dmaap-adapter/job-template-1-kafka.json done print_timer @@ -121,16 +121,16 @@ do cr_index=$(($i%$NUM_CR)) service_mr="CR_SERVICE_MR_PATH_"$cr_index service_app="CR_SERVICE_APP_PATH_"$cr_index - ecs_api_idc_put_job 201 job-med-$i STD_Fault_Messages ${!service_mr}/job-med-data$i"?storeas=md5" info-owner-med-$i ${!service_app}/job_status_info-owner-med-$i testdata/dmaap-adapter/job-template.json + ics_api_idc_put_job 201 job-med-$i STD_Fault_Messages ${!service_mr}/job-med-data$i"?storeas=md5" info-owner-med-$i ${!service_app}/job_status_info-owner-med-$i testdata/dmaap-adapter/job-template.json done print_timer # Check job status for ((i=1; i<=$NUM_JOBS; i++)) do - ecs_api_a1_get_job_status 200 job-med-$i ENABLED 30 - ecs_api_a1_get_job_status 200 job-adp-$i ENABLED 30 - ecs_api_a1_get_job_status 200 job-adp-kafka-$i ENABLED 30 + ics_api_a1_get_job_status 200 job-med-$i ENABLED 30 + ics_api_a1_get_job_status 200 job-adp-$i ENABLED 30 + ics_api_a1_get_job_status 200 job-adp-kafka-$i ENABLED 30 done diff --git a/test/auto-test/FTC_HELM_E_RELEASE.sh b/test/auto-test/FTC_HELM_E_RELEASE.sh index 54f3e4d4..2a6a3075 100755 --- a/test/auto-test/FTC_HELM_E_RELEASE.sh +++ b/test/auto-test/FTC_HELM_E_RELEASE.sh @@ -27,7 +27,7 @@ DOCKER_INCLUDED_IMAGES="" # Not used - KUBE only test script #App names to include in the test when running kubernetes, space separated list KUBE_INCLUDED_IMAGES=" MR CR PRODSTUB KUBEPROXY" #Prestarted app (not started by script) to include in the test when running kubernetes, space separated list -KUBE_PRESTARTED_IMAGES=" PA RICSIM CP ECS RC SDNC DMAAPMED DMAAPADP" +KUBE_PRESTARTED_IMAGES=" PA RICSIM CP ICS RC SDNC DMAAPMED DMAAPADP" #Supported test environment profiles SUPPORTED_PROFILES="ORAN-E-RELEASE" @@ -45,10 +45,10 @@ use_cr_https use_agent_rest_https use_sdnc_https use_simulator_https -use_ecs_rest_https +use_ics_rest_https use_prod_stub_https -if [ $ECS_VERSION == "V1-1" ]; then +if [ $ICS_VERSION == "V1-1" ]; then use_rapp_catalogue_http # https not yet supported else ########################################use_rapp_catalogue_https @@ -69,7 +69,7 @@ clean_environment pms_kube_pvc_reset -ecs_kube_pvc_reset +ics_kube_pvc_reset start_kube_proxy @@ -100,9 +100,9 @@ start_cr 1 start_prod_stub -start_ecs NOPROXY +start_ics NOPROXY -set_ecs_trace +set_ics_trace start_rapp_catalogue @@ -319,7 +319,7 @@ echo "ADD MR CHECK" FLAT_A1_EI="1" -ecs_api_admin_reset +ics_api_admin_reset CB_JOB="$PROD_STUB_SERVICE_PATH$PROD_STUB_JOB_CALLBACK" CB_SV="$PROD_STUB_SERVICE_PATH$PROD_STUB_SUPERVISION_CALLBACK" @@ -335,61 +335,61 @@ prodstub_arm_job_create 200 prod-a job1 prodstub_arm_job_create 200 prod-a job2 -### ecs status -ecs_api_service_status 200 +### ics status +ics_api_service_status 200 ## Setup prod-a -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 +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 - ecs_api_edp_get_producer 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 testdata/ecs/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 - 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 + ics_api_edp_put_type_2 201 type1 testdata/ics/ei-type-1.json + ics_api_edp_get_type_2 200 type1 + ics_api_edp_get_type_ids 200 type1 - 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 + ics_api_edp_put_producer_2 201 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 + ics_api_edp_put_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 +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 - ecs_api_a1_put_job 201 type1 job1 $TARGET1 ricsim_g3_1 testdata/ecs/job-template.json + ics_api_a1_put_job 201 type1 job1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json else - ecs_api_a1_put_job 201 job1 type1 $TARGET1 ricsim_g3_1 $STATUS1 testdata/ecs/job-template.json + ics_api_a1_put_job 201 job1 type1 $TARGET1 ricsim_g3_1 $STATUS1 testdata/ics/job-template.json fi # Check the job data in the producer -if [ $ECS_VERSION == "V1-1" ]; then - prodstub_check_jobdata 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ecs/job-template.json +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 [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then - prodstub_check_jobdata_3 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ecs/job-template.json + if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then + prodstub_check_jobdata_3 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json else - prodstub_check_jobdata_2 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ecs/job-template.json + prodstub_check_jobdata_2 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json fi fi ## Create a second job for prod-a ## job2 - prod-a if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_put_job 201 type1 job2 $TARGET2 ricsim_g3_2 testdata/ecs/job-template.json + ics_api_a1_put_job 201 type1 job2 $TARGET2 ricsim_g3_2 testdata/ics/job-template.json else - ecs_api_a1_put_job 201 job2 type1 $TARGET2 ricsim_g3_2 $STATUS2 testdata/ecs/job-template.json + ics_api_a1_put_job 201 job2 type1 $TARGET2 ricsim_g3_2 $STATUS2 testdata/ics/job-template.json fi # Check the job data in the producer -if [ $ECS_VERSION == "V1-1" ]; then - prodstub_check_jobdata 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ecs/job-template.json +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 [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then - prodstub_check_jobdata_3 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ecs/job-template.json + if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then + prodstub_check_jobdata_3 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ics/job-template.json else - prodstub_check_jobdata_2 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ecs/job-template.json + prodstub_check_jobdata_2 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ics/job-template.json fi fi @@ -398,27 +398,27 @@ start_dmaapadp NOPROXY $SIM_GROUP/$DMAAP_ADP_COMPOSE_DIR/$DMAAP_ADP_CONFIG_FILE start_dmaapmed NOPROXY $SIM_GROUP/$DMAAP_MED_COMPOSE_DIR/$DMAAP_MED_DATA_FILE -ecs_equal json:ei-producer/v1/eiproducers 2 60 +ics_equal json:ei-producer/v1/eiproducers 2 60 -ecs_api_idc_get_type_ids 200 ExampleInformationType STD_Fault_Messages +ics_api_idc_get_type_ids 200 ExampleInformationType STD_Fault_Messages -ecs_api_edp_get_producer_ids_2 200 NOTYPE DmaapGenericInfoProducer DMaaP_Mediator_Producer +ics_api_edp_get_producer_ids_2 200 NOTYPE DmaapGenericInfoProducer DMaaP_Mediator_Producer NUM_JOBS=5 for ((i=1; i<=$NUM_JOBS; i++)) do - ecs_api_idc_put_job 201 jobx$i STD_Fault_Messages $CR_SERVICE_MR_PATH_0/jobx-data$i info-ownerx$i $CR_SERVICE_MR_PATH_0/job_status_info-ownerx$i testdata/dmaap-adapter/job-template.json + ics_api_idc_put_job 201 jobx$i STD_Fault_Messages $CR_SERVICE_MR_PATH_0/jobx-data$i info-ownerx$i $CR_SERVICE_MR_PATH_0/job_status_info-ownerx$i testdata/dmaap-adapter/job-template.json done for ((i=1; i<=$NUM_JOBS; i++)) do - ecs_api_idc_put_job 201 joby$i ExampleInformationType $CR_SERVICE_MR_PATH_0/joby-data$i info-ownery$i $CR_SERVICE_MR_PATH_0/job_status_info-ownery$i testdata/dmaap-adapter/job-template.json + ics_api_idc_put_job 201 joby$i ExampleInformationType $CR_SERVICE_MR_PATH_0/joby-data$i info-ownery$i $CR_SERVICE_MR_PATH_0/job_status_info-ownery$i testdata/dmaap-adapter/job-template.json done for ((i=1; i<=$NUM_JOBS; i++)) do - ecs_api_a1_get_job_status 200 jobx$i ENABLED 30 + ics_api_a1_get_job_status 200 jobx$i ENABLED 30 done mr_api_send_json "/events/unauthenticated.dmaapmed.json" '{"msg":"msg-0"}' @@ -442,22 +442,22 @@ do done -stop_ecs +stop_ics -start_stopped_ecs +start_stopped_ics -# Check ECS status after restart +# Check ICS status after restart if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_get_job_status 200 type1 job1 DISABLED - ecs_api_a1_get_job_status 200 type1 job2 DISABLED + ics_api_a1_get_job_status 200 type1 job1 DISABLED + ics_api_a1_get_job_status 200 type1 job2 DISABLED else - ecs_api_a1_get_job_status 200 job1 DISABLED - ecs_api_a1_get_job_status 200 job2 DISABLED + ics_api_a1_get_job_status 200 job1 DISABLED + ics_api_a1_get_job_status 200 job2 DISABLED fi check_policy_agent_logs -check_ecs_logs +check_ics_logs check_sdnc_logs #### TEST COMPLETE #### diff --git a/test/auto-test/PM_EI_DEMO.sh b/test/auto-test/PM_EI_DEMO.sh index deff4600..4e6b87ce 100755 --- a/test/auto-test/PM_EI_DEMO.sh +++ b/test/auto-test/PM_EI_DEMO.sh @@ -17,13 +17,13 @@ # ============LICENSE_END================================================= # -TC_ONELINE_DESCR="Preparation demo setup - policy management and enrichment information" +TC_ONELINE_DESCR="Preparation demo setup - policy management and information information" #App names to include in the test when running docker, space separated list -DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM SDNC ECS PRODSTUB RC HTTPPROXY KUBEPROXY NGW" +DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM SDNC ICS PRODSTUB RC HTTPPROXY KUBEPROXY NGW" #App names to include in the test when running kubernetes, space separated list -KUBE_INCLUDED_IMAGES=" MR CR PA RC PRODSTUB RICSIM CP ECS SDNC HTTPPROXY KUBEPROXY NGW" +KUBE_INCLUDED_IMAGES=" MR CR PA RC PRODSTUB RICSIM CP ICS SDNC HTTPPROXY KUBEPROXY NGW" #Prestarted app (not started by script) to include in the test when running kubernetes, space separated list KUBE_PRESTARTED_IMAGES="" @@ -50,9 +50,9 @@ use_cr_https use_agent_rest_https use_sdnc_https use_simulator_https -use_ecs_rest_https +use_ics_rest_https use_prod_stub_https -if [ $ECS_VERSION == "V1-1" ]; then +if [ $ICS_VERSION == "V1-1" ]; then use_rapp_catalogue_http # https not yet supported else use_rapp_catalogue_https @@ -104,16 +104,16 @@ start_cr 1 start_prod_stub -start_ecs PROXY $SIM_GROUP/$ECS_COMPOSE_DIR/$ECS_CONFIG_FILE +start_ics PROXY $SIM_GROUP/$ICS_COMPOSE_DIR/$ICS_CONFIG_FILE start_rapp_catalogue set_agent_trace -set_ecs_trace +set_ics_trace use_info_jobs=false #Set flag if interface supporting info-types is used -if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then +if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then use_info_jobs=true fi @@ -200,41 +200,41 @@ prodstub_arm_type 200 prod-a type1 prodstub_arm_job_create 200 prod-a job1 prodstub_arm_job_create 200 prod-a job2 -### ecs status -ecs_api_service_status 200 +### ics status +ics_api_service_status 200 ## Setup prod-a -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 +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 - ecs_api_edp_get_producer 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 testdata/ecs/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 - ecs_api_edp_put_type_2 201 type1 testdata/ecs/ei-type-1.json + ics_api_edp_put_type_2 201 type1 testdata/ics/ei-type-1.json - ecs_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 - ecs_api_edp_get_producer_2 200 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 -ecs_api_edp_get_producer_status 200 prod-a ENABLED +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 - ecs_api_a1_put_job 201 type1 job1 $TARGET1 ricsim_g3_1 testdata/ecs/job-template.json + ics_api_a1_put_job 201 type1 job1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json else - ecs_api_a1_put_job 201 job1 type1 $TARGET1 ricsim_g3_1 $STATUS1 testdata/ecs/job-template.json + ics_api_a1_put_job 201 job1 type1 $TARGET1 ricsim_g3_1 $STATUS1 testdata/ics/job-template.json fi # Check the job data in the producer -if [ $ECS_VERSION == "V1-1" ]; then - prodstub_check_jobdata 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ecs/job-template.json +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 [ $use_info_jobs ]; then - prodstub_check_jobdata_3 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ecs/job-template.json + prodstub_check_jobdata_3 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json else - prodstub_check_jobdata_2 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ecs/job-template.json + prodstub_check_jobdata_2 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json fi fi @@ -242,24 +242,24 @@ fi ## Create a second job for prod-a ## job2 - prod-a if [ -z "$FLAT_A1_EI" ]; then - ecs_api_a1_put_job 201 type1 job2 $TARGET2 ricsim_g3_2 testdata/ecs/job-template.json + ics_api_a1_put_job 201 type1 job2 $TARGET2 ricsim_g3_2 testdata/ics/job-template.json else - ecs_api_a1_put_job 201 job2 type1 $TARGET2 ricsim_g3_2 $STATUS2 testdata/ecs/job-template.json + ics_api_a1_put_job 201 job2 type1 $TARGET2 ricsim_g3_2 $STATUS2 testdata/ics/job-template.json fi # Check the job data in the producer -if [ $ECS_VERSION == "V1-1" ]; then - prodstub_check_jobdata 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ecs/job-template.json +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 [ $use_info_jobs ]; then - prodstub_check_jobdata_3 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ecs/job-template.json + prodstub_check_jobdata_3 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ics/job-template.json else - prodstub_check_jobdata_2 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ecs/job-template.json + prodstub_check_jobdata_2 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ics/job-template.json fi fi check_policy_agent_logs -check_ecs_logs +check_ics_logs check_sdnc_logs #### TEST COMPLETE #### diff --git a/test/auto-test/README.md b/test/auto-test/README.md index c914c674..cd3c7787 100644 --- a/test/auto-test/README.md +++ b/test/auto-test/README.md @@ -58,7 +58,7 @@ ONAP GUILIN >```./PM_DEMO.sh remote-remove kube release --env-file ../common/test_env-onap-guilin.sh``` -Note that ECS was not available before oran cherry so a test script without ECS is used. +Note that ICS was not available before oran cherry so a test script without ICS is used. ONAP HONOLULU ============= @@ -76,7 +76,7 @@ Note: When istanbul is released, add the 'release' arg to run released images. ## Test case categories -The test script are number using these basic categories where 0-999 are releated to the policy managment and 1000-1999 are related to enrichment management. 2000-2999 are for southbound http proxy. There are also demo test cases that test more or less all components. These test scripts does not use the numbering scheme below. +The test script are number using these basic categories where 0-999 are releated to the policy managment and 1000-1999 are related to information management. 2000-2999 are for southbound http proxy. There are also demo test cases that test more or less all components. These test scripts does not use the numbering scheme below. The numbering in each series corresponds to the following groupings 1-99 - Basic sanity tests @@ -89,9 +89,9 @@ The numbering in each series corresponds to the following groupings 900-999 - Misc test -11XX - ECS API Tests +11XX - ICS API Tests -18XX - ECS Stability and capacity test +18XX - ICS Stability and capacity test 2000 - Southbound http proxy tests diff --git a/test/auto-test/testdata/ecs/ei-type-1.json b/test/auto-test/testdata/ics/ei-type-1.json similarity index 100% rename from test/auto-test/testdata/ecs/ei-type-1.json rename to test/auto-test/testdata/ics/ei-type-1.json diff --git a/test/auto-test/testdata/ecs/ei-type-2.json b/test/auto-test/testdata/ics/ei-type-2.json similarity index 100% rename from test/auto-test/testdata/ecs/ei-type-2.json rename to test/auto-test/testdata/ics/ei-type-2.json diff --git a/test/auto-test/testdata/ecs/ei-type-3.json b/test/auto-test/testdata/ics/ei-type-3.json similarity index 100% rename from test/auto-test/testdata/ecs/ei-type-3.json rename to test/auto-test/testdata/ics/ei-type-3.json diff --git a/test/auto-test/testdata/ecs/ei-type-4.json b/test/auto-test/testdata/ics/ei-type-4.json similarity index 100% rename from test/auto-test/testdata/ecs/ei-type-4.json rename to test/auto-test/testdata/ics/ei-type-4.json diff --git a/test/auto-test/testdata/ecs/ei-type-5.json b/test/auto-test/testdata/ics/ei-type-5.json similarity index 100% rename from test/auto-test/testdata/ecs/ei-type-5.json rename to test/auto-test/testdata/ics/ei-type-5.json diff --git a/test/auto-test/testdata/ecs/ei-type-6.json b/test/auto-test/testdata/ics/ei-type-6.json similarity index 100% rename from test/auto-test/testdata/ecs/ei-type-6.json rename to test/auto-test/testdata/ics/ei-type-6.json diff --git a/test/auto-test/testdata/ecs/empty-type.json b/test/auto-test/testdata/ics/empty-type.json similarity index 100% rename from test/auto-test/testdata/ecs/empty-type.json rename to test/auto-test/testdata/ics/empty-type.json diff --git a/test/auto-test/testdata/ecs/info-type-1.json b/test/auto-test/testdata/ics/info-type-1.json similarity index 100% rename from test/auto-test/testdata/ecs/info-type-1.json rename to test/auto-test/testdata/ics/info-type-1.json diff --git a/test/auto-test/testdata/ecs/info-type-2.json b/test/auto-test/testdata/ics/info-type-2.json similarity index 100% rename from test/auto-test/testdata/ecs/info-type-2.json rename to test/auto-test/testdata/ics/info-type-2.json diff --git a/test/auto-test/testdata/ecs/info-type-3.json b/test/auto-test/testdata/ics/info-type-3.json similarity index 100% rename from test/auto-test/testdata/ecs/info-type-3.json rename to test/auto-test/testdata/ics/info-type-3.json diff --git a/test/auto-test/testdata/ecs/info-type-4.json b/test/auto-test/testdata/ics/info-type-4.json similarity index 100% rename from test/auto-test/testdata/ecs/info-type-4.json rename to test/auto-test/testdata/ics/info-type-4.json diff --git a/test/auto-test/testdata/ecs/info-type-5.json b/test/auto-test/testdata/ics/info-type-5.json similarity index 100% rename from test/auto-test/testdata/ecs/info-type-5.json rename to test/auto-test/testdata/ics/info-type-5.json diff --git a/test/auto-test/testdata/ecs/info-type-50.json b/test/auto-test/testdata/ics/info-type-50.json similarity index 100% rename from test/auto-test/testdata/ecs/info-type-50.json rename to test/auto-test/testdata/ics/info-type-50.json diff --git a/test/auto-test/testdata/ecs/info-type-6.json b/test/auto-test/testdata/ics/info-type-6.json similarity index 100% rename from test/auto-test/testdata/ecs/info-type-6.json rename to test/auto-test/testdata/ics/info-type-6.json diff --git a/test/auto-test/testdata/ecs/info-type-60.json b/test/auto-test/testdata/ics/info-type-60.json similarity index 100% rename from test/auto-test/testdata/ecs/info-type-60.json rename to test/auto-test/testdata/ics/info-type-60.json diff --git a/test/auto-test/testdata/ecs/info-type-info.json b/test/auto-test/testdata/ics/info-type-info.json similarity index 100% rename from test/auto-test/testdata/ecs/info-type-info.json rename to test/auto-test/testdata/ics/info-type-info.json diff --git a/test/auto-test/testdata/ecs/job-template.json b/test/auto-test/testdata/ics/job-template.json similarity index 100% rename from test/auto-test/testdata/ecs/job-template.json rename to test/auto-test/testdata/ics/job-template.json diff --git a/test/auto-test/testdata/ecs/job-template2.json b/test/auto-test/testdata/ics/job-template2.json similarity index 100% rename from test/auto-test/testdata/ecs/job-template2.json rename to test/auto-test/testdata/ics/job-template2.json diff --git a/test/common/README.md b/test/common/README.md index 11e2a978..c52ee9ce 100644 --- a/test/common/README.md +++ b/test/common/README.md @@ -9,7 +9,7 @@ Some of the scripts can also be used for other kinds of tests, for example basic Contains functions for adapting towards the Policy Management Service (PMS) API, also via dmaap (using a message-router stub interface) `api_curl.sh` \ -A common curl based function for the agent and ecs apis. Also partly used for the Callback receiver and RAPP Catalogue apis. +A common curl based function for the agent and ics apis. Also partly used for the Callback receiver and RAPP Catalogue apis. `clean-kube.sh` \ Cleans all services, deployments, pods, replica set etc started by the test environment in kubernetes. @@ -44,8 +44,8 @@ A python script to delete a batch of policies. The script is intended to run in `do_curl_function.sh` A script for executing a curl call with a specific url and optional payload. It also compare the response with an expected result in terms of response code and optional returned payload. Intended to be used by test script (for example basic test scripts of other components) -`ecs_api_functions.sh` \ -Contains functions for adapting towards the ECS API +`ics_api_functions.sh` \ +Contains functions for adapting towards the ICS API `extract_sdnc_reply.py` \ A python script to extract the information from an sdnc (A1 Controller) reply json. Helper for the test environment. @@ -1030,9 +1030,9 @@ Check the contents of all ric events received for a callback id. | `EMPTY` | Indicator for an empty list | | `` | Id of the ric | -## Function: cr_api_check_all_ecs_events() ## +## Function: cr_api_check_all_ics_events() ## -Check the contents of all current status events for one id from ECS +Check the contents of all current status events for one id from ICS | arg list | |--| @@ -1045,9 +1045,9 @@ Check the contents of all current status events for one id from ECS | `EMPTY` | Indicator for an empty list | | `` | Status string | -## Function: cr_api_check_all_ecs_subscription_events() ## +## Function: cr_api_check_all_ics_subscription_events() ## -Check the contents of all current subscription events for one id from ECS +Check the contents of all current subscription events for one id from ICS | arg list | |--| @@ -1072,81 +1072,81 @@ Reset the callback receiver | - | -# Description of functions in ecs_api_functions.sh # +# Description of functions in ics_api_functions.sh # -## Function: use_ecs_rest_http ## +## Function: use_ics_rest_http ## -Use http for all API calls to the ECS. This is the default protocol. +Use http for all API calls to the ICS. This is the default protocol. | arg list | |--| | None | -## Function: use_ecs_rest_https ## +## Function: use_ics_rest_https ## -Use https for all API calls to the ECS. +Use https for all API calls to the ICS. | arg list | |--| | None | -## Function: use_ecs_dmaap_http ## +## Function: use_ics_dmaap_http ## -Send and recieve all API calls to the ECS over Dmaap via the MR using http. +Send and recieve all API calls to the ICS over Dmaap via the MR using http. | arg list | |--| | None | -## Function: use_ecs_dmaap_https ## +## Function: use_ics_dmaap_https ## -Send and recieve all API calls to the ECS over Dmaap via the MR using https. +Send and recieve all API calls to the ICS over Dmaap via the MR using https. | arg list | |--| | None | -## Function: start_ecs ## +## Function: start_ics ## -Start the ECS container in docker or kube depending on running mode. +Start the ICS container in docker or kube depending on running mode. | arg list | |--| | None | -## Function: stop_ecs ## +## Function: stop_ics ## -Stop the ECS container. +Stop the ICS container. | arg list | |--| | None | -## Function: start_stopped_ecs ## +## Function: start_stopped_ics ## -Start a previously stopped ecs. +Start a previously stopped ics. | arg list | |--| | None | -## Function: set_ecs_debug ## +## Function: set_ics_debug ## -Configure the ECS log on debug level. The ECS must be running. +Configure the ICS log on debug level. The ICS must be running. | arg list | |--| | None | -## Function: set_ecs_trace ## +## Function: set_ics_trace ## -Configure the ECS log on trace level. The ECS must be running. +Configure the ICS log on trace level. The ICS must be running. | arg list | |--| | None | -## Function: check_ecs_logs ## +## Function: check_ics_logs ## -Check the ECS log for any warnings and errors and print the count of each. +Check the ICS log for any warnings and errors and print the count of each. | arg list | |--| | None | -## Function: ecs_equal ## +## Function: ics_equal ## -Tests if a variable value in the ECS is equal to a target value. +Tests if a variable value in the ICS is equal to a target value. Without the timeout, the test sets pass or fail immediately depending on if the variable is equal to the target or not. With the timeout, the test waits up to the timeout seconds before setting pass or fail depending on if the variable value becomes equal to the target value or not. See the 'a1-interface' repo for more details. @@ -1157,11 +1157,11 @@ See the 'a1-interface' repo for more details. | parameter | description | | --------- | ----------- | -| `` | Variable name in ecs | +| `` | Variable name in ics | | `` | Target value for the variable | | `` | Max time to wait for the variable to reach the target value | -## Function: ecs_api_a1_get_job_ids() ## +## Function: ics_api_a1_get_job_ids() ## Test of GET '/A1-EI​/v1​/eitypes​/{eiTypeId}​/eijobs' and optional check of the array of returned job ids. To test the response code only, provide the response code parameter as well as a type id and an owner id. @@ -1180,7 +1180,7 @@ To also test the response payload add the 'EMPTY' for an expected empty array or | `` | Id of the expected job | | `EMPTY` | The expected list of job id shall be empty | -## Function: ecs_api_a1_get_type() ## +## Function: ics_api_a1_get_type() ## Test of GET '/A1-EI​/v1​/eitypes​/{eiTypeId}' and optional check of the returned schema. To test the response code only, provide the response code parameter as well as the type-id. @@ -1196,7 +1196,7 @@ To also test the response payload add a path to the expected schema file. | `` | Id of the EI type | | `` | Path to a schema file to compare with the returned schema | -## Function: ecs_api_a1_get_type_ids() ## +## Function: ics_api_a1_get_type_ids() ## Test of GET '/A1-EI​/v1​/eitypes' and optional check of returned list of type ids. To test the response code only, provide the response only. @@ -1212,7 +1212,7 @@ To also test the response payload add the list of expected type ids (or EMPTY if | `EMPTY` | The expected list of type ids shall be empty | | `` | Id of the EI type | -## Function: ecs_api_a1_get_job_status() ## +## Function: ics_api_a1_get_job_status() ## Test of GET '/A1-EI​/v1​/eitypes​/{eiTypeId}​/eijobs​/{eiJobId}​/status' and optional check of the returned status. To test the response code only, provide the response code, type id and job id. @@ -1229,7 +1229,7 @@ To also test the response payload add the expected status. | `` | Id of the job | | `` | Expected status | -## Function: ecs_api_a1_get_job() ## +## Function: ics_api_a1_get_job() ## Test of GET '/A1-EI​/v1​/eitypes​/{eiTypeId}​/eijobs​/{eiJobId}' and optional check of the returned job. To test the response code only, provide the response code, type id and job id. @@ -1248,7 +1248,7 @@ To also test the response payload add the remaining parameters. | `` | Expected owner for the job | | `` | Path to a job template for job parameters of the job | -## Function: ecs_api_a1_delete_job() ## +## Function: ics_api_a1_delete_job() ## Test of DELETE '/A1-EI​/v1​/eitypes​/{eiTypeId}​/eijobs​/{eiJobId}'. To test, provide all the specified parameters. @@ -1263,7 +1263,7 @@ To test, provide all the specified parameters. | `` | Id of the EI type | | `` | Id of the job | -## Function: ecs_api_a1_put_job() ## +## Function: ics_api_a1_put_job() ## Test of PUT '/A1-EI​/v1​/eitypes​/{eiTypeId}​/eijobs​/{eiJobId}'. To test, provide all the specified parameters. @@ -1281,9 +1281,9 @@ To test, provide all the specified parameters. | `` | Owner of the job | | `` | Path to a job template for job parameters of the job | -## Function: ecs_api_edp_get_type_ids() ## +## Function: ics_api_edp_get_type_ids() ## -Test of GET '/ei-producer/v1/eitypes' or '/data-producer/v1/info-types' depending on ecs version and an optional check of the returned list of type ids. +Test of GET '/ei-producer/v1/eitypes' or '/data-producer/v1/info-types' depending on ics version and an optional check of the returned list of type ids. To test the response code only, provide the response code. To also test the response payload add list of expected type ids (or EMPTY if the list is expected to be empty). @@ -1297,9 +1297,9 @@ To also test the response payload add list of expected type ids (or EMPTY if the | `` | Id of the type | | `EMPTY` | The expected list of type ids shall be empty | -## Function: ecs_api_edp_get_producer_status() ## +## Function: ics_api_edp_get_producer_status() ## -Test of GET '/ei-producer/v1/eiproducers/{eiProducerId}/status' or '/data-producer/v1/info-producers/{infoProducerId}/status' depending on ecs version and optional check of the returned status. +Test of GET '/ei-producer/v1/eiproducers/{eiProducerId}/status' or '/data-producer/v1/info-producers/{infoProducerId}/status' depending on ics version and optional check of the returned status. To test the response code only, provide the response code and producer id. To also test the response payload add the expected status. @@ -1313,7 +1313,7 @@ To also test the response payload add the expected status. | `` | Id of the producer | | `` | The expected status string | -## Function: ecs_api_edp_get_producer_ids() ## +## Function: ics_api_edp_get_producer_ids() ## Test of GET '/ei-producer/v1/eiproducers' and optional check of the returned producer ids. To test the response code only, provide the response. @@ -1329,9 +1329,9 @@ To also test the response payload add the list of expected producer-ids (or EMPT | `` | Id of the producer | | `EMPTY` | The expected list of type ids shall be empty | -## Function: ecs_api_edp_get_producer_ids_2() ## +## Function: ics_api_edp_get_producer_ids_2() ## -Test of GET '/ei-producer/v1/eiproducers' or '/data-producer/v1/info-producers' depending on ecs version and optional check of the returned producer ids. +Test of GET '/ei-producer/v1/eiproducers' or '/data-producer/v1/info-producers' depending on ics version and optional check of the returned producer ids. To test the response code only, provide the response. To also test the response payload add the type (if any) and a list of expected producer-ids (or EMPTY if the list of ids is expected to be empty). @@ -1347,7 +1347,7 @@ To also test the response payload add the type (if any) and a list of expected p | `` | Id of the producer | | `EMPTY` | The expected list of type ids shall be empty | -## Function: ecs_api_edp_get_type() ## +## Function: ics_api_edp_get_type() ## Test of GET '/ei-producer/v1/eitypes/{eiTypeId}' and optional check of the returned type. To test the response code only, provide the response and the type-id. @@ -1365,9 +1365,9 @@ To also test the response payload add a path to a job schema file and a list exp | `` | Id of the producer | | `EMPTY` | The expected list of type ids shall be empty | -## Function: ecs_api_edp_get_type_2() ## +## Function: ics_api_edp_get_type_2() ## -Test of GET '/ei-producer/v1/eitypes/{eiTypeId}' or '/data-producer/v1/info-types/{infoTypeId}' depending on ecs version and optional check of the returned type. +Test of GET '/ei-producer/v1/eitypes/{eiTypeId}' or '/data-producer/v1/info-types/{infoTypeId}' depending on ics version and optional check of the returned type. To test the response code only, provide the response and the type-id. To also test the response payload add a path to a job schema file. @@ -1382,9 +1382,9 @@ To also test the response payload add a path to a job schema file. | `` | Path to a job schema file | | `EMPTY` | The expected list of type ids shall be empty | -## Function: ecs_api_edp_put_type_2() ## +## Function: ics_api_edp_put_type_2() ## -Test of PUT '/ei-producer/v1/eitypes/{eiTypeId}' or '/data-producer/v1/info-types/{infoTypeId}' depending on ecs version and optional check of the returned type. +Test of PUT '/ei-producer/v1/eitypes/{eiTypeId}' or '/data-producer/v1/info-types/{infoTypeId}' depending on ics version and optional check of the returned type. | arg list | |--| @@ -1397,9 +1397,9 @@ Test of PUT '/ei-producer/v1/eitypes/{eiTypeId}' or '/data-producer/v1/info-type | `` | Path to a job schema file | | `EMPTY` | The expected list of type ids shall be empty | -## Function: ecs_api_edp_delete_type_2() ## +## Function: ics_api_edp_delete_type_2() ## -Test of DELETE '/ei-producer/v1/eitypes/{eiTypeId}' or '/data-producer/v1/info-types/{infoTypeId}' depending on ecs version and optional check of the returned type. +Test of DELETE '/ei-producer/v1/eitypes/{eiTypeId}' or '/data-producer/v1/info-types/{infoTypeId}' depending on ics version and optional check of the returned type. | arg list | |--| @@ -1410,7 +1410,7 @@ Test of DELETE '/ei-producer/v1/eitypes/{eiTypeId}' or '/data-producer/v1/info-t | `` | Expected http response code | | `` | Id of the type | -## Function: ecs_api_edp_get_producer() ## +## Function: ics_api_edp_get_producer() ## Test of GET '/ei-producer/v1/eiproducers/{eiProducerId}' and optional check of the returned producer. To test the response code only, provide the response and the producer-id. @@ -1431,9 +1431,9 @@ To also test the response payload add the remaining parameters defining thee pro | `` | Path to a schema file | | `EMPTY` | The expected list of type schema pairs shall be empty | -## Function: ecs_api_edp_get_producer_2() ## +## Function: ics_api_edp_get_producer_2() ## -Test of GET '/ei-producer/v1/eiproducers/{eiProducerId}' or '/data-producer/v1/info-producers/{infoProducerId}' depending on ecs version and optional check of the returned producer. +Test of GET '/ei-producer/v1/eiproducers/{eiProducerId}' or '/data-producer/v1/info-producers/{infoProducerId}' depending on ics version and optional check of the returned producer. To test the response code only, provide the response and the producer-id. To also test the response payload add the remaining parameters defining thee producer. @@ -1450,9 +1450,9 @@ To also test the response payload add the remaining parameters defining thee pro | `` | Id of the type | | `EMPTY` | The expected list of types shall be empty | -## Function: ecs_api_edp_delete_producer() ## +## Function: ics_api_edp_delete_producer() ## -Test of DELETE '/ei-producer/v1/eiproducers/{eiProducerId}' or '/data-producer/v1/info-producers/{infoProducerId}' depending on ecs version. +Test of DELETE '/ei-producer/v1/eiproducers/{eiProducerId}' or '/data-producer/v1/info-producers/{infoProducerId}' depending on ics version. To test, provide all parameters. | arg list | @@ -1464,7 +1464,7 @@ To test, provide all parameters. | `` | Expected http response code | | `` | Id of the producer | -## Function: ecs_api_edp_put_producer() ## +## Function: ics_api_edp_put_producer() ## Test of PUT '/ei-producer/v1/eiproducers/{eiProducerId}'. To test, provide all parameters. The list of type/schema pair may be empty. @@ -1483,9 +1483,9 @@ To test, provide all parameters. The list of type/schema pair may be empty. | `` | Path to a schema file | | `EMPTY` | The list of type/schema pairs is empty | -## Function: ecs_api_edp_put_producer_2() ## +## Function: ics_api_edp_put_producer_2() ## -Test of PUT '/ei-producer/v1/eiproducers/{eiProducerId}' or '/data-producer/v1/info-producers/{infoProducerId}' depending on ecs version. +Test of PUT '/ei-producer/v1/eiproducers/{eiProducerId}' or '/data-producer/v1/info-producers/{infoProducerId}' depending on ics version. To test, provide all parameters. The list of type/schema pair may be empty. | arg list | @@ -1501,7 +1501,7 @@ To test, provide all parameters. The list of type/schema pair may be empty. | `` | Id of the type | | `NOTYPE` | The list of types is empty | -## Function: ecs_api_edp_get_producer_jobs() ## +## Function: ics_api_edp_get_producer_jobs() ## Test of GET '/ei-producer/v1/eiproducers/{eiProducerId}/eijobs' and optional check of the returned producer job. To test the response code only, provide the response and the producer-id. @@ -1522,9 +1522,9 @@ To also test the response payload add the remaining parameters. | `` | Path to a job template file | | `EMPTY` | The list of job/type/target/job-file tuples is empty | -## Function: ecs_api_edp_get_producer_jobs_2() ## +## Function: ics_api_edp_get_producer_jobs_2() ## -Test of GET '/ei-producer/v1/eiproducers/{eiProducerId}/eijobs' or '/data-producer/v1/info-producers/{infoProducerId}/info-jobs' depending on ecs version and optional check of the returned producer job. +Test of GET '/ei-producer/v1/eiproducers/{eiProducerId}/eijobs' or '/data-producer/v1/info-producers/{infoProducerId}/info-jobs' depending on ics version and optional check of the returned producer job. To test the response code only, provide the response and the producer-id. To also test the response payload add the remaining parameters. @@ -1543,7 +1543,7 @@ To also test the response payload add the remaining parameters. | `` | Path to a job template file | | `EMPTY` | The list of job/type/target/job-file tuples is empty | -## Function: ecs_api_service_status() ## +## Function: ics_api_service_status() ## Test of GET '/status'. @@ -1555,7 +1555,7 @@ Test of GET '/status'. | --------- | ----------- | | `` | Expected http response code | -## Function: ecs_api_idc_get_type_ids() ## +## Function: ics_api_idc_get_type_ids() ## Test of GET '/data-consumer/v1/info-types' and an optional check of the returned list of type ids. To test the response code only, provide the response code. @@ -1571,7 +1571,7 @@ To also test the response payload add list of expected type ids (or EMPTY if the | `` | Id of the Info type | | `EMPTY` | The expected list of type ids shall be empty | -## Function: ecs_api_idc_get_job_ids() ## +## Function: ics_api_idc_get_job_ids() ## Test of GET '/data-consumer/v1/info-jobs' and optional check of the array of returned job ids. To test the response code only, provide the response code parameter as well as a type id and an owner id. @@ -1590,7 +1590,7 @@ To also test the response payload add the 'EMPTY' for an expected empty array or | `` | Id of the expected job | | `EMPTY` | The expected list of job id shall be empty | -## Function: ecs_api_idc_get_job() ## +## Function: ics_api_idc_get_job() ## Test of GET '/data-consumer/v1/info-jobs/{infoJobId}' and optional check of the returned job. To test the response code only, provide the response code, type id and job id. @@ -1609,7 +1609,7 @@ To also test the response payload add the remaining parameters. | `` | Expected owner for the job | | `` | Path to a job template for job parameters of the job | -## Function: ecs_api_idc_put_job() ## +## Function: ics_api_idc_put_job() ## Test of PUT '​/data-consumer/v1/info-jobs/{infoJobId}'. To test, provide all the specified parameters. @@ -1628,7 +1628,7 @@ To test, provide all the specified parameters. | `` | Path to a job template for job parameters of the job | | `VALIIDATE` | Indicator to preform type validation at creation | -## Function: ecs_api_idc_delete_job() ## +## Function: ics_api_idc_delete_job() ## Test of DELETE '/A1-EI​/v1​/eitypes​/{eiTypeId}​/eijobs​/{eiJobId}'. To test, provide all the specified parameters. @@ -1643,7 +1643,7 @@ To test, provide all the specified parameters. | `` | Id of the type | | `` | Id of the job | -## Function: ecs_api_idc_get_type() ## +## Function: ics_api_idc_get_type() ## Test of GET '/data-consumer/v1/info-types/{infoTypeId} and optional check of the returned schema. To test the response code only, provide the response code parameter as well as the type-id. @@ -1659,7 +1659,7 @@ To also test the response payload add a path to the expected schema file. | `` | Id of the Info type | | `` | Path to a schema file to compare with the returned schema | -## Function: ecs_api_idc_get_job_status() ## +## Function: ics_api_idc_get_job_status() ## Test of GET '/data-consumer/v1/info-jobs/{infoJobId}/status' and optional check of the returned status and timeout. To test the response code only, provide the response code and job id. @@ -1676,7 +1676,7 @@ To also test the response payload add the expected status. | `` | Expected status | | `` | Timeout | -## Function: ecs_api_idc_get_job_status2() ## +## Function: ics_api_idc_get_job_status2() ## Test of GET '/data-consumer/v1/info-jobs/{infoJobId}/status' with returned producers and optional check of the returned status and timeout. To test the response code only, provide the response code and job id. @@ -1697,7 +1697,7 @@ To also test the response payload add the expected status. | `` | Timeout | -## Function: ecs_api_idc_get_subscription_ids() ## +## Function: ics_api_idc_get_subscription_ids() ## Test of GET '/data-consumer/v1/info-type-subscription' with the returned list of subscription ids | arg list | @@ -1712,7 +1712,7 @@ Test of GET '/data-consumer/v1/info-type-subscription' with the returned list of | `` | Indicated for empty list of subscription ids | | `` |Id of the subscription | -## Function: ecs_api_idc_get_subscription() ## +## Function: ics_api_idc_get_subscription() ## Test of GET '/data-consumer/v1/info-type-subscription/{subscriptionId}' with the subscription information | arg list | @@ -1727,7 +1727,7 @@ Test of GET '/data-consumer/v1/info-type-subscription/{subscriptionId}' with the | `` | Url for status notifications | -## Function: ecs_api_idc_put_subscription() ## +## Function: ics_api_idc_put_subscription() ## Test of PUT '/data-consumer/v1/info-type-subscription/{subscriptionId}' with the subscription information | arg list | @@ -1741,7 +1741,7 @@ Test of PUT '/data-consumer/v1/info-type-subscription/{subscriptionId}' with the | `` | Id of the owner | | `` | Url for status notifications | -## Function: ecs_api_idc_delete_subscription() ## +## Function: ics_api_idc_delete_subscription() ## Test of DELETE /data-consumer/v1/info-type-subscription/{subscriptionId} | arg list | @@ -1754,7 +1754,7 @@ Test of DELETE /data-consumer/v1/info-type-subscription/{subscriptionId} | `` |Id of the subscription | -## Function: ecs_api_admin_reset() ## +## Function: ics_api_admin_reset() ## Test of GET '/status'. @@ -1815,9 +1815,9 @@ Sample test of pms api (status) | --------- | ----------- | | `` | Expected http response code | -## Function: gateway_ecs_get_types ## +## Function: gateway_ics_get_types ## -Sample test of ecs api (get types) +Sample test of ics api (get types) Only response code tested - not payload | arg list | |--| diff --git a/test/common/api_curl.sh b/test/common/api_curl.sh index f2777ebf..fcf3d1ec 100644 --- a/test/common/api_curl.sh +++ b/test/common/api_curl.sh @@ -17,13 +17,13 @@ # ============LICENSE_END================================================= # -# Generic function to query the agent/ECS via the REST or DMAAP interface. -# Used by all other agent/ECS api test functions +# Generic function to query the agent/ICS via the REST or DMAAP interface. +# Used by all other agent/ICS api test functions # If operation sufffix is '_BATCH' the the send and get response is split in two sequences, # one for sending the requests and one for receiving the response # but only when using the DMAAP interface # REST or DMAAP is controlled of the base url of $XX_ADAPTER -# arg: (PA|ECS|CR|RC GET|PUT|POST|DELETE|GET_BATCH|PUT_BATCH|POST_BATCH|DELETE_BATCH | [ [mime-type]]) | (PA|ECS RESPONSE ) +# arg: (PA|ICS|CR|RC GET|PUT|POST|DELETE|GET_BATCH|PUT_BATCH|POST_BATCH|DELETE_BATCH | [ [mime-type]]) | (PA|ICS RESPONSE ) # Default mime type for file is application/json unless specified in parameter mime-type # (Not for test scripts) __do_curl_to_api() { @@ -49,10 +49,10 @@ __do_curl_to_api() { if [ $PMS_VERSION != "V1" ]; then input_url=$PMS_API_PREFIX$3 fi - elif [ $1 == "ECS" ]; then - __ADAPTER=$ECS_ADAPTER - __ADAPTER_TYPE=$ECS_ADAPTER_TYPE - __RETRY_CODES=$ECS_RETRY_CODES + elif [ $1 == "ICS" ]; then + __ADAPTER=$ICS_ADAPTER + __ADAPTER_TYPE=$ICS_ADAPTER_TYPE + __RETRY_CODES=$ICS_RETRY_CODES elif [ $1 == "CR" ]; then __ADAPTER=$CR_ADAPTER __ADAPTER_TYPE=$CR_ADAPTER_TYPE @@ -151,7 +151,7 @@ __do_curl_to_api() { if [ $paramError -eq 1 ]; then ((RES_CONF_FAIL++)) echo "-Incorrect number of parameters to __do_curl_to_api " $@ >> $HTTPLOG - echo "-Expected: (PA|ECS GET|PUT|POST|DELETE|GET_BATCH|PUT_BATCH|POST_BATCH|DELETE_BATCH []) | (PA|ECS RESPONSE )" >> $HTTPLOG + echo "-Expected: (PA|ICS GET|PUT|POST|DELETE|GET_BATCH|PUT_BATCH|POST_BATCH|DELETE_BATCH []) | (PA|ICS RESPONSE )" >> $HTTPLOG echo "-Returning response 000" >> $HTTPLOG echo "-000" return 1 @@ -248,7 +248,7 @@ __do_curl_to_api() { echo " RESP: "$res >> $HTTPLOG status=${res:${#res}-3} TS=$SECONDS - # wait of the reply from the agent/ECS... + # wait of the reply from the agent/ICS... while [ $status -eq 204 ]; do if [ $(($SECONDS - $TS)) -gt 90 ]; then echo " RETCODE: (timeout after 90s)" >> $HTTPLOG diff --git a/test/common/cp_api_functions.sh b/test/common/cp_api_functions.sh index 295e16ab..992fd68a 100644 --- a/test/common/cp_api_functions.sh +++ b/test/common/cp_api_functions.sh @@ -129,7 +129,7 @@ use_control_panel_https() { # args: __control_panel_set_protocoll() { echo -e $BOLD"$CONTROL_PANEL_DISPLAY_NAME protocol setting"$EBOLD - echo -e " Using $BOLD http $EBOLD towards $CONTROL_PANEL_DISPLAY_NAME" + echo -e " Using $BOLD $1 $EBOLD towards $CONTROL_PANEL_DISPLAY_NAME" CP_SERVICE_PATH=$1"://"$CONTROL_PANEL_APP_NAME":"$2 if [ $RUNMODE == "KUBE" ]; then @@ -160,21 +160,21 @@ __control_panel_export_vars() { export CP_PROXY_CONFIGMAP_NAME=$CONTROL_PANEL_APP_NAME"-proxy" export CONTROL_PANEL_PATH_POLICY_PREFIX - export CONTROL_PANEL_PATH_ECS_PREFIX - export CONTROL_PANEL_PATH_ECS_PREFIX2 + export CONTROL_PANEL_PATH_ICS_PREFIX + export CONTROL_PANEL_PATH_ICS_PREFIX2 export NRT_GATEWAY_APP_NAME export NRT_GATEWAY_EXTERNAL_PORT export POLICY_AGENT_EXTERNAL_SECURE_PORT - export ECS_EXTERNAL_SECURE_PORT + export ICS_EXTERNAL_SECURE_PORT if [ $RUNMODE == "KUBE" ]; then export NGW_DOMAIN_NAME=$NRT_GATEWAY_APP_NAME.$KUBE_NONRTRIC_NAMESPACE.svc.cluster.local # suffix needed for nginx name resolution export CP_NGINX_RESOLVER=$CONTROL_PANEL_NGINX_KUBE_RESOLVER else export POLICY_AGENT_DOMAIN_NAME=$POLICY_AGENT_APP_NAME - export ECS_DOMAIN_NAME=$ECS_APP_NAME + export ICS_DOMAIN_NAME=$ICS_APP_NAME export NGW_DOMAIN_NAME=$NRT_GATEWAY_APP_NAME export CP_NGINX_RESOLVER=$CONTROL_PANEL_NGINX_DOCKER_RESOLVER @@ -270,7 +270,7 @@ start_control_panel() { dest_file=$SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_HOST_MNT_DIR/$CONTROL_PANEL_CONFIG_FILE - envsubst '${NGW_DOMAIN_NAME},${CP_NGINX_RESOLVER},${NRT_GATEWAY_EXTERNAL_PORT},${POLICY_AGENT_EXTERNAL_SECURE_PORT},${ECS_EXTERNAL_SECURE_PORT},${POLICY_AGENT_DOMAIN_NAME},${ECS_DOMAIN_NAME},${CONTROL_PANEL_PATH_POLICY_PREFIX},${CONTROL_PANEL_PATH_ECS_PREFIX} ,${CONTROL_PANEL_PATH_ECS_PREFIX2}' < $1 > $dest_file + envsubst '${NGW_DOMAIN_NAME},${CP_NGINX_RESOLVER},${NRT_GATEWAY_EXTERNAL_PORT},${POLICY_AGENT_EXTERNAL_SECURE_PORT},${ICS_EXTERNAL_SECURE_PORT},${POLICY_AGENT_DOMAIN_NAME},${ICS_DOMAIN_NAME},${CONTROL_PANEL_PATH_POLICY_PREFIX},${CONTROL_PANEL_PATH_ICS_PREFIX} ,${CONTROL_PANEL_PATH_ICS_PREFIX2}' < $1 > $dest_file __start_container $CONTROL_PANEL_COMPOSE_DIR "" NODOCKERARGS 1 $CONTROL_PANEL_APP_NAME diff --git a/test/common/cr_api_functions.sh b/test/common/cr_api_functions.sh index 1b82ea02..51162737 100644 --- a/test/common/cr_api_functions.sh +++ b/test/common/cr_api_functions.sh @@ -160,7 +160,7 @@ use_cr_https() { __cr_set_protocoll() { echo -e $BOLD"$CR_DISPLAY_NAME protocol setting"$EBOLD - echo -e " Using $BOLD http $EBOLD towards $CR_DISPLAY_NAME" + echo -e " Using $BOLD $1 $EBOLD towards $CR_DISPLAY_NAME" ## Access to Dmaap adapter for ((CR_INSTANCE=0; CR_INSTANCE<$MAX_CR_APP_COUNT; CR_INSTANCE++ )); do CR_DOCKER_INSTANCE=$(($CR_INSTANCE+1)) @@ -489,10 +489,10 @@ cr_api_check_all_sync_events() { return 0 } -# CR API: Check the contents of all current status events for one id from ECS +# CR API: Check the contents of all current status events for one id from ICS # [ EMPTY | ( )+ ] # (Function for test scripts) -cr_api_check_all_ecs_events() { +cr_api_check_all_ics_events() { __log_test_start $@ if [ $# -lt 3 ]; then @@ -546,10 +546,10 @@ cr_api_check_all_ecs_events() { return 0 } -# CR API: Check the contents of all current type subscription events for one id from ECS +# CR API: Check the contents of all current type subscription events for one id from ICS # [ EMPTY | ( )+ ] # (Function for test scripts) -cr_api_check_all_ecs_subscription_events() { +cr_api_check_all_ics_subscription_events() { __log_test_start $@ #Valid number of parameter 3,4,8,12 @@ -625,7 +625,7 @@ cr_api_check_all_ecs_subscription_events() { cr_api_reset() { __log_conf_start $@ - if [ $# -ne 0 ]; then + if [ $# -ne 1 ]; then __print_err "" $@ return 1 fi diff --git a/test/common/dmaapadp_api_functions.sh b/test/common/dmaapadp_api_functions.sh index 9b7571f3..a9605ecc 100644 --- a/test/common/dmaapadp_api_functions.sh +++ b/test/common/dmaapadp_api_functions.sh @@ -124,7 +124,7 @@ use_dmaapadp_https() { # args: __dmaapadp_set_protocoll() { echo -e $BOLD"$DMAAP_ADP_DISPLAY_NAME protocol setting"$EBOLD - echo -e " Using $BOLD http $EBOLD towards $DMAAP_ADP_DISPLAY_NAME" + echo -e " Using $BOLD $1 $EBOLD towards $DMAAP_ADP_DISPLAY_NAME" ## Access to Dmaap adapter @@ -185,7 +185,7 @@ __dmaapadp_export_vars() { # paths to other components - export ECS_SERVICE_PATH + export ICS_SERVICE_PATH export DMAAP_ADP_SERVICE_PATH export MR_SERVICE_PATH diff --git a/test/common/dmaapmed_api_functions.sh b/test/common/dmaapmed_api_functions.sh index 5188a454..35280a4c 100644 --- a/test/common/dmaapmed_api_functions.sh +++ b/test/common/dmaapmed_api_functions.sh @@ -124,7 +124,7 @@ use_dmaapmed_https() { # args: __dmaapmed_set_protocoll() { echo -e $BOLD"$DMAAP_MED_DISPLAY_NAME protocol setting"$EBOLD - echo -e " Using $BOLD http $EBOLD towards $DMAAP_MED_DISPLAY_NAME" + echo -e " Using $BOLD $1 $EBOLD towards $DMAAP_MED_DISPLAY_NAME" ## Access to Dmaap mediator @@ -177,7 +177,7 @@ __dmaapmed_export_vars() { fi # paths to other components - export ECS_SERVICE_PATH + export ICS_SERVICE_PATH export DMAAP_MED_CONF_SELF_HOST=$(echo $DMAAP_MED_SERVICE_PATH | cut -d: -f1-2) export DMAAP_MED_CONF_SELF_PORT=$(echo $DMAAP_MED_SERVICE_PATH | cut -d: -f3) diff --git a/test/common/ecs_api_functions.sh b/test/common/ics_api_functions.sh similarity index 82% rename from test/common/ecs_api_functions.sh rename to test/common/ics_api_functions.sh index b28c061c..ea4036da 100644 --- a/test/common/ecs_api_functions.sh +++ b/test/common/ics_api_functions.sh @@ -17,15 +17,15 @@ # ============LICENSE_END================================================= # -# This is a script that contains container/service management functions and test functions for ECS +# This is a script that contains container/service management functions and test functions for ICS ################ Test engine functions ################ # Create the image var used during the test # arg: (selects staging, snapshot, release etc) # is present only for images with staging, snapshot,release tags -__ECS_imagesetup() { - __check_and_create_image_var ECS "ECS_IMAGE" "ECS_IMAGE_BASE" "ECS_IMAGE_TAG" $1 "$ECS_DISPLAY_NAME" +__ICS_imagesetup() { + __check_and_create_image_var ICS "ICS_IMAGE" "ICS_IMAGE_BASE" "ICS_IMAGE_TAG" $1 "$ICS_DISPLAY_NAME" } # Pull image from remote repo or use locally built image @@ -33,276 +33,276 @@ __ECS_imagesetup() { # Shall be used for images allowing overriding. For example use a local image when test is started to use released images # Shall be used for images that does not allow overriding # Both var may contain: 'remote', 'remote-remove' or 'local' -__ECS_imagepull() { - __check_and_pull_image $1 "$ECS_DISPLAY_NAME" $ECS_APP_NAME ECS_IMAGE +__ICS_imagepull() { + __check_and_pull_image $1 "$ICS_DISPLAY_NAME" $ICS_APP_NAME ICS_IMAGE } # Build image (only for simulator or interfaces stubs owned by the test environment) # arg: (selects staging, snapshot, release etc) # is present only for images with staging, snapshot,release tags -__ECS_imagebuild() { - echo -e $RED" Image for app ECS shall never be built"$ERED +__ICS_imagebuild() { + echo -e $RED" Image for app ICS shall never be built"$ERED } # Generate a string for each included image using the app display name and a docker images format string # If a custom image repo is used then also the source image from the local repo is listed # arg: -__ECS_image_data() { - echo -e "$ECS_DISPLAY_NAME\t$(docker images --format $1 $ECS_IMAGE)" >> $2 - if [ ! -z "$ECS_IMAGE_SOURCE" ]; then - echo -e "-- source image --\t$(docker images --format $1 $ECS_IMAGE_SOURCE)" >> $2 +__ICS_image_data() { + echo -e "$ICS_DISPLAY_NAME\t$(docker images --format $1 $ICS_IMAGE)" >> $2 + if [ ! -z "$ICS_IMAGE_SOURCE" ]; then + echo -e "-- source image --\t$(docker images --format $1 $ICS_IMAGE_SOURCE)" >> $2 fi } # Scale kubernetes resources to zero # All resources shall be ordered to be scaled to 0, if relevant. If not relevant to scale, then do no action. # This function is called for apps fully managed by the test script -__ECS_kube_scale_zero() { - __kube_scale_all_resources $KUBE_NONRTRIC_NAMESPACE autotest ECS +__ICS_kube_scale_zero() { + __kube_scale_all_resources $KUBE_NONRTRIC_NAMESPACE autotest ICS } # Scale kubernetes resources to zero and wait until this has been accomplished, if relevant. If not relevant to scale, then do no action. # This function is called for prestarted apps not managed by the test script. -__ECS_kube_scale_zero_and_wait() { - __kube_scale_and_wait_all_resources $KUBE_NONRTRIC_NAMESPACE app "$KUBE_NONRTRIC_NAMESPACE"-enrichmentservice +__ICS_kube_scale_zero_and_wait() { + __kube_scale_and_wait_all_resources $KUBE_NONRTRIC_NAMESPACE app "$KUBE_NONRTRIC_NAMESPACE"-informationservice } # Delete all kube resouces for the app # This function is called for apps managed by the test script. -__ECS_kube_delete_all() { - __kube_delete_all_resources $KUBE_NONRTRIC_NAMESPACE autotest ECS +__ICS_kube_delete_all() { + __kube_delete_all_resources $KUBE_NONRTRIC_NAMESPACE autotest ICS } # Store docker logs # This function is called for apps managed by the test script. # args: -__ECS_store_docker_logs() { +__ICS_store_docker_logs() { if [ $RUNMODE == "KUBE" ]; then - kubectl logs -l "autotest=ECS" -n $KUBE_NONRTRIC_NAMESPACE --tail=-1 > $1$2_ecs.log 2>&1 + kubectl logs -l "autotest=ICS" -n $KUBE_NONRTRIC_NAMESPACE --tail=-1 > $1$2_ics.log 2>&1 else - docker logs $ECS_APP_NAME > $1$2_ecs.log 2>&1 + docker logs $ICS_APP_NAME > $1$2_ics.log 2>&1 fi } # Initial setup of protocol, host and ports # This function is called for apps managed by the test script. # args: - -__ECS_initial_setup() { - use_ecs_rest_http +__ICS_initial_setup() { + use_ics_rest_http } # Set app short-name, app name and namespace for logging runtime statistics of kubernets pods or docker containers # For docker, the namespace shall be excluded # This function is called for apps managed by the test script as well as for prestarted apps. # args: - -__ECS_statisics_setup() { +__ICS_statisics_setup() { if [ $RUNMODE == "KUBE" ]; then - echo "ECS $ECS_APP_NAME $KUBE_NONRTRIC_NAMESPACE" + echo "ICS $ICS_APP_NAME $KUBE_NONRTRIC_NAMESPACE" else - echo "ECS $ECS_APP_NAME" + echo "ICS $ICS_APP_NAME" fi } ####################################################### -# Make curl retries towards ECS for http response codes set in this env var, space separated list of codes -ECS_RETRY_CODES="" +# Make curl retries towards ICS for http response codes set in this env var, space separated list of codes +ICS_RETRY_CODES="" #Save first worker node the pod is started on -__ECS_WORKER_NODE="" +__ICS_WORKER_NODE="" ########################### -### ECS functions +### ICS functions ########################### -# All calls to ECS will be directed to the ECS REST interface from now on +# All calls to ICS will be directed to the ICS REST interface from now on # args: - # (Function for test scripts) -use_ecs_rest_http() { - __ecs_set_protocoll "http" $ECS_INTERNAL_PORT $ECS_EXTERNAL_PORT +use_ics_rest_http() { + __ics_set_protocoll "http" $ICS_INTERNAL_PORT $ICS_EXTERNAL_PORT } -# All calls to ECS will be directed to the ECS REST interface from now on +# All calls to ICS will be directed to the ICS REST interface from now on # args: - # (Function for test scripts) -use_ecs_rest_https() { - __ecs_set_protocoll "https" $ECS_INTERNAL_SECURE_PORT $ECS_EXTERNAL_SECURE_PORT +use_ics_rest_https() { + __ics_set_protocoll "https" $ICS_INTERNAL_SECURE_PORT $ICS_EXTERNAL_SECURE_PORT } -# All calls to ECS will be directed to the ECS dmaap interface over http from now on +# All calls to ICS will be directed to the ICS dmaap interface over http from now on # args: - # (Function for test scripts) -use_ecs_dmaap_http() { - echo -e $BOLD"ECS dmaap protocol setting"$EBOLD +use_ics_dmaap_http() { + echo -e $BOLD"ICS dmaap protocol setting"$EBOLD echo -e $RED" - NOT SUPPORTED - "$ERED - echo -e " Using $BOLD http $EBOLD and $BOLD DMAAP $EBOLD towards ECS" - ECS_ADAPTER_TYPE="MR-HTTP" + echo -e " Using $BOLD http $EBOLD and $BOLD DMAAP $EBOLD towards ICS" + ICS_ADAPTER_TYPE="MR-HTTP" echo "" } # Setup paths to svc/container for internal and external access # args: -__ecs_set_protocoll() { - echo -e $BOLD"$ECS_DISPLAY_NAME protocol setting"$EBOLD - echo -e " Using $BOLD http $EBOLD towards $ECS_DISPLAY_NAME" +__ics_set_protocoll() { + echo -e $BOLD"$ICS_DISPLAY_NAME protocol setting"$EBOLD + echo -e " Using $BOLD $1 $EBOLD towards $ICS_DISPLAY_NAME" - ## Access to ECS + ## Access to ICS - ECS_SERVICE_PATH=$1"://"$ECS_APP_NAME":"$2 # docker access, container->container and script->container via proxy + ICS_SERVICE_PATH=$1"://"$ICS_APP_NAME":"$2 # docker access, container->container and script->container via proxy if [ $RUNMODE == "KUBE" ]; then - ECS_SERVICE_PATH=$1"://"$ECS_APP_NAME.$KUBE_NONRTRIC_NAMESPACE":"$3 # kube access, pod->svc and script->svc via proxy + ICS_SERVICE_PATH=$1"://"$ICS_APP_NAME.$KUBE_NONRTRIC_NAMESPACE":"$3 # kube access, pod->svc and script->svc via proxy fi - # ECS_ADAPTER used for switching between REST and DMAAP (only REST supported currently) - ECS_ADAPTER_TYPE="REST" - ECS_ADAPTER=$ECS_SERVICE_PATH + # ICS_ADAPTER used for switching between REST and DMAAP (only REST supported currently) + ICS_ADAPTER_TYPE="REST" + ICS_ADAPTER=$ICS_SERVICE_PATH echo "" } # Export env vars for config files, docker compose and kube resources # args: PROXY|NOPROXY -__ecs_export_vars() { - export ECS_APP_NAME - export ECS_APP_NAME_ALIAS +__ics_export_vars() { + export ICS_APP_NAME + export ICS_APP_NAME_ALIAS export KUBE_NONRTRIC_NAMESPACE - export ECS_IMAGE - export ECS_INTERNAL_PORT - export ECS_INTERNAL_SECURE_PORT - export ECS_EXTERNAL_PORT - export ECS_EXTERNAL_SECURE_PORT - export ECS_CONFIG_MOUNT_PATH - export ECS_CONFIG_CONFIGMAP_NAME=$ECS_APP_NAME"-config" - export ECS_DATA_CONFIGMAP_NAME=$ECS_APP_NAME"-data" - export ECS_CONTAINER_MNT_DIR - export ECS_HOST_MNT_DIR - export ECS_CONFIG_FILE + export ICS_IMAGE + export ICS_INTERNAL_PORT + export ICS_INTERNAL_SECURE_PORT + export ICS_EXTERNAL_PORT + export ICS_EXTERNAL_SECURE_PORT + export ICS_CONFIG_MOUNT_PATH + export ICS_CONFIG_CONFIGMAP_NAME=$ICS_APP_NAME"-config" + export ICS_DATA_CONFIGMAP_NAME=$ICS_APP_NAME"-data" + export ICS_CONTAINER_MNT_DIR + export ICS_HOST_MNT_DIR + export ICS_CONFIG_FILE export DOCKER_SIM_NWNAME - export ECS_DISPLAY_NAME + export ICS_DISPLAY_NAME - export ECS_DATA_PV_NAME=$ECS_APP_NAME"-pv" - export ECS_DATA_PVC_NAME=$ECS_APP_NAME"-pvc" + export ICS_DATA_PV_NAME=$ICS_APP_NAME"-pv" + export ICS_DATA_PVC_NAME=$ICS_APP_NAME"-pvc" #Create a unique path for the pv each time to prevent a previous volume to be reused - export ECS_PV_PATH="ecsdata-"$(date +%s) + export ICS_PV_PATH="icsdata-"$(date +%s) if [ $1 == "PROXY" ]; then - export ECS_HTTP_PROXY_CONFIG_PORT=$HTTP_PROXY_CONFIG_PORT #Set if proxy is started - export ECS_HTTP_PROXY_CONFIG_HOST_NAME=$HTTP_PROXY_CONFIG_HOST_NAME #Set if proxy is started - if [ $ECS_HTTP_PROXY_CONFIG_PORT -eq 0 ] || [ -z "$ECS_HTTP_PROXY_CONFIG_HOST_NAME" ]; then + export ICS_HTTP_PROXY_CONFIG_PORT=$HTTP_PROXY_CONFIG_PORT #Set if proxy is started + export ICS_HTTP_PROXY_CONFIG_HOST_NAME=$HTTP_PROXY_CONFIG_HOST_NAME #Set if proxy is started + if [ $ICS_HTTP_PROXY_CONFIG_PORT -eq 0 ] || [ -z "$ICS_HTTP_PROXY_CONFIG_HOST_NAME" ]; then echo -e $YELLOW" Warning: HTTP PROXY will not be configured, proxy app not started"$EYELLOW else echo " Configured with http proxy" fi else - export ECS_HTTP_PROXY_CONFIG_PORT=0 - export ECS_HTTP_PROXY_CONFIG_HOST_NAME="" + export ICS_HTTP_PROXY_CONFIG_PORT=0 + export ICS_HTTP_PROXY_CONFIG_HOST_NAME="" echo " Configured without http proxy" fi } -# Start the ECS +# Start the ICS # args: PROXY|NOPROXY # (Function for test scripts) -start_ecs() { +start_ics() { - echo -e $BOLD"Starting $ECS_DISPLAY_NAME"$EBOLD + echo -e $BOLD"Starting $ICS_DISPLAY_NAME"$EBOLD if [ $RUNMODE == "KUBE" ]; then # Check if app shall be fully managed by the test script - __check_included_image "ECS" + __check_included_image "ICS" retcode_i=$? # Check if app shall only be used by the testscipt - __check_prestarted_image "ECS" + __check_prestarted_image "ICS" retcode_p=$? if [ $retcode_i -ne 0 ] && [ $retcode_p -ne 0 ]; then - echo -e $RED"The $ECS_APP_NAME app is not included as managed nor prestarted in this test script"$ERED - echo -e $RED"The $ECS_APP_NAME will not be started"$ERED + echo -e $RED"The $ICS_APP_NAME app is not included as managed nor prestarted in this test script"$ERED + echo -e $RED"The $ICS_APP_NAME will not be started"$ERED exit fi if [ $retcode_i -eq 0 ] && [ $retcode_p -eq 0 ]; then - echo -e $RED"The $ECS_APP_NAME app is included both as managed and prestarted in this test script"$ERED - echo -e $RED"The $ECS_APP_NAME will not be started"$ERED + echo -e $RED"The $ICS_APP_NAME app is included both as managed and prestarted in this test script"$ERED + echo -e $RED"The $ICS_APP_NAME will not be started"$ERED exit fi if [ $retcode_p -eq 0 ]; then - echo -e " Using existing $ECS_APP_NAME deployment and service" - echo " Setting ECS replicas=1" - res_type=$(__kube_get_resource_type $ECS_APP_NAME $KUBE_NONRTRIC_NAMESPACE) - __kube_scale $res_type $ECS_APP_NAME $KUBE_NONRTRIC_NAMESPACE 1 + echo -e " Using existing $ICS_APP_NAME deployment and service" + echo " Setting ICS replicas=1" + res_type=$(__kube_get_resource_type $ICS_APP_NAME $KUBE_NONRTRIC_NAMESPACE) + __kube_scale $res_type $ICS_APP_NAME $KUBE_NONRTRIC_NAMESPACE 1 fi # Check if app shall be fully managed by the test script if [ $retcode_i -eq 0 ]; then - echo -e " Creating $ECS_APP_NAME app and expose service" + echo -e " Creating $ICS_APP_NAME app and expose service" #Check if nonrtric namespace exists, if not create it __kube_create_namespace $KUBE_NONRTRIC_NAMESPACE - __ecs_export_vars $1 + __ics_export_vars $1 # Create config map for config - datafile=$PWD/tmp/$ECS_CONFIG_FILE + datafile=$PWD/tmp/$ICS_CONFIG_FILE cp $2 $datafile - output_yaml=$PWD/tmp/ecs_cfc.yaml - __kube_create_configmap $ECS_CONFIG_CONFIGMAP_NAME $KUBE_NONRTRIC_NAMESPACE autotest ECS $datafile $output_yaml + output_yaml=$PWD/tmp/ics_cfc.yaml + __kube_create_configmap $ICS_CONFIG_CONFIGMAP_NAME $KUBE_NONRTRIC_NAMESPACE autotest ICS $datafile $output_yaml # Create pv - input_yaml=$SIM_GROUP"/"$ECS_COMPOSE_DIR"/"pv.yaml - output_yaml=$PWD/tmp/ecs_pv.yaml - __kube_create_instance pv $ECS_APP_NAME $input_yaml $output_yaml + input_yaml=$SIM_GROUP"/"$ICS_COMPOSE_DIR"/"pv.yaml + output_yaml=$PWD/tmp/ics_pv.yaml + __kube_create_instance pv $ICS_APP_NAME $input_yaml $output_yaml # Create pvc - input_yaml=$SIM_GROUP"/"$ECS_COMPOSE_DIR"/"pvc.yaml - output_yaml=$PWD/tmp/ecs_pvc.yaml - __kube_create_instance pvc $ECS_APP_NAME $input_yaml $output_yaml + input_yaml=$SIM_GROUP"/"$ICS_COMPOSE_DIR"/"pvc.yaml + output_yaml=$PWD/tmp/ics_pvc.yaml + __kube_create_instance pvc $ICS_APP_NAME $input_yaml $output_yaml # Create service - input_yaml=$SIM_GROUP"/"$ECS_COMPOSE_DIR"/"svc.yaml - output_yaml=$PWD/tmp/ecs_svc.yaml - __kube_create_instance service $ECS_APP_NAME $input_yaml $output_yaml + input_yaml=$SIM_GROUP"/"$ICS_COMPOSE_DIR"/"svc.yaml + output_yaml=$PWD/tmp/ics_svc.yaml + __kube_create_instance service $ICS_APP_NAME $input_yaml $output_yaml # Create app - input_yaml=$SIM_GROUP"/"$ECS_COMPOSE_DIR"/"app.yaml - output_yaml=$PWD/tmp/ecs_app.yaml - __kube_create_instance app $ECS_APP_NAME $input_yaml $output_yaml + input_yaml=$SIM_GROUP"/"$ICS_COMPOSE_DIR"/"app.yaml + output_yaml=$PWD/tmp/ics_app.yaml + __kube_create_instance app $ICS_APP_NAME $input_yaml $output_yaml fi - # Tie the ECS to a worker node so that ECS will always be scheduled to the same worker node if the ECS pod is restarted - # A PVC of type hostPath is mounted to ECS, for persistent storage, so the ECS must always be on the node which mounted the volume + # Tie the ICS to a worker node so that ICS will always be scheduled to the same worker node if the ICS pod is restarted + # A PVC of type hostPath is mounted to ICS, for persistent storage, so the ICS must always be on the node which mounted the volume # Keep the initial worker node in case the pod need to be "restarted" - must be made to the same node due to a volume mounted on the host if [ $retcode_i -eq 0 ]; then - __ECS_WORKER_NODE=$(kubectl get pod -l "autotest=ECS" -n $KUBE_NONRTRIC_NAMESPACE -o jsonpath='{.items[*].spec.nodeName}') - if [ -z "$__ECS_WORKER_NODE" ]; then - echo -e $YELLOW" Cannot find worker node for pod for $ECS_APP_NAME, persistency may not work"$EYELLOW + __ICS_WORKER_NODE=$(kubectl get pod -l "autotest=ICS" -n $KUBE_NONRTRIC_NAMESPACE -o jsonpath='{.items[*].spec.nodeName}') + if [ -z "$__ICS_WORKER_NODE" ]; then + echo -e $YELLOW" Cannot find worker node for pod for $ICS_APP_NAME, persistency may not work"$EYELLOW fi else - echo -e $YELLOW" Persistency may not work for app $ECS_APP_NAME in multi-worker node config when running it as a prestarted app"$EYELLOW + echo -e $YELLOW" Persistency may not work for app $ICS_APP_NAME in multi-worker node config when running it as a prestarted app"$EYELLOW fi - __check_service_start $ECS_APP_NAME $ECS_SERVICE_PATH$ECS_ALIVE_URL + __check_service_start $ICS_APP_NAME $ICS_SERVICE_PATH$ICS_ALIVE_URL else - __check_included_image 'ECS' + __check_included_image 'ICS' if [ $? -eq 1 ]; then - echo -e $RED"The ECS app is not included in this test script"$ERED - echo -e $RED"ECS will not be started"$ERED + echo -e $RED"The ICS app is not included in this test script"$ERED + echo -e $RED"ICS will not be started"$ERED exit 1 fi curdir=$PWD cd $SIM_GROUP - cd ecs - cd $ECS_HOST_MNT_DIR + cd ics + cd $ICS_HOST_MNT_DIR #cd .. if [ -d db ]; then if [ "$(ls -A $DIR)" ]; then @@ -319,49 +319,49 @@ start_ecs() { cd $curdir - __ecs_export_vars $1 + __ics_export_vars $1 - dest_file=$SIM_GROUP/$ECS_COMPOSE_DIR/$ECS_HOST_MNT_DIR/$ECS_CONFIG_FILE + dest_file=$SIM_GROUP/$ICS_COMPOSE_DIR/$ICS_HOST_MNT_DIR/$ICS_CONFIG_FILE envsubst < $2 > $dest_file - __start_container $ECS_COMPOSE_DIR "" NODOCKERARGS 1 $ECS_APP_NAME + __start_container $ICS_COMPOSE_DIR "" NODOCKERARGS 1 $ICS_APP_NAME - __check_service_start $ECS_APP_NAME $ECS_SERVICE_PATH$ECS_ALIVE_URL + __check_service_start $ICS_APP_NAME $ICS_SERVICE_PATH$ICS_ALIVE_URL fi echo "" return 0 } -# Stop the ecs +# Stop the ics # args: - # args: - # (Function for test scripts) -stop_ecs() { - echo -e $BOLD"Stopping $ECS_DISPLAY_NAME"$EBOLD +stop_ics() { + echo -e $BOLD"Stopping $ICS_DISPLAY_NAME"$EBOLD if [ $RUNMODE == "KUBE" ]; then - __check_prestarted_image "ECS" + __check_prestarted_image "ICS" if [ $? -eq 0 ]; then - echo -e $YELLOW" Persistency may not work for app $ECS_APP_NAME in multi-worker node config when running it as a prestarted app"$EYELLOW - res_type=$(__kube_get_resource_type $ECS_APP_NAME $KUBE_NONRTRIC_NAMESPACE) - __kube_scale $res_type $ECS_APP_NAME $KUBE_NONRTRIC_NAMESPACE 0 + echo -e $YELLOW" Persistency may not work for app $ICS_APP_NAME in multi-worker node config when running it as a prestarted app"$EYELLOW + res_type=$(__kube_get_resource_type $ICS_APP_NAME $KUBE_NONRTRIC_NAMESPACE) + __kube_scale $res_type $ICS_APP_NAME $KUBE_NONRTRIC_NAMESPACE 0 return 0 fi - __kube_scale_all_resources $KUBE_NONRTRIC_NAMESPACE autotest ECS + __kube_scale_all_resources $KUBE_NONRTRIC_NAMESPACE autotest ICS echo " Deleting the replica set - a new will be started when the app is started" - tmp=$(kubectl delete rs -n $KUBE_NONRTRIC_NAMESPACE -l "autotest=ECS") + tmp=$(kubectl delete rs -n $KUBE_NONRTRIC_NAMESPACE -l "autotest=ICS") if [ $? -ne 0 ]; then echo -e $RED" Could not delete replica set "$RED ((RES_CONF_FAIL++)) return 1 fi else - docker stop $ECS_APP_NAME &> ./tmp/.dockererr + docker stop $ICS_APP_NAME &> ./tmp/.dockererr if [ $? -ne 0 ]; then - __print_err "Could not stop $ECS_APP_NAME" $@ + __print_err "Could not stop $ICS_APP_NAME" $@ cat ./tmp/.dockererr ((RES_CONF_FAIL++)) return 1 @@ -372,48 +372,48 @@ stop_ecs() { return 0 } -# Start a previously stopped ecs +# Start a previously stopped ics # args: - # (Function for test scripts) -start_stopped_ecs() { - echo -e $BOLD"Starting (the previously stopped) $ECS_DISPLAY_NAME"$EBOLD +start_stopped_ics() { + echo -e $BOLD"Starting (the previously stopped) $ICS_DISPLAY_NAME"$EBOLD if [ $RUNMODE == "KUBE" ]; then - __check_prestarted_image "ECS" + __check_prestarted_image "ICS" if [ $? -eq 0 ]; then - echo -e $YELLOW" Persistency may not work for app $ECS_APP_NAME in multi-worker node config when running it as a prestarted app"$EYELLOW - res_type=$(__kube_get_resource_type $ECS_APP_NAME $KUBE_NONRTRIC_NAMESPACE) - __kube_scale $res_type $ECS_APP_NAME $KUBE_NONRTRIC_NAMESPACE 1 - __check_service_start $ECS_APP_NAME $ECS_SERVICE_PATH$ECS_ALIVE_URL + echo -e $YELLOW" Persistency may not work for app $ICS_APP_NAME in multi-worker node config when running it as a prestarted app"$EYELLOW + res_type=$(__kube_get_resource_type $ICS_APP_NAME $KUBE_NONRTRIC_NAMESPACE) + __kube_scale $res_type $ICS_APP_NAME $KUBE_NONRTRIC_NAMESPACE 1 + __check_service_start $ICS_APP_NAME $ICS_SERVICE_PATH$ICS_ALIVE_URL return 0 fi # Tie the PMS to the same worker node it was initially started on # A PVC of type hostPath is mounted to PMS, for persistent storage, so the PMS must always be on the node which mounted the volume - if [ -z "$__ECS_WORKER_NODE" ]; then + if [ -z "$__ICS_WORKER_NODE" ]; then echo -e $RED" No initial worker node found for pod "$RED ((RES_CONF_FAIL++)) return 1 else - echo -e $BOLD" Setting nodeSelector kubernetes.io/hostname=$__ECS_WORKER_NODE to deployment for $ECS_APP_NAME. Pod will always run on this worker node: $__PA_WORKER_NODE"$BOLD + echo -e $BOLD" Setting nodeSelector kubernetes.io/hostname=$__ICS_WORKER_NODE to deployment for $ICS_APP_NAME. Pod will always run on this worker node: $__PA_WORKER_NODE"$BOLD echo -e $BOLD" The mounted volume is mounted as hostPath and only available on that worker node."$BOLD - tmp=$(kubectl patch deployment $ECS_APP_NAME -n $KUBE_NONRTRIC_NAMESPACE --patch '{"spec": {"template": {"spec": {"nodeSelector": {"kubernetes.io/hostname": "'$__ECS_WORKER_NODE'"}}}}}') + tmp=$(kubectl patch deployment $ICS_APP_NAME -n $KUBE_NONRTRIC_NAMESPACE --patch '{"spec": {"template": {"spec": {"nodeSelector": {"kubernetes.io/hostname": "'$__ICS_WORKER_NODE'"}}}}}') if [ $? -ne 0 ]; then - echo -e $YELLOW" Cannot set nodeSelector to deployment for $ECS_APP_NAME, persistency may not work"$EYELLOW + echo -e $YELLOW" Cannot set nodeSelector to deployment for $ICS_APP_NAME, persistency may not work"$EYELLOW fi - __kube_scale deployment $ECS_APP_NAME $KUBE_NONRTRIC_NAMESPACE 1 + __kube_scale deployment $ICS_APP_NAME $KUBE_NONRTRIC_NAMESPACE 1 fi else - docker start $ECS_APP_NAME &> ./tmp/.dockererr + docker start $ICS_APP_NAME &> ./tmp/.dockererr if [ $? -ne 0 ]; then - __print_err "Could not start (the stopped) $ECS_APP_NAME" $@ + __print_err "Could not start (the stopped) $ICS_APP_NAME" $@ cat ./tmp/.dockererr ((RES_CONF_FAIL++)) return 1 fi fi - __check_service_start $ECS_APP_NAME $ECS_SERVICE_PATH$ECS_ALIVE_URL + __check_service_start $ICS_APP_NAME $ICS_SERVICE_PATH$ICS_ALIVE_URL if [ $? -ne 0 ]; then return 1 fi @@ -421,12 +421,12 @@ start_stopped_ecs() { return 0 } -# Turn on debug level tracing in ECS +# Turn on debug level tracing in ICS # args: - # (Function for test scripts) -set_ecs_debug() { - echo -e $BOLD"Setting ecs debug logging"$EBOLD - curlString="$ECS_SERVICE_PATH$ECS_ACTUATOR -X POST -H Content-Type:application/json -d {\"configuredLevel\":\"debug\"}" +set_ics_debug() { + echo -e $BOLD"Setting ics debug logging"$EBOLD + curlString="$ICS_SERVICE_PATH$ICS_ACTUATOR -X POST -H Content-Type:application/json -d {\"configuredLevel\":\"debug\"}" result=$(__do_curl "$curlString") if [ $? -ne 0 ]; then __print_err "Could not set debug mode" $@ @@ -437,12 +437,12 @@ set_ecs_debug() { return 0 } -# Turn on trace level tracing in ECS +# Turn on trace level tracing in ICS # args: - # (Function for test scripts) -set_ecs_trace() { - echo -e $BOLD"Setting ecs trace logging"$EBOLD - curlString="$ECS_SERVICE_PATH/actuator/loggers/org.oransc.enrichment -X POST -H Content-Type:application/json -d {\"configuredLevel\":\"trace\"}" +set_ics_trace() { + echo -e $BOLD"Setting ics trace logging"$EBOLD + curlString="$ICS_SERVICE_PATH/actuator/loggers/org.oransc.information -X POST -H Content-Type:application/json -d {\"configuredLevel\":\"trace\"}" result=$(__do_curl "$curlString") if [ $? -ne 0 ]; then __print_err "Could not set trace mode" $@ @@ -453,50 +453,50 @@ set_ecs_trace() { return 0 } -# Perform curl retries when making direct call to ECS for the specified http response codes +# Perform curl retries when making direct call to ICS for the specified http response codes # Speace separated list of http response codes # args: []* -use_ecs_retries() { - echo -e $BOLD"Do curl retries to the ECS REST inteface for these response codes:$@"$EBOLD - ECS_RETRY_CODES=$@ +use_ics_retries() { + echo -e $BOLD"Do curl retries to the ICS REST inteface for these response codes:$@"$EBOLD + ICS_RETRY_CODES=$@ echo "" return 0 } -# Check the ecs logs for WARNINGs and ERRORs +# Check the ics logs for WARNINGs and ERRORs # args: - # (Function for test scripts) -check_ecs_logs() { - __check_container_logs "ECS" $ECS_APP_NAME $ECS_LOGPATH WARN ERR +check_ics_logs() { + __check_container_logs "ICS" $ICS_APP_NAME $ICS_LOGPATH WARN ERR } -# Tests if a variable value in the ECS is equal to a target value and and optional timeout. +# Tests if a variable value in the ICS is equal to a target value and and optional timeout. # Arg: - This test set pass or fail depending on if the variable is # equal to the target or not. # Arg: - This test waits up to the timeout seconds # before setting pass or fail depending on if the variable value becomes equal to the target # value or not. # (Function for test scripts) -ecs_equal() { +ics_equal() { if [ $# -eq 2 ] || [ $# -eq 3 ]; then - __var_test ECS "$ECS_SERVICE_PATH/" $1 "=" $2 $3 + __var_test ICS "$ICS_SERVICE_PATH/" $1 "=" $2 $3 else - __print_err "Wrong args to ecs_equal, needs two or three args: [ timeout ]" $@ + __print_err "Wrong args to ics_equal, needs two or three args: [ timeout ]" $@ fi } ########################################## -######### A1-E Enrichment API ########## +######### A1-E information API ########## ########################################## -#Function prefix: ecs_api_a1 +#Function prefix: ics_api_a1 # API Test function: GET /A1-EI​/v1​/eitypes​/{eiTypeId}​/eijobs # args: |NOOWNER [ EMPTY | + ] # args (flat uri structure): |NOTYPE |NOOWNER [ EMPTY | + ] # (Function for test scripts) -ecs_api_a1_get_job_ids() { +ics_api_a1_get_job_ids() { __log_test_start $@ if [ -z "$FLAT_A1_EI" ]; then @@ -530,7 +530,7 @@ ecs_api_a1_get_job_ids() { fi query="/A1-EI/v1/eijobs$search" fi - res="$(__do_curl_to_api ECS GET $query)" + res="$(__do_curl_to_api ICS GET $query)" status=${res:${#res}-3} if [ $status -ne $1 ]; then @@ -568,7 +568,7 @@ ecs_api_a1_get_job_ids() { # API Test function: GET ​/A1-EI​/v1​/eitypes​/{eiTypeId} # args: [] # (Function for test scripts) -ecs_api_a1_get_type() { +ics_api_a1_get_type() { __log_test_start $@ if [ $# -lt 2 ] || [ $# -gt 3 ]; then @@ -577,7 +577,7 @@ ecs_api_a1_get_type() { fi query="/A1-EI/v1/eitypes/$2" - res="$(__do_curl_to_api ECS GET $query)" + res="$(__do_curl_to_api ICS GET $query)" status=${res:${#res}-3} if [ $status -ne $1 ]; then @@ -614,7 +614,7 @@ ecs_api_a1_get_type() { # API Test function: GET /A1-EI/v1/eitypes # args: [ (EMPTY | []+) ] # (Function for test scripts) -ecs_api_a1_get_type_ids() { +ics_api_a1_get_type_ids() { __log_test_start $@ if [ $# -lt 1 ]; then @@ -623,7 +623,7 @@ ecs_api_a1_get_type_ids() { fi query="/A1-EI/v1/eitypes" - res="$(__do_curl_to_api ECS GET $query)" + res="$(__do_curl_to_api ICS GET $query)" status=${res:${#res}-3} if [ $status -ne $1 ]; then @@ -659,7 +659,7 @@ ecs_api_a1_get_type_ids() { # args: [] # args (flat uri structure): [ []] # (Function for test scripts) -ecs_api_a1_get_job_status() { +ics_api_a1_get_job_status() { __log_test_start $@ if [ -z "$FLAT_A1_EI" ]; then @@ -670,7 +670,7 @@ ecs_api_a1_get_job_status() { query="/A1-EI/v1/eitypes/$2/eijobs/$3/status" - res="$(__do_curl_to_api ECS GET $query)" + res="$(__do_curl_to_api ICS GET $query)" status=${res:${#res}-3} if [ $status -ne $1 ]; then @@ -699,7 +699,7 @@ ecs_api_a1_get_job_status() { start=$SECONDS for (( ; ; )); do - res="$(__do_curl_to_api ECS GET $query)" + res="$(__do_curl_to_api ICS GET $query)" status=${res:${#res}-3} if [ $# -eq 4 ]; then @@ -754,7 +754,7 @@ ecs_api_a1_get_job_status() { # args: [ ] # args (flat uri structure): [ ] # (Function for test scripts) -ecs_api_a1_get_job() { +ics_api_a1_get_job() { __log_test_start $@ if [ -z "$FLAT_A1_EI" ]; then @@ -771,7 +771,7 @@ ecs_api_a1_get_job() { fi query="/A1-EI/v1/eijobs/$2" fi - res="$(__do_curl_to_api ECS GET $query)" + res="$(__do_curl_to_api ICS GET $query)" status=${res:${#res}-3} if [ $status -ne $1 ]; then @@ -829,7 +829,7 @@ ecs_api_a1_get_job() { # args: # args (flat uri structure): # (Function for test scripts) -ecs_api_a1_delete_job() { +ics_api_a1_delete_job() { __log_test_start $@ if [ -z "$FLAT_A1_EI" ]; then @@ -847,7 +847,7 @@ ecs_api_a1_delete_job() { fi query="/A1-EI/v1/eijobs/$2" fi - res="$(__do_curl_to_api ECS DELETE $query)" + res="$(__do_curl_to_api ICS DELETE $query)" status=${res:${#res}-3} if [ $status -ne $1 ]; then @@ -863,7 +863,7 @@ ecs_api_a1_delete_job() { # args: # args (flat uri structure): # (Function for test scripts) -ecs_api_a1_put_job() { +ics_api_a1_put_job() { __log_test_start $@ if [ -z "$FLAT_A1_EI" ]; then @@ -905,7 +905,7 @@ ecs_api_a1_put_job() { query="/A1-EI/v1/eijobs/$2" fi - res="$(__do_curl_to_api ECS PUT $query $file)" + res="$(__do_curl_to_api ICS PUT $query $file)" status=${res:${#res}-3} if [ $status -ne $1 ]; then @@ -919,27 +919,27 @@ ecs_api_a1_put_job() { ########################################## -#### Enrichment Data Producer API #### +#### information Data Producer API #### ########################################## -# Function prefix: ecs_api_edp +# Function prefix: ics_api_edp # API Test function: GET /ei-producer/v1/eitypes # API Test function: GET /data-producer/v1/info-types # args: [ EMPTY | +] # (Function for test scripts) -ecs_api_edp_get_type_ids() { +ics_api_edp_get_type_ids() { __log_test_start $@ if [ $# -lt 1 ]; then __print_err " [ EMPTY | +]" $@ return 1 fi - if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then + if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then query="/data-producer/v1/info-types" else query="/ei-producer/v1/eitypes" fi - res="$(__do_curl_to_api ECS GET $query)" + res="$(__do_curl_to_api ICS GET $query)" status=${res:${#res}-3} if [ $status -ne $1 ]; then @@ -976,21 +976,21 @@ ecs_api_edp_get_type_ids() { # API Test function: GET /data-producer/v1/info-producers/{infoProducerId}/status # args: [ []] # (Function for test scripts) -ecs_api_edp_get_producer_status() { +ics_api_edp_get_producer_status() { __log_test_start $@ if [ $# -lt 2 ] || [ $# -gt 4 ]; then __print_err " [ []]" $@ return 1 fi - if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then + if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then query="/data-producer/v1/info-producers/$2/status" else query="/ei-producer/v1/eiproducers/$2/status" fi start=$SECONDS for (( ; ; )); do - res="$(__do_curl_to_api ECS GET $query)" + res="$(__do_curl_to_api ICS GET $query)" status=${res:${#res}-3} if [ $# -eq 4 ]; then @@ -1041,7 +1041,7 @@ ecs_api_edp_get_producer_status() { # API Test function: GET /ei-producer/v1/eiproducers # args (v1_1): [ EMPTY | +] # (Function for test scripts) -ecs_api_edp_get_producer_ids() { +ics_api_edp_get_producer_ids() { __log_test_start $@ if [ $# -lt 1 ]; then @@ -1050,7 +1050,7 @@ ecs_api_edp_get_producer_ids() { fi query="/ei-producer/v1/eiproducers" - res="$(__do_curl_to_api ECS GET $query)" + res="$(__do_curl_to_api ICS GET $query)" status=${res:${#res}-3} if [ $status -ne $1 ]; then @@ -1089,14 +1089,14 @@ ecs_api_edp_get_producer_ids() { # API Test function: GET /data-producer/v1/info-producers # args (v1_2): [ ( NOTYPE | ) [ EMPTY | +] ] # (Function for test scripts) -ecs_api_edp_get_producer_ids_2() { +ics_api_edp_get_producer_ids_2() { __log_test_start $@ if [ $# -lt 1 ]; then __print_err " [ ( NOTYPE | ) [ EMPTY | +] ]" $@ return 1 fi - if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then + if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then query="/data-producer/v1/info-producers" if [ $# -gt 1 ] && [ $2 != "NOTYPE" ]; then query=$query"?info_type_id=$2" @@ -1107,7 +1107,7 @@ ecs_api_edp_get_producer_ids_2() { query=$query"?ei_type_id=$2" fi fi - res="$(__do_curl_to_api ECS GET $query)" + res="$(__do_curl_to_api ICS GET $query)" status=${res:${#res}-3} if [ $status -ne $1 ]; then @@ -1145,7 +1145,7 @@ ecs_api_edp_get_producer_ids_2() { # API Test function: GET /ei-producer/v1/eitypes/{eiTypeId} # args: (v1_1) [ (EMPTY | []+)] # (Function for test scripts) -ecs_api_edp_get_type() { +ics_api_edp_get_type() { __log_test_start $@ paramError=1 @@ -1161,7 +1161,7 @@ ecs_api_edp_get_type() { fi query="/ei-producer/v1/eitypes/$2" - res="$(__do_curl_to_api ECS GET $query)" + res="$(__do_curl_to_api ICS GET $query)" status=${res:${#res}-3} if [ $status -ne $1 ]; then @@ -1205,7 +1205,7 @@ ecs_api_edp_get_type() { # API Test function: GET /data-producer/v1/info-types/{infoTypeId} # args: (v1_2) [ [ ]] # (Function for test scripts) -ecs_api_edp_get_type_2() { +ics_api_edp_get_type_2() { __log_test_start $@ paramError=1 @@ -1215,7 +1215,7 @@ ecs_api_edp_get_type_2() { if [ $# -eq 3 ]; then paramError=0 fi - if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPE-INFO"* ]]; then + if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPE-INFO"* ]]; then if [ $# -eq 4 ]; then paramError=0 fi @@ -1224,13 +1224,13 @@ ecs_api_edp_get_type_2() { __print_err " [ [ ]]" $@ return 1 fi - if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then + if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then query="/data-producer/v1/info-types/$2" else query="/ei-producer/v1/eitypes/$2" fi - res="$(__do_curl_to_api ECS GET $query)" + res="$(__do_curl_to_api ICS GET $query)" status=${res:${#res}-3} if [ $status -ne $1 ]; then @@ -1256,7 +1256,7 @@ ecs_api_edp_get_type_2() { fi info_data=",\"info_type_information\":$info_data" fi - if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then + if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then targetJson="{\"info_job_data_schema\":$schema $info_data}" else targetJson="{\"ei_job_data_schema\":$schema}" @@ -1278,10 +1278,10 @@ ecs_api_edp_get_type_2() { # API Test function: PUT /data-producer/v1/info-types/{infoTypeId} # args: (v1_2) [ ] # (Function for test scripts) -ecs_api_edp_put_type_2() { +ics_api_edp_put_type_2() { __log_test_start $@ - if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPE-INFO"* ]]; then + if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPE-INFO"* ]]; then if [ $# -lt 3 ] || [ $# -gt 4 ]; then __print_err " [ ]" $@ return 1 @@ -1309,7 +1309,7 @@ ecs_api_edp_put_type_2() { info_data=",\"info_type_information\":$info_data" fi - if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then + if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then schema=$(cat $3) input_json="{\"info_job_data_schema\":$schema $info_data}" file="./tmp/put_type.json" @@ -1324,7 +1324,7 @@ ecs_api_edp_put_type_2() { query="/ei-producer/v1/eitypes/$2" fi - res="$(__do_curl_to_api ECS PUT $query $file)" + res="$(__do_curl_to_api ICS PUT $query $file)" status=${res:${#res}-3} if [ $status -ne $1 ]; then @@ -1340,7 +1340,7 @@ ecs_api_edp_put_type_2() { # API Test function: DELETE /data-producer/v1/info-types/{infoTypeId} # args: (v1_2) # (Function for test scripts) -ecs_api_edp_delete_type_2() { +ics_api_edp_delete_type_2() { __log_test_start $@ if [ $# -ne 2 ]; then @@ -1348,12 +1348,12 @@ ecs_api_edp_delete_type_2() { return 1 fi - if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then + if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then query="/data-producer/v1/info-types/$2" else query="/ei-producer/v1/eitypes/$2" fi - res="$(__do_curl_to_api ECS DELETE $query)" + res="$(__do_curl_to_api ICS DELETE $query)" status=${res:${#res}-3} if [ $status -ne $1 ]; then @@ -1368,7 +1368,7 @@ ecs_api_edp_delete_type_2() { # API Test function: GET /ei-producer/v1/eiproducers/{eiProducerId} # args: (v1_1) [ (EMPTY | [ ]+) ] # (Function for test scripts) -ecs_api_edp_get_producer() { +ics_api_edp_get_producer() { __log_test_start $@ #Possible arg count: 2, 5 6, 8, 10 etc @@ -1390,7 +1390,7 @@ ecs_api_edp_get_producer() { fi query="/ei-producer/v1/eiproducers/$2" - res="$(__do_curl_to_api ECS GET $query)" + res="$(__do_curl_to_api ICS GET $query)" status=${res:${#res}-3} if [ $status -ne $1 ]; then @@ -1438,7 +1438,7 @@ ecs_api_edp_get_producer() { # API Test function: GET /data-producer/v1/info-producers/{infoProducerId} # args (v1_2): [ (EMPTY | +) ] # (Function for test scripts) -ecs_api_edp_get_producer_2() { +ics_api_edp_get_producer_2() { __log_test_start $@ #Possible arg count: 2, 5, 6, 7, 8 etc @@ -1457,12 +1457,12 @@ ecs_api_edp_get_producer_2() { __print_err " [ (EMPTY | +) ]" $@ return 1 fi - if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then + if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then query="/data-producer/v1/info-producers/$2" else query="/ei-producer/v1/eiproducers/$2" fi - res="$(__do_curl_to_api ECS GET $query)" + res="$(__do_curl_to_api ICS GET $query)" status=${res:${#res}-3} if [ $status -ne $1 ]; then @@ -1484,7 +1484,7 @@ ecs_api_edp_get_producer_2() { fi targetJson=$targetJson"]" if [ $# -gt 4 ]; then - if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then + if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then targetJson="{\"supported_info_types\":$targetJson,\"info_job_callback_url\": \"$3\",\"info_producer_supervision_callback_url\": \"$4\"}" else targetJson="{\"supported_ei_types\":$targetJson,\"ei_job_callback_url\": \"$3\",\"ei_producer_supervision_callback_url\": \"$4\"}" @@ -1507,19 +1507,19 @@ ecs_api_edp_get_producer_2() { # API Test function: DELETE /data-producer/v1/info-producers/{infoProducerId} # args: # (Function for test scripts) -ecs_api_edp_delete_producer() { +ics_api_edp_delete_producer() { __log_test_start $@ if [ $# -lt 2 ]; then __print_err " " $@ return 1 fi - if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then + if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then query="/data-producer/v1/info-producers/$2" else query="/ei-producer/v1/eiproducers/$2" fi - res="$(__do_curl_to_api ECS DELETE $query)" + res="$(__do_curl_to_api ICS DELETE $query)" status=${res:${#res}-3} if [ $status -ne $1 ]; then @@ -1534,7 +1534,7 @@ ecs_api_edp_delete_producer() { # API Test function: PUT /ei-producer/v1/eiproducers/{eiProducerId} # args: (v1_1) NOTYPE|[ ]+ # (Function for test scripts) -ecs_api_edp_put_producer() { +ics_api_edp_put_producer() { __log_test_start $@ #Valid number of parametrer 5,6,8,10, @@ -1574,7 +1574,7 @@ ecs_api_edp_put_producer() { file="./tmp/.p.json" echo "$inputJson" > $file query="/ei-producer/v1/eiproducers/$2" - res="$(__do_curl_to_api ECS PUT $query $file)" + res="$(__do_curl_to_api ICS PUT $query $file)" status=${res:${#res}-3} if [ $status -ne $1 ]; then @@ -1590,7 +1590,7 @@ ecs_api_edp_put_producer() { # API Test function: PUT /data-producer/v1/info-producers/{infoProducerId} # args: (v1_2) NOTYPE|[+] # (Function for test scripts) -ecs_api_edp_put_producer_2() { +ics_api_edp_put_producer_2() { __log_test_start $@ #Valid number of parametrer 5,6,8,10, @@ -1615,7 +1615,7 @@ ecs_api_edp_put_producer_2() { inputJson=$inputJson"\""${arr[$i]}"\"" done fi - if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then + if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then inputJson="\"supported_info_types\":"$inputJson"]" inputJson=$inputJson",\"info_job_callback_url\": \"$3\",\"info_producer_supervision_callback_url\": \"$4\"" @@ -1636,7 +1636,7 @@ ecs_api_edp_put_producer_2() { echo "$inputJson" > $file query="/ei-producer/v1/eiproducers/$2" fi - res="$(__do_curl_to_api ECS PUT $query $file)" + res="$(__do_curl_to_api ICS PUT $query $file)" status=${res:${#res}-3} if [ $status -ne $1 ]; then @@ -1651,7 +1651,7 @@ ecs_api_edp_put_producer_2() { # API Test function: GET /ei-producer/v1/eiproducers/{eiProducerId}/eijobs # args: (V1-1) (EMPTY | [ ]+) # (Function for test scripts) -ecs_api_edp_get_producer_jobs() { +ics_api_edp_get_producer_jobs() { __log_test_start $@ #Valid number of parameter 2,3,7,11 @@ -1672,7 +1672,7 @@ ecs_api_edp_get_producer_jobs() { fi query="/ei-producer/v1/eiproducers/$2/eijobs" - res="$(__do_curl_to_api ECS GET $query)" + res="$(__do_curl_to_api ICS GET $query)" status=${res:${#res}-3} if [ $status -ne $1 ]; then __log_test_fail_status_code $1 $status @@ -1716,7 +1716,7 @@ ecs_api_edp_get_producer_jobs() { # API Test function: GET /data-producer/v1/info-producers/{infoProducerId}/info-jobs # args: (V1-2) (EMPTY | [ ]+) # (Function for test scripts) -ecs_api_edp_get_producer_jobs_2() { +ics_api_edp_get_producer_jobs_2() { __log_test_start $@ #Valid number of parameter 2,3,7,11 @@ -1735,12 +1735,12 @@ ecs_api_edp_get_producer_jobs_2() { __print_err " (EMPTY | [ ]+)" $@ return 1 fi - if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then + if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then query="/data-producer/v1/info-producers/$2/info-jobs" else query="/ei-producer/v1/eiproducers/$2/eijobs" fi - res="$(__do_curl_to_api ECS GET $query)" + res="$(__do_curl_to_api ICS GET $query)" status=${res:${#res}-3} if [ $status -ne $1 ]; then __log_test_fail_status_code $1 $status @@ -1762,7 +1762,7 @@ ecs_api_edp_get_producer_jobs_2() { __log_test_fail_general "Job template file "${arr[$i+4]}", does not exist" return 1 fi - if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then + if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then targetJson=$targetJson"{\"info_job_identity\":\"${arr[$i]}\",\"info_type_identity\":\"${arr[$i+1]}\",\"target_uri\":\"${arr[$i+2]}\",\"owner\":\"${arr[$i+3]}\",\"info_job_data\":$jobfile, \"last_updated\":\"????\"}" else targetJson=$targetJson"{\"ei_job_identity\":\"${arr[$i]}\",\"ei_type_identity\":\"${arr[$i+1]}\",\"target_uri\":\"${arr[$i+2]}\",\"owner\":\"${arr[$i+3]}\",\"ei_job_data\":$jobfile, \"last_updated\":\"????\"}" @@ -1787,19 +1787,19 @@ ecs_api_edp_get_producer_jobs_2() { ########################################## #### Service status #### ########################################## -# Function prefix: ecs_api_service +# Function prefix: ics_api_service # API Test function: GET ​/status # args: # (Function for test scripts) -ecs_api_service_status() { +ics_api_service_status() { __log_test_start $@ if [ $# -lt 1 ]; then __print_err "" $@ return 1 fi - res="$(__do_curl_to_api ECS GET /status)" + res="$(__do_curl_to_api ICS GET /status)" status=${res:${#res}-3} if [ $status -ne $1 ]; then __log_test_fail_status_code $1 $status @@ -1812,13 +1812,13 @@ ecs_api_service_status() { ########################################### ######### Info data consumer API ########## ########################################### -#Function prefix: ecs_api_idc +#Function prefix: ics_api_idc # API Test function: GET /data-consumer/v1/info-types # args: [ (EMPTY | []+) ] # (Function for test scripts) -ecs_api_idc_get_type_ids() { +ics_api_idc_get_type_ids() { __log_test_start $@ if [ $# -lt 1 ]; then @@ -1827,7 +1827,7 @@ ecs_api_idc_get_type_ids() { fi query="/data-consumer/v1/info-types" - res="$(__do_curl_to_api ECS GET $query)" + res="$(__do_curl_to_api ICS GET $query)" status=${res:${#res}-3} if [ $status -ne $1 ]; then @@ -1862,7 +1862,7 @@ ecs_api_idc_get_type_ids() { # API Test function: GET /data-consumer/v1/info-jobs # args: |NOTYPE |NOOWNER [ EMPTY | + ] # (Function for test scripts) -ecs_api_idc_get_job_ids() { +ics_api_idc_get_job_ids() { __log_test_start $@ # Valid number of parameters 4,5,6 etc @@ -1884,7 +1884,7 @@ ecs_api_idc_get_job_ids() { fi query="/data-consumer/v1/info-jobs$search" - res="$(__do_curl_to_api ECS GET $query)" + res="$(__do_curl_to_api ICS GET $query)" status=${res:${#res}-3} if [ $status -ne $1 ]; then @@ -1922,7 +1922,7 @@ ecs_api_idc_get_job_ids() { # API Test function: GET /data-consumer/v1/info-jobs/{infoJobId} # args: [ ] # (Function for test scripts) -ecs_api_idc_get_job() { +ics_api_idc_get_job() { __log_test_start $@ if [ $# -ne 2 ] && [ $# -ne 7 ]; then @@ -1930,7 +1930,7 @@ ecs_api_idc_get_job() { return 1 fi query="/data-consumer/v1/info-jobs/$2" - res="$(__do_curl_to_api ECS GET $query)" + res="$(__do_curl_to_api ICS GET $query)" status=${res:${#res}-3} if [ $status -ne $1 ]; then @@ -1966,7 +1966,7 @@ ecs_api_idc_get_job() { # API Test function: PUT ​/data-consumer/v1/info-jobs/{infoJobId} # args: [ VALIDATE ] # (Function for test scripts) -ecs_api_idc_put_job() { +ics_api_idc_put_job() { __log_test_start $@ if [ $# -lt 7 ] || [ $# -gt 8 ]; then @@ -1993,7 +1993,7 @@ ecs_api_idc_put_job() { fi fi - res="$(__do_curl_to_api ECS PUT $query $file)" + res="$(__do_curl_to_api ICS PUT $query $file)" status=${res:${#res}-3} if [ $status -ne $1 ]; then @@ -2008,7 +2008,7 @@ ecs_api_idc_put_job() { # API Test function: DELETE ​/data-consumer/v1/info-jobs/{infoJobId} # args: # (Function for test scripts) -ecs_api_idc_delete_job() { +ics_api_idc_delete_job() { __log_test_start $@ if [ $# -ne 2 ]; then @@ -2016,7 +2016,7 @@ ecs_api_idc_delete_job() { return 1 fi query="/data-consumer/v1/info-jobs/$2" - res="$(__do_curl_to_api ECS DELETE $query)" + res="$(__do_curl_to_api ICS DELETE $query)" status=${res:${#res}-3} if [ $status -ne $1 ]; then @@ -2031,7 +2031,7 @@ ecs_api_idc_delete_job() { # API Test function: GET ​/data-consumer/v1/info-types/{infoTypeId} # args: [ [ [ []] # (Function for test scripts) -ecs_api_idc_get_job_status() { +ics_api_idc_get_job_status() { __log_test_start $@ if [ $# -lt 2 ] && [ $# -gt 4 ]; then @@ -2090,7 +2090,7 @@ ecs_api_idc_get_job_status() { start=$SECONDS for (( ; ; )); do - res="$(__do_curl_to_api ECS GET $query)" + res="$(__do_curl_to_api ICS GET $query)" status=${res:${#res}-3} if [ $# -eq 4 ]; then @@ -2144,7 +2144,7 @@ ecs_api_idc_get_job_status() { # This function test status and the list of producers with and optional timeout # args: [ EMPTYPROD|( + ) []] # (Function for test scripts) -ecs_api_idc_get_job_status2() { +ics_api_idc_get_job_status2() { __log_test_start $@ param_error=0 @@ -2169,9 +2169,9 @@ ecs_api_idc_get_job_status2() { idx=$(($4+4)) timeout=${args[$idx]} fi - for ((ecs_i = 0 ; ecs_i < $4 ; ecs_i++)); do - idx=$(($ecs_i+4)) - if [ $ecs_i -gt 0 ]; then + for ((ics_i = 0 ; ics_i < $4 ; ics_i++)); do + idx=$(($ics_i+4)) + if [ $ics_i -gt 0 ]; then targetJson=$targetJson"," fi targetJson=$targetJson"\""${args[$idx]}"\"" @@ -2189,7 +2189,7 @@ ecs_api_idc_get_job_status2() { start=$SECONDS for (( ; ; )); do - res="$(__do_curl_to_api ECS GET $query)" + res="$(__do_curl_to_api ICS GET $query)" status=${res:${#res}-3} if [ $# -gt 2 ]; then @@ -2245,7 +2245,7 @@ ecs_api_idc_get_job_status2() { # API Test function: GET /data-consumer/v1/info-type-subscription # args: |NOOWNER [ EMPTY | +] # (Function for test scripts) -ecs_api_idc_get_subscription_ids() { +ics_api_idc_get_subscription_ids() { __log_test_start $@ if [ $# -lt 3 ]; then @@ -2259,7 +2259,7 @@ ecs_api_idc_get_subscription_ids() { search="?owner="$2 fi - res="$(__do_curl_to_api ECS GET $query$search)" + res="$(__do_curl_to_api ICS GET $query$search)" status=${res:${#res}-3} if [ $status -ne $1 ]; then @@ -2295,7 +2295,7 @@ ecs_api_idc_get_subscription_ids() { # API Test function: GET /data-consumer/v1/info-type-subscription/{subscriptionId} # args: [ ] # (Function for test scripts) -ecs_api_idc_get_subscription() { +ics_api_idc_get_subscription() { __log_test_start $@ if [ $# -ne 2 ] && [ $# -ne 4 ]; then @@ -2304,7 +2304,7 @@ ecs_api_idc_get_subscription() { fi query="/data-consumer/v1/info-type-subscription/$2" - res="$(__do_curl_to_api ECS GET $query)" + res="$(__do_curl_to_api ICS GET $query)" status=${res:${#res}-3} if [ $status -ne $1 ]; then @@ -2331,7 +2331,7 @@ ecs_api_idc_get_subscription() { # API Test function: PUT /data-consumer/v1/info-type-subscription/{subscriptionId} # args: # (Function for test scripts) -ecs_api_idc_put_subscription() { +ics_api_idc_put_subscription() { __log_test_start $@ if [ $# -ne 4 ]; then @@ -2344,7 +2344,7 @@ ecs_api_idc_put_subscription() { echo "$inputJson" > $file query="/data-consumer/v1/info-type-subscription/$2" - res="$(__do_curl_to_api ECS PUT $query $file)" + res="$(__do_curl_to_api ICS PUT $query $file)" status=${res:${#res}-3} if [ $status -ne $1 ]; then @@ -2359,7 +2359,7 @@ ecs_api_idc_put_subscription() { # API Test function: DELETE /data-consumer/v1/info-type-subscription/{subscriptionId} # args: # (Function for test scripts) -ecs_api_idc_delete_subscription() { +ics_api_idc_delete_subscription() { __log_test_start $@ if [ $# -ne 2 ]; then @@ -2368,7 +2368,7 @@ ecs_api_idc_delete_subscription() { fi query="/data-consumer/v1/info-type-subscription/$2" - res="$(__do_curl_to_api ECS DELETE $query)" + res="$(__do_curl_to_api ICS DELETE $query)" status=${res:${#res}-3} if [ $status -ne $1 ]; then @@ -2383,13 +2383,13 @@ ecs_api_idc_delete_subscription() { ########################################## #### Reset jobs #### ########################################## -# Function prefix: ecs_api_admin +# Function prefix: ics_api_admin # Admin to remove all jobs # args: [ ] # (Function for test scripts) -ecs_api_admin_reset() { +ics_api_admin_reset() { __log_test_start $@ if [ -z "$FLAT_A1_EI" ]; then @@ -2397,7 +2397,7 @@ ecs_api_admin_reset() { else query="/A1-EI/v1/eijobs" fi - res="$(__do_curl_to_api ECS GET $query)" + res="$(__do_curl_to_api ICS GET $query)" status=${res:${#res}-3} if [ $status -ne 200 ]; then @@ -2417,7 +2417,7 @@ ecs_api_admin_reset() { echo "Not supported for non-flat EI api" else query="/A1-EI/v1/eijobs/$job" - res="$(__do_curl_to_api ECS DELETE $query)" + res="$(__do_curl_to_api ICS DELETE $query)" status=${res:${#res}-3} if [ $status -ne 204 ]; then __log_test_fail_status_code $1 $status @@ -2436,21 +2436,21 @@ ecs_api_admin_reset() { ########################################## -# Admin reset to remove all data in ecs; jobs, producers etc +# Admin reset to remove all data in ics; jobs, producers etc # NOTE - only works in kubernetes and the pod should not be running # args: - # (Function for test scripts) -ecs_kube_pvc_reset() { +ics_kube_pvc_reset() { __log_test_start $@ - pvc_name=$(kubectl get pvc -n $KUBE_NONRTRIC_NAMESPACE --no-headers -o custom-columns=":metadata.name" | grep enrichment) + pvc_name=$(kubectl get pvc -n $KUBE_NONRTRIC_NAMESPACE --no-headers -o custom-columns=":metadata.name" | grep information) if [ -z "$pvc_name" ]; then - pvc_name=enrichmentservice-pvc + pvc_name=informationservice-pvc fi echo " Trying to reset pvc: "$pvc_name - __kube_clean_pvc $ECS_APP_NAME $KUBE_NONRTRIC_NAMESPACE $pvc_name $ECS_CONTAINER_MNT_DIR + __kube_clean_pvc $ICS_APP_NAME $KUBE_NONRTRIC_NAMESPACE $pvc_name $ICS_CONTAINER_MNT_DIR __log_test_pass return 0 diff --git a/test/common/mr_api_functions.sh b/test/common/mr_api_functions.sh index c6feb459..55badb00 100755 --- a/test/common/mr_api_functions.sh +++ b/test/common/mr_api_functions.sh @@ -273,7 +273,7 @@ use_mr_https() { # args: __mr_set_protocoll() { echo -e $BOLD"$MR_STUB_DISPLAY_NAME and $MR_DMAAP_DISPLAY_NAME protocol setting"$EBOLD - echo -e " Using $BOLD http $EBOLD towards $MR_STUB_DISPLAY_NAME and $MR_DMAAP_DISPLAY_NAME" + echo -e " Using $BOLD $1 $EBOLD towards $MR_STUB_DISPLAY_NAME and $MR_DMAAP_DISPLAY_NAME" ## Access to Dmaap mediator diff --git a/test/common/ngw_api_functions.sh b/test/common/ngw_api_functions.sh index d8f1707b..9e29278c 100644 --- a/test/common/ngw_api_functions.sh +++ b/test/common/ngw_api_functions.sh @@ -128,7 +128,7 @@ use_gateway_https() { # args: __gateway_set_protocoll() { echo -e $BOLD"$NRT_GATEWAY_DISPLAY_NAME protocol setting"$EBOLD - echo -e " Using $BOLD http $EBOLD towards $NRT_GATEWAY_DISPLAY_NAME" + echo -e " Using $BOLD $1 $EBOLD towards $NRT_GATEWAY_DISPLAY_NAME" ## Access to nonrtric gateway @@ -199,12 +199,12 @@ __gateway_export_vars() { if [ $RUNMODE == "KUBE" ]; then export POLICY_AGENT_EXTERNAL_SECURE_PORT - export ECS_EXTERNAL_SECURE_PORT + export ICS_EXTERNAL_SECURE_PORT export POLICY_AGENT_DOMAIN_NAME=$POLICY_AGENT_APP_NAME.$KUBE_NONRTRIC_NAMESPACE - export ECS_DOMAIN_NAME=$ECS_APP_NAME.$KUBE_NONRTRIC_NAMESPACE + export ICS_DOMAIN_NAME=$ICS_APP_NAME.$KUBE_NONRTRIC_NAMESPACE else export POLICY_AGENT_DOMAIN_NAME=$POLICY_AGENT_APP_NAME - export ECS_DOMAIN_NAME=$ECS_APP_NAME + export ICS_DOMAIN_NAME=$ICS_APP_NAME fi } @@ -319,11 +319,11 @@ gateway_pms_get_status() { return 0 } -# API Test function: GET /ei-producer/v1/eitypes towards ECS +# API Test function: GET /ei-producer/v1/eitypes towards ICS # Note: This is just to test service response # args: # (Function for test scripts) -gateway_ecs_get_types() { +gateway_ics_get_types() { __log_test_start $@ if [ $# -ne 1 ]; then __print_err "" $@ diff --git a/test/common/pa_api_functions.sh b/test/common/pa_api_functions.sh index 219aedb3..7c917051 100644 --- a/test/common/pa_api_functions.sh +++ b/test/common/pa_api_functions.sh @@ -149,7 +149,7 @@ use_agent_dmaap_https() { # args: __agent_set_protocoll() { echo -e $BOLD"$POLICY_AGENT_DISPLAY_NAME protocol setting"$EBOLD - echo -e " Using $BOLD http $EBOLD towards $POLICY_AGENT_DISPLAY_NAME" + echo -e " Using $BOLD $1 $EBOLD towards $POLICY_AGENT_DISPLAY_NAME" ## Access to Dmaap adapter diff --git a/test/common/prodstub_api_functions.sh b/test/common/prodstub_api_functions.sh index 17f987ab..f792d697 100644 --- a/test/common/prodstub_api_functions.sh +++ b/test/common/prodstub_api_functions.sh @@ -139,7 +139,7 @@ use_prod_stub_https() { # args: __prod_stub_set_protocoll() { echo -e $BOLD"$PROD_STUB_DISPLAY_NAME protocol setting"$EBOLD - echo -e " Using $BOLD http $EBOLD towards $PROD_STUB_DISPLAY_NAME" + echo -e " Using $BOLD $1 $EBOLD towards $PROD_STUB_DISPLAY_NAME" ## Access to Prod stub sim @@ -192,13 +192,13 @@ start_prod_stub() { retcode_p=$? if [ $retcode_i -ne 0 ] && [ $retcode_p -ne 0 ]; then - echo -e $RED"The $ECS_APP_NAME app is not included as managed nor prestarted in this test script"$ERED - echo -e $RED"The $ECS_APP_NAME will not be started"$ERED + echo -e $RED"The $ICS_APP_NAME app is not included as managed nor prestarted in this test script"$ERED + echo -e $RED"The $ICS_APP_NAME will not be started"$ERED exit fi if [ $retcode_i -eq 0 ] && [ $retcode_p -eq 0 ]; then - echo -e $RED"The $ECS_APP_NAME app is included both as managed and prestarted in this test script"$ERED - echo -e $RED"The $ECS_APP_NAME will not be started"$ERED + echo -e $RED"The $ICS_APP_NAME app is included both as managed and prestarted in this test script"$ERED + echo -e $RED"The $ICS_APP_NAME will not be started"$ERED exit fi @@ -438,7 +438,7 @@ prodstub_check_jobdata_2() { __log_test_fail_general "Template file "$7" for jobdata, does not exist" return 1 fi - if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then + if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then targetJson="{\"info_job_identity\":\"$3\",\"info_type_identity\":\"$4\",\"target_uri\":\"$5\",\"owner\":\"$6\", \"info_job_data\":$jobfile,\"last_updated\":\"????\"}" else targetJson="{\"ei_job_identity\":\"$3\",\"ei_type_identity\":\"$4\",\"target_uri\":\"$5\",\"owner\":\"$6\", \"ei_job_data\":$jobfile,\"last_updated\":\"????\"}" diff --git a/test/common/rc_api_functions.sh b/test/common/rc_api_functions.sh index 537bc0c2..3766d191 100644 --- a/test/common/rc_api_functions.sh +++ b/test/common/rc_api_functions.sh @@ -116,7 +116,7 @@ use_rapp_catalogue_https() { # args: __rapp_catalogue_set_protocoll() { echo -e $BOLD"$RAPP_CAT_DISPLAY_NAME protocol setting"$EBOLD - echo -e " Using $BOLD http $EBOLD towards $RAPP_CAT_DISPLAY_NAME" + echo -e " Using $BOLD $1 $EBOLD towards $RAPP_CAT_DISPLAY_NAME" ## Access to Rapp catalogue @@ -234,7 +234,7 @@ rc_equal() { #__var_test RC "$LOCALHOST_HTTP:$RC_EXTERNAL_PORT/" $1 "=" $2 $3 __var_test RC "$RC_SERVICE_PATH/" $1 "=" $2 $3 else - __print_err "Wrong args to ecs_equal, needs two or three args: [ timeout ]" $@ + __print_err "Wrong args to ics_equal, needs two or three args: [ timeout ]" $@ fi } diff --git a/test/common/sdnc_api_functions.sh b/test/common/sdnc_api_functions.sh index b3ef07b9..d502825b 100644 --- a/test/common/sdnc_api_functions.sh +++ b/test/common/sdnc_api_functions.sh @@ -140,7 +140,7 @@ use_sdnc_https() { # args: __sdnc_set_protocoll() { echo -e $BOLD"$SDNC_DISPLAY_NAME protocol setting"$EBOLD - echo -e " Using $BOLD http $EBOLD towards $SDNC_DISPLAY_NAME" + echo -e " Using $BOLD $1 $EBOLD towards $SDNC_DISPLAY_NAME" ## Access to SDNC diff --git a/test/common/test_env-onap-honolulu.sh b/test/common/test_env-onap-honolulu.sh index f82d54fe..b312518e 100755 --- a/test/common/test_env-onap-honolulu.sh +++ b/test/common/test_env-onap-honolulu.sh @@ -86,10 +86,10 @@ SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_RELEASE="2.1.6" SDNC_DB_IMAGE_BASE="mariadb" SDNC_DB_IMAGE_TAG_REMOTE_PROXY="10.5" -# ECS image and tag - uses cherry release -ECS_IMAGE_BASE="o-ran-sc/nonrtric-enrichment-coordinator-service" -ECS_IMAGE_TAG_REMOTE_RELEASE_ORAN="1.0.1" -#Note: Update var ECS_FEATURE_LEVEL if image version is changed +# ICS image and tag - uses cherry release +ICS_IMAGE_BASE="o-ran-sc/nonrtric-enrichment-coordinator-service" +ICS_IMAGE_TAG_REMOTE_RELEASE_ORAN="1.0.1" +#Note: Update var ICS_FEATURE_LEVEL if image version is changed # Control Panel image and tag - uses cherry release CONTROL_PANEL_IMAGE_BASE="o-ran-sc/nonrtric-controlpanel" @@ -170,7 +170,7 @@ PVC_CLEANER_IMAGE_TAG_REMOTE_PROXY="20.10" PROJECT_IMAGES_APP_NAMES="PA SDNC" # List of app short names which images pulled from ORAN -ORAN_IMAGES_APP_NAMES="CP ECS RICSIM RC" +ORAN_IMAGES_APP_NAMES="CP ICS RICSIM RC" # List of app short names which images pulled from ONAP ONAP_IMAGES_APP_NAMES="" # Not used @@ -213,25 +213,25 @@ POLICY_AGENT_CONFIG_FILE="application.yaml" # Container config file POLICY_AGENT_DATA_FILE="application_configuration.json" # Container data file name POLICY_AGENT_CONTAINER_MNT_DIR="/var/policy-management-service" # Mounted dir in the container -ECS_APP_NAME="enrichmentservice" # Name for ECS container -ECS_DISPLAY_NAME="Enrichment Coordinator Service" # Display name for ECS container -ECS_EXTERNAL_PORT=8083 # ECS container external port (host -> container) -ECS_INTERNAL_PORT=8083 # ECS container internal port (container -> container) -ECS_EXTERNAL_SECURE_PORT=8434 # ECS container external secure port (host -> container) -ECS_INTERNAL_SECURE_PORT=8434 # ECS container internal secure port (container -> container) - -ECS_LOGPATH="/var/log/enrichment-coordinator-service/application.log" # Path the application log in the ECS container -ECS_APP_NAME_ALIAS="enrichment-service-container" # Alias name, name used by the control panel -ECS_HOST_MNT_DIR="./mnt" # Mounted dir, relative to compose file, on the host -ECS_CONTAINER_MNT_DIR="/var/enrichment-coordinator-service" # Mounted dir in the container -ECS_ACTUATOR="/actuator/loggers/org.oransc.enrichment" # Url for trace/debug -ECS_CERT_MOUNT_DIR="./cert" -ECS_ALIVE_URL="/status" # Base path for alive check -ECS_COMPOSE_DIR="ecs" # Dir in simulator_group for docker-compose -ECS_CONFIG_MOUNT_PATH=/opt/app/enrichment-coordinator-service/config # Internal container path for configuration -ECS_CONFIG_FILE=application.yaml # Config file name -ECS_VERSION="V1-2" # Version where the types are added in the producer registration -ECS_FEATURE_LEVEL="" # Space separated list of features +ICS_APP_NAME="informationservice" # Name for ICS container +ICS_DISPLAY_NAME="Enrichment Coordinator Service" # Display name for ICS container +ICS_EXTERNAL_PORT=8083 # ICS container external port (host -> container) +ICS_INTERNAL_PORT=8083 # ICS container internal port (container -> container) +ICS_EXTERNAL_SECURE_PORT=8434 # ICS container external secure port (host -> container) +ICS_INTERNAL_SECURE_PORT=8434 # ICS container internal secure port (container -> container) + +ICS_LOGPATH="/var/log/information-coordinator-service/application.log" # Path the application log in the ICS container +ICS_APP_NAME_ALIAS="information-service-container" # Alias name, name used by the control panel +ICS_HOST_MNT_DIR="./mnt" # Mounted dir, relative to compose file, on the host +ICS_CONTAINER_MNT_DIR="/var/information-coordinator-service" # Mounted dir in the container +ICS_ACTUATOR="/actuator/loggers/org.oransc.information" # Url for trace/debug +ICS_CERT_MOUNT_DIR="./cert" +ICS_ALIVE_URL="/status" # Base path for alive check +ICS_COMPOSE_DIR="ics" # Dir in simulator_group for docker-compose +ICS_CONFIG_MOUNT_PATH=/opt/app/information-coordinator-service/config # Internal container path for configuration +ICS_CONFIG_FILE=application.yaml # Config file name +ICS_VERSION="V1-2" # Version where the types are added in the producer registration +ICS_FEATURE_LEVEL="" # Space separated list of features MR_DMAAP_APP_NAME="message-router" # Name for the Dmaap MR MR_STUB_APP_NAME="mr-stub" # Name of the MR stub diff --git a/test/common/test_env-onap-istanbul.sh b/test/common/test_env-onap-istanbul.sh index b2b0d2ed..a8d1b0a7 100644 --- a/test/common/test_env-onap-istanbul.sh +++ b/test/common/test_env-onap-istanbul.sh @@ -86,10 +86,10 @@ SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_RELEASE="2.2.1" SDNC_DB_IMAGE_BASE="mariadb" SDNC_DB_IMAGE_TAG_REMOTE_PROXY="10.5" -# ECS image and tag - uses d release -ECS_IMAGE_BASE="o-ran-sc/nonrtric-enrichment-coordinator-service" -ECS_IMAGE_TAG_REMOTE_RELEASE_ORAN="1.1.0" -#Note: Update var ECS_FEATURE_LEVEL if image version is changed +# ICS image and tag - uses d release +ICS_IMAGE_BASE="o-ran-sc/nonrtric-enrichment-coordinator-service" +ICS_IMAGE_TAG_REMOTE_RELEASE_ORAN="1.1.0" +#Note: Update var ICS_FEATURE_LEVEL if image version is changed # Control Panel image and tag - uses d release CONTROL_PANEL_IMAGE_BASE="o-ran-sc/nonrtric-controlpanel" @@ -173,7 +173,7 @@ PVC_CLEANER_IMAGE_TAG_REMOTE_PROXY="20.10" PROJECT_IMAGES_APP_NAMES="PA SDNC" # List of app short names which images pulled from ORAN -ORAN_IMAGES_APP_NAMES="CP ECS RICSIM RC NGW" +ORAN_IMAGES_APP_NAMES="CP ICS RICSIM RC NGW" # List of app short names which images pulled from ONAP ONAP_IMAGES_APP_NAMES="" # Not used @@ -216,25 +216,25 @@ POLICY_AGENT_CONFIG_FILE="application.yaml" # Container config file POLICY_AGENT_DATA_FILE="application_configuration.json" # Container data file name POLICY_AGENT_CONTAINER_MNT_DIR="/var/policy-management-service" # Mounted dir in the container -ECS_APP_NAME="enrichmentservice" # Name for ECS container -ECS_DISPLAY_NAME="Enrichment Coordinator Service" # Display name for ECS container -ECS_EXTERNAL_PORT=8083 # ECS container external port (host -> container) -ECS_INTERNAL_PORT=8083 # ECS container internal port (container -> container) -ECS_EXTERNAL_SECURE_PORT=8434 # ECS container external secure port (host -> container) -ECS_INTERNAL_SECURE_PORT=8434 # ECS container internal secure port (container -> container) - -ECS_LOGPATH="/var/log/enrichment-coordinator-service/application.log" # Path the application log in the ECS container -ECS_APP_NAME_ALIAS="enrichment-service-container" # Alias name, name used by the control panel -ECS_HOST_MNT_DIR="./mnt" # Mounted dir, relative to compose file, on the host -ECS_CONTAINER_MNT_DIR="/var/enrichment-coordinator-service" # Mounted dir in the container -ECS_ACTUATOR="/actuator/loggers/org.oransc.enrichment" # Url for trace/debug -ECS_CERT_MOUNT_DIR="./cert" -ECS_ALIVE_URL="/status" # Base path for alive check -ECS_COMPOSE_DIR="ecs" # Dir in simulator_group for docker-compose -ECS_CONFIG_MOUNT_PATH=/opt/app/enrichment-coordinator-service/config # Internal container path for configuration -ECS_CONFIG_FILE=application.yaml # Config file name -ECS_VERSION="V1-2" # Version where the types are added in the producer registration -ECS_FEATURE_LEVEL="INFO-TYPES" # Space separated list of features +ICS_APP_NAME="informationservice" # Name for ICS container +ICS_DISPLAY_NAME="Enrichment Coordinator Service" # Display name for ICS container +ICS_EXTERNAL_PORT=8083 # ICS container external port (host -> container) +ICS_INTERNAL_PORT=8083 # ICS container internal port (container -> container) +ICS_EXTERNAL_SECURE_PORT=8434 # ICS container external secure port (host -> container) +ICS_INTERNAL_SECURE_PORT=8434 # ICS container internal secure port (container -> container) + +ICS_LOGPATH="/var/log/information-coordinator-service/application.log" # Path the application log in the ICS container +ICS_APP_NAME_ALIAS="information-service-container" # Alias name, name used by the control panel +ICS_HOST_MNT_DIR="./mnt" # Mounted dir, relative to compose file, on the host +ICS_CONTAINER_MNT_DIR="/var/information-coordinator-service" # Mounted dir in the container +ICS_ACTUATOR="/actuator/loggers/org.oransc.information" # Url for trace/debug +ICS_CERT_MOUNT_DIR="./cert" +ICS_ALIVE_URL="/status" # Base path for alive check +ICS_COMPOSE_DIR="ics" # Dir in simulator_group for docker-compose +ICS_CONFIG_MOUNT_PATH=/opt/app/information-coordinator-service/config # Internal container path for configuration +ICS_CONFIG_FILE=application.yaml # Config file name +ICS_VERSION="V1-2" # Version where the types are added in the producer registration +ICS_FEATURE_LEVEL="INFO-TYPES" # Space separated list of features MR_DMAAP_APP_NAME="message-router" # Name for the Dmaap MR MR_STUB_APP_NAME="mr-stub" # Name of the MR stub diff --git a/test/common/test_env-oran-cherry.sh b/test/common/test_env-oran-cherry.sh index b1204ccd..6abb1339 100755 --- a/test/common/test_env-oran-cherry.sh +++ b/test/common/test_env-oran-cherry.sh @@ -65,12 +65,12 @@ POLICY_AGENT_IMAGE_TAG_REMOTE_SNAPSHOT="2.1.1-SNAPSHOT" POLICY_AGENT_IMAGE_TAG_REMOTE="2.1.1" POLICY_AGENT_IMAGE_TAG_REMOTE_RELEASE="2.1.1" -# ECS image and tags -ECS_IMAGE_BASE="o-ran-sc/nonrtric-enrichment-coordinator-service" -ECS_IMAGE_TAG_LOCAL="1.0.1-SNAPSHOT" -ECS_IMAGE_TAG_REMOTE_SNAPSHOT="1.0.1-SNAPSHOT" -ECS_IMAGE_TAG_REMOTE="1.0.1" -ECS_IMAGE_TAG_REMOTE_RELEASE="1.0.1" +# ICS image and tags +ICS_IMAGE_BASE="o-ran-sc/nonrtric-enrichment-coordinator-service" +ICS_IMAGE_TAG_LOCAL="1.0.1-SNAPSHOT" +ICS_IMAGE_TAG_REMOTE_SNAPSHOT="1.0.1-SNAPSHOT" +ICS_IMAGE_TAG_REMOTE="1.0.1" +ICS_IMAGE_TAG_REMOTE_RELEASE="1.0.1" # Control Panel image and tags @@ -171,7 +171,7 @@ PVC_CLEANER_IMAGE_TAG_REMOTE_PROXY="20.10" #No local image for pvc cleaner, remote image always used # List of app short names produced by the project -PROJECT_IMAGES_APP_NAMES="PA ECS CP SDNC RC RICSIM" +PROJECT_IMAGES_APP_NAMES="PA ICS CP SDNC RC RICSIM" # List of app short names which images pulled from ORAN ORAN_IMAGES_APP_NAMES="" # Not used @@ -216,25 +216,25 @@ POLICY_AGENT_CONFIG_FILE="application.yaml" # Container config file POLICY_AGENT_DATA_FILE="application_configuration.json" # Container data file name POLICY_AGENT_CONTAINER_MNT_DIR="/var/policy-management-service" # Mounted dir in the container -ECS_APP_NAME="enrichmentservice" # Name for ECS container -ECS_DISPLAY_NAME="Enrichment Coordinator Service" # Display name for ECS container -ECS_EXTERNAL_PORT=8083 # ECS container external port (host -> container) -ECS_INTERNAL_PORT=8083 # ECS container internal port (container -> container) -ECS_EXTERNAL_SECURE_PORT=8434 # ECS container external secure port (host -> container) -ECS_INTERNAL_SECURE_PORT=8434 # ECS container internal secure port (container -> container) - -ECS_LOGPATH="/var/log/enrichment-coordinator-service/application.log" # Path the application log in the ECS container -ECS_APP_NAME_ALIAS="enrichment-service-container" # Alias name, name used by the control panel -ECS_HOST_MNT_DIR="./mnt" # Mounted dir, relative to compose file, on the host -ECS_CONTAINER_MNT_DIR="/var/enrichment-coordinator-service" # Mounted dir in the container -ECS_ACTUATOR="/actuator/loggers/org.oransc.enrichment" # Url for trace/debug -ECS_CERT_MOUNT_DIR="./cert" -ECS_ALIVE_URL="/status" # Base path for alive check -ECS_COMPOSE_DIR="ecs" # Dir in simulator_group for docker-compose -ECS_CONFIG_MOUNT_PATH=/opt/app/enrichment-coordinator-service/config # Internal container path for configuration -ECS_CONFIG_FILE=application.yaml # Config file name -ECS_VERSION="V1-2" # Version where the types are added in the producer registration -ECS_FEATURE_LEVEL="" # Space separated list of features +ICS_APP_NAME="informationservice" # Name for ICS container +ICS_DISPLAY_NAME="Enrichment Coordinator Service" # Display name for ICS container +ICS_EXTERNAL_PORT=8083 # ICS container external port (host -> container) +ICS_INTERNAL_PORT=8083 # ICS container internal port (container -> container) +ICS_EXTERNAL_SECURE_PORT=8434 # ICS container external secure port (host -> container) +ICS_INTERNAL_SECURE_PORT=8434 # ICS container internal secure port (container -> container) + +ICS_LOGPATH="/var/log/information-coordinator-service/application.log" # Path the application log in the ICS container +ICS_APP_NAME_ALIAS="information-service-container" # Alias name, name used by the control panel +ICS_HOST_MNT_DIR="./mnt" # Mounted dir, relative to compose file, on the host +ICS_CONTAINER_MNT_DIR="/var/information-coordinator-service" # Mounted dir in the container +ICS_ACTUATOR="/actuator/loggers/org.oransc.information" # Url for trace/debug +ICS_CERT_MOUNT_DIR="./cert" +ICS_ALIVE_URL="/status" # Base path for alive check +ICS_COMPOSE_DIR="ics" # Dir in simulator_group for docker-compose +ICS_CONFIG_MOUNT_PATH=/opt/app/information-coordinator-service/config # Internal container path for configuration +ICS_CONFIG_FILE=application.yaml # Config file name +ICS_VERSION="V1-2" # Version where the types are added in the producer registration +ICS_FEATURE_LEVEL="" # Space separated list of features MR_DMAAP_APP_NAME="message-router" # Name for the Dmaap MR MR_STUB_APP_NAME="mr-stub" # Name of the MR stub diff --git a/test/common/test_env-oran-d-release.sh b/test/common/test_env-oran-d-release.sh index cde9849b..ed7670ed 100755 --- a/test/common/test_env-oran-d-release.sh +++ b/test/common/test_env-oran-d-release.sh @@ -65,13 +65,13 @@ POLICY_AGENT_IMAGE_TAG_REMOTE_SNAPSHOT="2.2.1-SNAPSHOT" POLICY_AGENT_IMAGE_TAG_REMOTE="2.2.1" POLICY_AGENT_IMAGE_TAG_REMOTE_RELEASE="2.2.1" -# ECS image and tags -ECS_IMAGE_BASE="o-ran-sc/nonrtric-enrichment-coordinator-service" -ECS_IMAGE_TAG_LOCAL="1.1.0-SNAPSHOT" -ECS_IMAGE_TAG_REMOTE_SNAPSHOT="1.1.0-SNAPSHOT" -ECS_IMAGE_TAG_REMOTE="1.1.0" -ECS_IMAGE_TAG_REMOTE_RELEASE="1.1.0" -#Note: Update var ECS_FEATURE_LEVEL if image version is changed +# ICS image and tags +ICS_IMAGE_BASE="o-ran-sc/nonrtric-enrichment-coordinator-service" +ICS_IMAGE_TAG_LOCAL="1.1.0-SNAPSHOT" +ICS_IMAGE_TAG_REMOTE_SNAPSHOT="1.1.0-SNAPSHOT" +ICS_IMAGE_TAG_REMOTE="1.1.0" +ICS_IMAGE_TAG_REMOTE_RELEASE="1.1.0" +#Note: Update var ICS_FEATURE_LEVEL if image version is changed #Control Panel image and tags CONTROL_PANEL_IMAGE_BASE="o-ran-sc/nonrtric-controlpanel" @@ -190,7 +190,7 @@ PVC_CLEANER_IMAGE_TAG_REMOTE_PROXY="20.10" #No local image for pvc cleaner, remote image always used # List of app short names produced by the project -PROJECT_IMAGES_APP_NAMES="PA ECS CP RC RICSIM NGW" # Add SDNC here if oran image is used +PROJECT_IMAGES_APP_NAMES="PA ICS CP RC RICSIM NGW" # Add SDNC here if oran image is used # List of app short names which images pulled from ORAN ORAN_IMAGES_APP_NAMES="" # Not used @@ -235,25 +235,25 @@ POLICY_AGENT_CONFIG_FILE="application.yaml" # Container config file POLICY_AGENT_DATA_FILE="application_configuration.json" # Container data file name POLICY_AGENT_CONTAINER_MNT_DIR="/var/policy-management-service" # Mounted dir in the container -ECS_APP_NAME="enrichmentservice" # Name for ECS container -ECS_DISPLAY_NAME="Enrichment Coordinator Service" # Display name for ECS container -ECS_EXTERNAL_PORT=8083 # ECS container external port (host -> container) -ECS_INTERNAL_PORT=8083 # ECS container internal port (container -> container) -ECS_EXTERNAL_SECURE_PORT=8434 # ECS container external secure port (host -> container) -ECS_INTERNAL_SECURE_PORT=8434 # ECS container internal secure port (container -> container) - -ECS_LOGPATH="/var/log/enrichment-coordinator-service/application.log" # Path the application log in the ECS container -ECS_APP_NAME_ALIAS="enrichment-service-container" # Alias name, name used by the control panel -ECS_HOST_MNT_DIR="./mnt" # Mounted db dir, relative to compose file, on the host -ECS_CONTAINER_MNT_DIR="/var/enrichment-coordinator-service" # Mounted dir in the container -ECS_ACTUATOR="/actuator/loggers/org.oransc.enrichment" # Url for trace/debug -ECS_CERT_MOUNT_DIR="./cert" -ECS_ALIVE_URL="/status" # Base path for alive check -ECS_COMPOSE_DIR="ecs" # Dir in simulator_group for docker-compose -ECS_CONFIG_MOUNT_PATH=/opt/app/enrichment-coordinator-service/config # Internal container path for configuration -ECS_CONFIG_FILE=application.yaml # Config file name -ECS_VERSION="V1-2" # Version where the types are decoupled from the producer registration -ECS_FEATURE_LEVEL="INFO-TYPES" # Space separated list of features +ICS_APP_NAME="informationservice" # Name for ICS container +ICS_DISPLAY_NAME="Enrichment Coordinator Service" # Display name for ICS container +ICS_EXTERNAL_PORT=8083 # ICS container external port (host -> container) +ICS_INTERNAL_PORT=8083 # ICS container internal port (container -> container) +ICS_EXTERNAL_SECURE_PORT=8434 # ICS container external secure port (host -> container) +ICS_INTERNAL_SECURE_PORT=8434 # ICS container internal secure port (container -> container) + +ICS_LOGPATH="/var/log/information-coordinator-service/application.log" # Path the application log in the ICS container +ICS_APP_NAME_ALIAS="information-service-container" # Alias name, name used by the control panel +ICS_HOST_MNT_DIR="./mnt" # Mounted db dir, relative to compose file, on the host +ICS_CONTAINER_MNT_DIR="/var/information-coordinator-service" # Mounted dir in the container +ICS_ACTUATOR="/actuator/loggers/org.oransc.information" # Url for trace/debug +ICS_CERT_MOUNT_DIR="./cert" +ICS_ALIVE_URL="/status" # Base path for alive check +ICS_COMPOSE_DIR="ics" # Dir in simulator_group for docker-compose +ICS_CONFIG_MOUNT_PATH=/opt/app/information-coordinator-service/config # Internal container path for configuration +ICS_CONFIG_FILE=application.yaml # Config file name +ICS_VERSION="V1-2" # Version where the types are decoupled from the producer registration +ICS_FEATURE_LEVEL="INFO-TYPES" # Space separated list of features MR_DMAAP_APP_NAME="message-router" # Name for the Dmaap MR MR_STUB_APP_NAME="mr-stub" # Name of the MR stub @@ -403,8 +403,8 @@ CONTROL_PANEL_CONFIG_MOUNT_PATH=/etc/nginx # Container internal pa CONTROL_PANEL_NGINX_KUBE_RESOLVER="kube-dns.kube-system.svc.cluster.local valid=5s" #nginx resolver for kube CONTROL_PANEL_NGINX_DOCKER_RESOLVER="127.0.0.11" # nginx resolver for docker CONTROL_PANEL_PATH_POLICY_PREFIX="/a1-policy/" # Path prefix for forwarding policy calls to NGW -CONTROL_PANEL_PATH_ECS_PREFIX="/data-producer/" # Path prefix for forwarding ecs calls to NGW -CONTROL_PANEL_PATH_ECS_PREFIX2="/data-consumer/" # Path prefix for forwarding ecs calls to NGW +CONTROL_PANEL_PATH_ICS_PREFIX="/data-producer/" # Path prefix for forwarding ics calls to NGW +CONTROL_PANEL_PATH_ICS_PREFIX2="/data-consumer/" # Path prefix for forwarding ics calls to NGW NRT_GATEWAY_APP_NAME="nonrtricgateway" # Name of the Gateway container NRT_GATEWAY_DISPLAY_NAME="NonRT-RIC Gateway" diff --git a/test/common/test_env-oran-e-release.sh b/test/common/test_env-oran-e-release.sh index cd0d0400..1003ddd8 100755 --- a/test/common/test_env-oran-e-release.sh +++ b/test/common/test_env-oran-e-release.sh @@ -65,13 +65,13 @@ POLICY_AGENT_IMAGE_TAG_REMOTE_SNAPSHOT="2.3.0-SNAPSHOT" POLICY_AGENT_IMAGE_TAG_REMOTE="2.3.0" POLICY_AGENT_IMAGE_TAG_REMOTE_RELEASE="2.3.0" -# ECS image and tags -ECS_IMAGE_BASE="o-ran-sc/nonrtric-enrichment-coordinator-service" -ECS_IMAGE_TAG_LOCAL="1.2.0-SNAPSHOT" -ECS_IMAGE_TAG_REMOTE_SNAPSHOT="1.2.0-SNAPSHOT" -ECS_IMAGE_TAG_REMOTE="1.2.0" -ECS_IMAGE_TAG_REMOTE_RELEASE="1.2.0" -#Note: Update var ECS_FEATURE_LEVEL if image version is changed +# ICS image and tags +ICS_IMAGE_BASE="o-ran-sc/nonrtric-information-coordinator-service" +ICS_IMAGE_TAG_LOCAL="1.2.0-SNAPSHOT" +ICS_IMAGE_TAG_REMOTE_SNAPSHOT="1.2.0-SNAPSHOT" +ICS_IMAGE_TAG_REMOTE="1.2.0" +ICS_IMAGE_TAG_REMOTE_RELEASE="1.2.0" +#Note: Update var ICS_FEATURE_LEVEL if image version is changed #Control Panel image and tags CONTROL_PANEL_IMAGE_BASE="o-ran-sc/nonrtric-controlpanel" @@ -203,7 +203,7 @@ PVC_CLEANER_IMAGE_TAG_REMOTE_PROXY="20.10" #No local image for pvc cleaner, remote image always used # List of app short names produced by the project -PROJECT_IMAGES_APP_NAMES="PA ECS CP RC RICSIM NGW DMAAPADP DMAAPMED" # Add SDNC here if oran image is used +PROJECT_IMAGES_APP_NAMES="PA ICS CP RC RICSIM NGW DMAAPADP DMAAPMED" # Add SDNC here if oran image is used # List of app short names which images pulled from ORAN ORAN_IMAGES_APP_NAMES="" # Not used @@ -261,25 +261,25 @@ POLICY_AGENT_CONFIG_FILE="application.yaml" # Container config file POLICY_AGENT_DATA_FILE="application_configuration.json" # Container data file name POLICY_AGENT_CONTAINER_MNT_DIR="/var/policy-management-service" # Mounted dir in the container -ECS_APP_NAME="enrichmentservice" # Name for ECS container -ECS_DISPLAY_NAME="Enrichment Coordinator Service" # Display name for ECS container -ECS_EXTERNAL_PORT=8083 # ECS container external port (host -> container) -ECS_INTERNAL_PORT=8083 # ECS container internal port (container -> container) -ECS_EXTERNAL_SECURE_PORT=8434 # ECS container external secure port (host -> container) -ECS_INTERNAL_SECURE_PORT=8434 # ECS container internal secure port (container -> container) - -ECS_LOGPATH="/var/log/enrichment-coordinator-service/application.log" # Path the application log in the ECS container -ECS_APP_NAME_ALIAS="enrichment-service-container" # Alias name, name used by the control panel -ECS_HOST_MNT_DIR="./mnt" # Mounted db dir, relative to compose file, on the host -ECS_CONTAINER_MNT_DIR="/var/enrichment-coordinator-service" # Mounted dir in the container -ECS_ACTUATOR="/actuator/loggers/org.oransc.enrichment" # Url for trace/debug -ECS_CERT_MOUNT_DIR="./cert" -ECS_ALIVE_URL="/status" # Base path for alive check -ECS_COMPOSE_DIR="ecs" # Dir in simulator_group for docker-compose -ECS_CONFIG_MOUNT_PATH=/opt/app/enrichment-coordinator-service/config # Internal container path for configuration -ECS_CONFIG_FILE=application.yaml # Config file name -ECS_VERSION="V1-2" # Version where the types are decoupled from the producer registration -ECS_FEATURE_LEVEL="INFO-TYPES TYPE-SUBSCRIPTIONS INFO-TYPE-INFO" # Space separated list of features +ICS_APP_NAME="informationservice" # Name for ICS container +ICS_DISPLAY_NAME="Information Coordinator Service" # Display name for ICS container +ICS_EXTERNAL_PORT=8083 # ICS container external port (host -> container) +ICS_INTERNAL_PORT=8083 # ICS container internal port (container -> container) +ICS_EXTERNAL_SECURE_PORT=8434 # ICS container external secure port (host -> container) +ICS_INTERNAL_SECURE_PORT=8434 # ICS container internal secure port (container -> container) + +ICS_LOGPATH="/var/log/information-coordinator-service/application.log" # Path the application log in the ICS container +ICS_APP_NAME_ALIAS="information-service-container" # Alias name, name used by the control panel +ICS_HOST_MNT_DIR="./mnt" # Mounted db dir, relative to compose file, on the host +ICS_CONTAINER_MNT_DIR="/var/information-coordinator-service" # Mounted dir in the container +ICS_ACTUATOR="/actuator/loggers/org.oransc.information" # Url for trace/debug +ICS_CERT_MOUNT_DIR="./cert" +ICS_ALIVE_URL="/status" # Base path for alive check +ICS_COMPOSE_DIR="ics" # Dir in simulator_group for docker-compose +ICS_CONFIG_MOUNT_PATH=/opt/app/information-coordinator-service/config # Internal container path for configuration +ICS_CONFIG_FILE=application.yaml # Config file name +ICS_VERSION="V1-2" # Version where the types are decoupled from the producer registration +ICS_FEATURE_LEVEL="INFO-TYPES TYPE-SUBSCRIPTIONS INFO-TYPE-INFO RESP_CODE_CHANGE_1" # Space separated list of features MR_DMAAP_APP_NAME="message-router" # Name for the Dmaap MR MR_STUB_APP_NAME="mr-stub" # Name of the MR stub @@ -429,8 +429,8 @@ CONTROL_PANEL_CONFIG_MOUNT_PATH=/etc/nginx # Container internal pa CONTROL_PANEL_NGINX_KUBE_RESOLVER="kube-dns.kube-system.svc.cluster.local valid=5s" #nginx resolver for kube CONTROL_PANEL_NGINX_DOCKER_RESOLVER="127.0.0.11" # nginx resolver for docker CONTROL_PANEL_PATH_POLICY_PREFIX="/a1-policy/" # Path prefix for forwarding policy calls to NGW -CONTROL_PANEL_PATH_ECS_PREFIX="/data-producer/" # Path prefix for forwarding ecs calls to NGW -CONTROL_PANEL_PATH_ECS_PREFIX2="/data-consumer/" # Path prefix for forwarding ecs calls to NGW +CONTROL_PANEL_PATH_ICS_PREFIX="/data-producer/" # Path prefix for forwarding ics calls to NGW +CONTROL_PANEL_PATH_ICS_PREFIX2="/data-consumer/" # Path prefix for forwarding ics calls to NGW NRT_GATEWAY_APP_NAME="nonrtricgateway" # Name of the Gateway container NRT_GATEWAY_DISPLAY_NAME="NonRT-RIC Gateway" @@ -516,7 +516,7 @@ DMAAP_MED_INTERNAL_SECURE_PORT=8185 # Dmaap Mediator contai DMAAP_MED_LOGPATH="/var/log/dmaap-adaptor-service/application.log" # Path the application log in the Dmaap Mediator container DMAAP_MED_HOST_MNT_DIR="./mnt" # Mounted db dir, relative to compose file, on the host #MAAP_ADP_CONTAINER_MNT_DIR="/var/dmaap-adaptor-service" # Mounted dir in the container -#DMAAP_MED_ACTUATOR="/actuator/loggers/org.oransc.enrichment" # Url for trace/debug +#DMAAP_MED_ACTUATOR="/actuator/loggers/org.oransc.information" # Url for trace/debug #DMAAP_MED_CERT_MOUNT_DIR="./cert" DMAAP_MED_ALIVE_URL="/status" # Base path for alive check DMAAP_MED_COMPOSE_DIR="dmaapmed" # Dir in simulator_group for docker-compose diff --git a/test/common/testcase_common.sh b/test/common/testcase_common.sh index e1c90d64..80059a16 100755 --- a/test/common/testcase_common.sh +++ b/test/common/testcase_common.sh @@ -666,7 +666,7 @@ while [ $paramerror -eq 0 ] && [ $foundparm -eq 0 ]; do if [ $paramerror -eq 0 ]; then if [ "$1" == "--print-stats" ]; then PRINT_CURRENT_STATS=1 - echo "Option set - Print stats" + echo "Option set - Print stats after every test-case and config" shift; foundparm=0 fi @@ -1270,10 +1270,10 @@ setup_testenvironment() { IMAGE_SUFFIX="none" fi # A function name is created from the app short name - # for example app short name 'ECS' -> produce the function - # name __ECS_imagesetup + # for example app short name 'ICS' -> produce the function + # name __ICS_imagesetup # This function is called and is expected to exist in the imported - # file for the ecs test functions + # file for the ics test functions # The resulting function impl will call '__check_and_create_image_var' function # with appropriate parameters # If the image suffix is none, then the component decides the suffix diff --git a/test/common/testengine_config.sh b/test/common/testengine_config.sh index 35134648..24a3908d 100644 --- a/test/common/testengine_config.sh +++ b/test/common/testengine_config.sh @@ -18,13 +18,13 @@ # # List of short names for all supported apps, including simulators etc -APP_SHORT_NAMES="PA ECS SDNC CP NGW RC RICSIM HTTPPROXY CBS CONSUL DMAAPMR MR CR PRODSTUB KUBEPROXY DMAAPMED DMAAPADP PVCCLEANER" +APP_SHORT_NAMES="PA ICS SDNC CP NGW RC RICSIM HTTPPROXY CBS CONSUL DMAAPMR MR CR PRODSTUB KUBEPROXY DMAAPMED DMAAPADP PVCCLEANER" # List of available apps that built and released of the project -PROJECT_IMAGES="PA ECS SDNC CP NGW RICSIM RC DMAAPMED DMAAPADP" +PROJECT_IMAGES="PA ICS SDNC CP NGW RICSIM RC DMAAPMED DMAAPADP" # List of available apps to override with local or remote staging/snapshot/release image -AVAILABLE_IMAGES_OVERRIDE="PA ECS SDNC CP NGW RICSIM RC DMAAPMED DMAAPADP" +AVAILABLE_IMAGES_OVERRIDE="PA ICS SDNC CP NGW RICSIM RC DMAAPMED DMAAPADP" # List of available apps where the image is built by the test environment LOCAL_IMAGE_BUILD="MR CR PRODSTUB KUBEPROXY HTTPPROXY" diff --git a/test/simulator-group/control_panel/application.properties b/test/simulator-group/control_panel/application.properties index 2fc70931..1af026ea 100644 --- a/test/simulator-group/control_panel/application.properties +++ b/test/simulator-group/control_panel/application.properties @@ -30,8 +30,8 @@ portalapi.appname = Non-RT RIC Control Panel portalapi.username = Default portalapi.password = password -# URL for enrichment coordinator service -enrichmentcontroller.url.prefix = https://${ECS_DOMAIN_NAME}:${ECS_EXTERNAL_SECURE_PORT}/ei-producer/v1 +# URL for information coordinator service +informationcontroller.url.prefix = https://${ICS_DOMAIN_NAME}:${ICS_EXTERNAL_SECURE_PORT}/ei-producer/v1 # Mimic slow endpoints by defining sleep period, in milliseconds mock.config.delay = 0 diff --git a/test/simulator-group/control_panel/nginx.conf b/test/simulator-group/control_panel/nginx.conf index 1672ad02..5f8ae575 100644 --- a/test/simulator-group/control_panel/nginx.conf +++ b/test/simulator-group/control_panel/nginx.conf @@ -30,11 +30,11 @@ http { set $upstream ${NGW_DOMAIN_NAME}; proxy_pass http://$upstream:${NRT_GATEWAY_EXTERNAL_PORT}; } - location ${CONTROL_PANEL_PATH_ECS_PREFIX} { + location ${CONTROL_PANEL_PATH_ICS_PREFIX} { set $upstream ${NGW_DOMAIN_NAME}; proxy_pass http://$upstream:${NRT_GATEWAY_EXTERNAL_PORT}; } - location ${CONTROL_PANEL_PATH_ECS_PREFIX2} { + location ${CONTROL_PANEL_PATH_ICS_PREFIX2} { set $upstream ${NGW_DOMAIN_NAME}; proxy_pass http://$upstream:${NRT_GATEWAY_EXTERNAL_PORT}; } diff --git a/test/simulator-group/dmaapadp/application.yaml b/test/simulator-group/dmaapadp/application.yaml index f96db091..b35fe32f 100644 --- a/test/simulator-group/dmaapadp/application.yaml +++ b/test/simulator-group/dmaapadp/application.yaml @@ -62,7 +62,7 @@ app: # The HTTP proxy (if configured) will only be used for accessing NearRT RIC:s http.proxy-host: $DMAAP_ADP_HTTP_PROXY_CONFIG_HOST_NAME http.proxy-port: $DMAAP_ADP_HTTP_PROXY_CONFIG_PORT - ecs-base-url: $ECS_SERVICE_PATH + ics-base-url: $ICS_SERVICE_PATH # Location of the component configuration file. The file will only be used if the Consul database is not used; # configuration from the Consul will override the file. configuration-filepath: /opt/app/dmaap-adaptor-service/data/application_configuration.json diff --git a/test/simulator-group/dmaapmed/app.yaml b/test/simulator-group/dmaapmed/app.yaml index aa8a0f18..7c39bea3 100644 --- a/test/simulator-group/dmaapmed/app.yaml +++ b/test/simulator-group/dmaapmed/app.yaml @@ -36,7 +36,7 @@ spec: - name: INFO_PRODUCER_PORT value: "$DMAAP_MED_CONF_SELF_PORT" - name: INFO_COORD_ADDR - value: "$ECS_SERVICE_PATH" + value: "$ICS_SERVICE_PATH" - name: DMAAP_MR_ADDR value: "$MR_SERVICE_PATH" - name: LOG_LEVEL diff --git a/test/simulator-group/dmaapmed/docker-compose.yml b/test/simulator-group/dmaapmed/docker-compose.yml index e4c9a00f..9cb929cf 100644 --- a/test/simulator-group/dmaapmed/docker-compose.yml +++ b/test/simulator-group/dmaapmed/docker-compose.yml @@ -30,7 +30,7 @@ services: environment: - INFO_PRODUCER_HOST=${DMAAP_MED_CONF_SELF_HOST} - INFO_PRODUCER_PORT=${DMAAP_MED_CONF_SELF_PORT} - - INFO_COORD_ADDR=${ECS_SERVICE_PATH} + - INFO_COORD_ADDR=${ICS_SERVICE_PATH} - DMAAP_MR_ADDR=${MR_SERVICE_PATH} - LOG_LEVEL=Debug volumes: diff --git a/test/simulator-group/ecs/app.yaml b/test/simulator-group/ecs/app.yaml deleted file mode 100644 index f1090ce9..00000000 --- a/test/simulator-group/ecs/app.yaml +++ /dev/null @@ -1,45 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: $ECS_APP_NAME - namespace: $KUBE_NONRTRIC_NAMESPACE - labels: - run: $ECS_APP_NAME - autotest: ECS -spec: - replicas: 1 - selector: - matchLabels: - run: $ECS_APP_NAME - template: - metadata: - labels: - run: $ECS_APP_NAME - autotest: ECS - spec: - containers: - - name: $ECS_APP_NAME - image: $ECS_IMAGE - imagePullPolicy: $KUBE_IMAGE_PULL_POLICY - ports: - - name: http - containerPort: $ECS_INTERNAL_PORT - - name: https - containerPort: $ECS_INTERNAL_SECURE_PORT - volumeMounts: - - mountPath: $ECS_CONFIG_MOUNT_PATH - name: ecs-conf-name - volumeMounts: - - mountPath: $ECS_CONTAINER_MNT_DIR - name: ecs-data-name - volumes: - - configMap: - defaultMode: 420 - name: $ECS_CONFIG_CONFIGMAP_NAME - name: ecs-conf-name - - persistentVolumeClaim: - claimName: $ECS_DATA_PVC_NAME - name: ecs-data-name -# Selector will be set when pod is started first time - nodeSelector: - diff --git a/test/simulator-group/ecs/mnt/.gitignore b/test/simulator-group/ecs/mnt/.gitignore deleted file mode 100644 index 72e8ffc0..00000000 --- a/test/simulator-group/ecs/mnt/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/test/simulator-group/ecs/svc.yaml b/test/simulator-group/ecs/svc.yaml deleted file mode 100644 index e311c0e5..00000000 --- a/test/simulator-group/ecs/svc.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: $ECS_APP_NAME - namespace: $KUBE_NONRTRIC_NAMESPACE - labels: - run: $ECS_APP_NAME - autotest: ECS -spec: - type: ClusterIP - ports: - - port: $ECS_EXTERNAL_PORT - targetPort: $ECS_INTERNAL_PORT - protocol: TCP - name: http - - port: $ECS_EXTERNAL_SECURE_PORT - targetPort: $ECS_INTERNAL_SECURE_PORT - protocol: TCP - name: https - selector: - run: $ECS_APP_NAME \ No newline at end of file diff --git a/test/simulator-group/ecs/.gitignore b/test/simulator-group/ics/.gitignore similarity index 100% rename from test/simulator-group/ecs/.gitignore rename to test/simulator-group/ics/.gitignore diff --git a/test/simulator-group/ics/app.yaml b/test/simulator-group/ics/app.yaml new file mode 100644 index 00000000..9547dea4 --- /dev/null +++ b/test/simulator-group/ics/app.yaml @@ -0,0 +1,45 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: $ICS_APP_NAME + namespace: $KUBE_NONRTRIC_NAMESPACE + labels: + run: $ICS_APP_NAME + autotest: ICS +spec: + replicas: 1 + selector: + matchLabels: + run: $ICS_APP_NAME + template: + metadata: + labels: + run: $ICS_APP_NAME + autotest: ICS + spec: + containers: + - name: $ICS_APP_NAME + image: $ICS_IMAGE + imagePullPolicy: $KUBE_IMAGE_PULL_POLICY + ports: + - name: http + containerPort: $ICS_INTERNAL_PORT + - name: https + containerPort: $ICS_INTERNAL_SECURE_PORT + volumeMounts: + - mountPath: $ICS_CONFIG_MOUNT_PATH + name: ics-conf-name + volumeMounts: + - mountPath: $ICS_CONTAINER_MNT_DIR + name: ics-data-name + volumes: + - configMap: + defaultMode: 420 + name: $ICS_CONFIG_CONFIGMAP_NAME + name: ics-conf-name + - persistentVolumeClaim: + claimName: $ICS_DATA_PVC_NAME + name: ics-data-name +# Selector will be set when pod is started first time + nodeSelector: + diff --git a/test/simulator-group/ecs/application.yaml b/test/simulator-group/ics/application.yaml similarity index 78% rename from test/simulator-group/ecs/application.yaml rename to test/simulator-group/ics/application.yaml index acc914c3..ee5a48dd 100644 --- a/test/simulator-group/ecs/application.yaml +++ b/test/simulator-group/ics/application.yaml @@ -33,24 +33,24 @@ logging: org.springframework: ERROR org.springframework.data: ERROR org.springframework.web.reactive.function.client.ExchangeFunctions: ERROR - org.oransc.enrichment: INFO + org.oransc.information: INFO file: - name: /var/log/enrichment-coordinator-service/application.log + name: /var/log/information-coordinator-service/application.log server: port : 8434 http-port: 8083 ssl: key-store-type: JKS key-store-password: policy_agent - key-store: /opt/app/enrichment-coordinator-service/etc/cert/keystore.jks + key-store: /opt/app/information-coordinator-service/etc/cert/keystore.jks key-password: policy_agent key-alias: policy_agent app: - filepath: /opt/app/enrichment-coordinator-service/data/application_configuration.json + filepath: /opt/app/information-coordinator-service/data/application_configuration.json webclient: trust-store-used: false trust-store-password: policy_agent - trust-store: /opt/app/enrichment-coordinator-service/etc/cert/truststore.jks - http.proxy-host: $ECS_HTTP_PROXY_CONFIG_HOST_NAME - http.proxy-port: $ECS_HTTP_PROXY_CONFIG_PORT - vardata-directory: /var/enrichment-coordinator-service \ No newline at end of file + trust-store: /opt/app/information-coordinator-service/etc/cert/truststore.jks + http.proxy-host: $ICS_HTTP_PROXY_CONFIG_HOST_NAME + http.proxy-port: $ICS_HTTP_PROXY_CONFIG_PORT + vardata-directory: /var/information-coordinator-service \ No newline at end of file diff --git a/test/simulator-group/ecs/docker-compose.yml b/test/simulator-group/ics/docker-compose.yml similarity index 69% rename from test/simulator-group/ecs/docker-compose.yml rename to test/simulator-group/ics/docker-compose.yml index 588f8c3e..0f75355b 100644 --- a/test/simulator-group/ecs/docker-compose.yml +++ b/test/simulator-group/ics/docker-compose.yml @@ -19,19 +19,19 @@ networks: external: true name: ${DOCKER_SIM_NWNAME} services: - ecs: - image: ${ECS_IMAGE} - container_name: ${ECS_APP_NAME} + ics: + image: ${ICS_IMAGE} + container_name: ${ICS_APP_NAME} networks: default: aliases: - - ${ECS_APP_NAME_ALIAS} + - ${ICS_APP_NAME_ALIAS} volumes: - - ${ECS_HOST_MNT_DIR}/db:${ECS_CONTAINER_MNT_DIR} - - ${ECS_HOST_MNT_DIR}/$ECS_CONFIG_FILE:${ECS_CONFIG_MOUNT_PATH}/$ECS_CONFIG_FILE + - ${ICS_HOST_MNT_DIR}/db:${ICS_CONTAINER_MNT_DIR} + - ${ICS_HOST_MNT_DIR}/$ICS_CONFIG_FILE:${ICS_CONFIG_MOUNT_PATH}/$ICS_CONFIG_FILE ports: - - ${ECS_EXTERNAL_PORT}:${ECS_INTERNAL_PORT} - - ${ECS_EXTERNAL_SECURE_PORT}:${ECS_INTERNAL_SECURE_PORT} + - ${ICS_EXTERNAL_PORT}:${ICS_INTERNAL_PORT} + - ${ICS_EXTERNAL_SECURE_PORT}:${ICS_INTERNAL_SECURE_PORT} labels: - - "nrttest_app=ECS" - - "nrttest_dp=${ECS_DISPLAY_NAME}" + - "nrttest_app=ICS" + - "nrttest_dp=${ICS_DISPLAY_NAME}" diff --git a/test/simulator-group/ecs/pv.yaml b/test/simulator-group/ics/pv.yaml similarity index 58% rename from test/simulator-group/ecs/pv.yaml rename to test/simulator-group/ics/pv.yaml index ffcceccb..3e9e2859 100644 --- a/test/simulator-group/ecs/pv.yaml +++ b/test/simulator-group/ics/pv.yaml @@ -1,16 +1,16 @@ apiVersion: v1 kind: PersistentVolume metadata: - name: $ECS_DATA_PV_NAME + name: $ICS_DATA_PV_NAME labels: - run: $ECS_APP_NAME - autotest: ECS + run: $ICS_APP_NAME + autotest: ICS spec: - storageClassName: ecs-standard + storageClassName: ics-standard capacity: storage: 1Mi accessModes: - ReadWriteOnce persistentVolumeReclaimPolicy: Delete hostPath: - path: "/tmp/$ECS_PV_PATH" + path: "/tmp/$ICS_PV_PATH" diff --git a/test/simulator-group/ecs/pvc.yaml b/test/simulator-group/ics/pvc.yaml similarity index 67% rename from test/simulator-group/ecs/pvc.yaml rename to test/simulator-group/ics/pvc.yaml index 7f07893e..bbb8e360 100644 --- a/test/simulator-group/ecs/pvc.yaml +++ b/test/simulator-group/ics/pvc.yaml @@ -1,16 +1,16 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: $ECS_DATA_PVC_NAME + name: $ICS_DATA_PVC_NAME namespace: $KUBE_NONRTRIC_NAMESPACE labels: - run: $ECS_APP_NAME - autotest: ECS + run: $ICS_APP_NAME + autotest: ICS spec: accessModes: - ReadWriteOnce resources: requests: storage: 1Mi - storageClassName: ecs-standard + storageClassName: ics-standard volumeMode: Filesystem diff --git a/test/simulator-group/ics/svc.yaml b/test/simulator-group/ics/svc.yaml new file mode 100644 index 00000000..0d758fed --- /dev/null +++ b/test/simulator-group/ics/svc.yaml @@ -0,0 +1,21 @@ +apiVersion: v1 +kind: Service +metadata: + name: $ICS_APP_NAME + namespace: $KUBE_NONRTRIC_NAMESPACE + labels: + run: $ICS_APP_NAME + autotest: ICS +spec: + type: ClusterIP + ports: + - port: $ICS_EXTERNAL_PORT + targetPort: $ICS_INTERNAL_PORT + protocol: TCP + name: http + - port: $ICS_EXTERNAL_SECURE_PORT + targetPort: $ICS_INTERNAL_SECURE_PORT + protocol: TCP + name: https + selector: + run: $ICS_APP_NAME \ No newline at end of file diff --git a/test/simulator-group/ngw/application.yaml b/test/simulator-group/ngw/application.yaml index f2891685..f87389c0 100644 --- a/test/simulator-group/ngw/application.yaml +++ b/test/simulator-group/ngw/application.yaml @@ -31,11 +31,11 @@ spring: predicates: - Path=/a1-policy/** - id: A1-EI - uri: https://${ECS_DOMAIN_NAME}:${ECS_EXTERNAL_SECURE_PORT} + uri: https://${ICS_DOMAIN_NAME}:${ICS_EXTERNAL_SECURE_PORT} predicates: - Path=/ei-producer/** - id: A1-EI2 - uri: https://${ECS_DOMAIN_NAME}:${ECS_EXTERNAL_SECURE_PORT} + uri: https://${ICS_DOMAIN_NAME}:${ICS_EXTERNAL_SECURE_PORT} predicates: - Path=/data-producer/**,/data-consumer/** management: diff --git a/test/simulator-group/sim-monitor.js b/test/simulator-group/sim-monitor.js index e118e175..5b854149 100644 --- a/test/simulator-group/sim-monitor.js +++ b/test/simulator-group/sim-monitor.js @@ -24,7 +24,7 @@ var LOCALHOST="http://127.0.0.1:" var MRSTUB_PORT="3905" var AGENT_PORT="8081" var CR_PORT="8090" -var ECS_PORT="8083" +var ICS_PORT="8083" var PRODSTUB_PORT="8092" var RC_PORT="8680" @@ -186,14 +186,14 @@ var simvar4=[] var simvar5=[] var simvar6=[] -//Status variables, for parameters values fetched from ecs -var ecs1="", ecs2="", ecs3="", ecs4="", ecs_types="-", ecs_producers="-"; -var ecs_producer_arr=new Array(0) -var ecs_producer_type_arr=new Array(0) -var ecs_producer_jobs_arr=new Array(0) -var ecs_producer_status_arr=new Array(0) -var ecs_jobs=new Array(0) -var ecs_job_status=new Array(0) +//Status variables, for parameters values fetched from ics +var ics1="", ics2="", ics3="", ics4="", ics_types="-", ics_producers="-"; +var ics_producer_arr=new Array(0) +var ics_producer_type_arr=new Array(0) +var ics_producer_jobs_arr=new Array(0) +var ics_producer_status_arr=new Array(0) +var ics_jobs=new Array(0) +var ics_job_status=new Array(0) //Status variables, for parameters values fetched from prodstub var ps2="", ps3="", ps4="", ps_types="-", ps_producers="-"; @@ -209,7 +209,7 @@ var getCtr=0 var refreshCount_pol=-1 -var refreshCount_ecs=-1 +var refreshCount_ics=-1 var refreshCount_cr=-1 @@ -429,84 +429,84 @@ function fetchAllMetrics_pol() { }, 500) } -function fetchAllMetrics_ecs() { +function fetchAllMetrics_ics() { - console.log("Fetching enrichment metrics - timer:" + refreshCount_ecs) + console.log("Fetching information metrics - timer:" + refreshCount_ics) - if (refreshCount_ecs < 0) { - refreshCount_ecs = -1 + if (refreshCount_ics < 0) { + refreshCount_ics = -1 return } else { - refreshCount_ecs = refreshCount_ecs - 1 + refreshCount_ics = refreshCount_ics - 1 } setTimeout(() => { - if (checkFunctionFlag("ecs_stat")) { - getSimCtr(LOCALHOST+ECS_PORT+"/status", 0, function(data, index) { + if (checkFunctionFlag("ics_stat")) { + getSimCtr(LOCALHOST+ICS_PORT+"/status", 0, function(data, index) { try { var jd=JSON.parse(data); - ecs1=jd["status"] - ecs2=""+jd["no_of_producers"] - ecs3=""+jd["no_of_types"] - ecs4=""+jd["no_of_jobs"] + ics1=jd["status"] + ics2=""+jd["no_of_producers"] + ics3=""+jd["no_of_types"] + ics4=""+jd["no_of_jobs"] } catch (err) { - ecs1="error response" - ecs2="error response" - ecs3="error response" - ecs4="error response" + ics1="error response" + ics2="error response" + ics3="error response" + ics4="error response" } }); - clearFlag("ecs_stat") + clearFlag("ics_stat") } - if (checkFunctionFlag("ecs_types")) { - getSimCtr(LOCALHOST+ECS_PORT+"/ei-producer/v1/eitypes", 0, function(data, index) { - var tmp_ecs_types="-" + if (checkFunctionFlag("ics_types")) { + getSimCtr(LOCALHOST+ICS_PORT+"/ei-producer/v1/eitypes", 0, function(data, index) { + var tmp_ics_types="-" try { var jd=JSON.parse(data); for(var i=0;i" + "" + ""+ //2 sec auto refresh - "Enrichment coordinator service and producer stub"+ + "information coordinator service and producer stub"+ "" + "" + "" @@ -810,50 +810,50 @@ app.get("/mon2",function(req, res){ } else { htmlStr=htmlStr+"

Set query param '?summary' to false to only show full statistics

" } - if (ecs_job_status.length > 10) { + if (ics_job_status.length > 10) { htmlStr=htmlStr+"
Avoid running the server for large number of producers and/or jobs
" } htmlStr=htmlStr+"" + - "

Enrichment Coordinator Service

" + + "

Information Coordinator Service

" + "" + - "Status:..........." + formatDataRow(ecs1) + "
" + - "Producers:........" + formatDataRow(ecs2) + "
" + - "Types:............" + formatDataRow(ecs3) + "
" + - "Jobs:............." + formatDataRow(ecs4) + "
" + + "Status:..........." + formatDataRow(ics1) + "
" + + "Producers:........" + formatDataRow(ics2) + "
" + + "Types:............" + formatDataRow(ics3) + "
" + + "Jobs:............." + formatDataRow(ics4) + "
" + "" if (summary == "false") { htmlStr=htmlStr+ "

Details

" + "" + - "Producer ids:....." + formatDataRow(ecs_producers) + "
" + - "Type ids:........." + formatDataRow(ecs_types) + "
" + + "Producer ids:....." + formatDataRow(ics_producers) + "
" + + "Type ids:........." + formatDataRow(ics_types) + "
" + "
"; - for(var i=0;i" + var s = "Producer types...." + formatDataRow(ics_producer_type_arr[i]) + "
" htmlStr=htmlStr+s } } htmlStr=htmlStr+"
"; - for(i=0;i" + s = "Producer jobs....." + formatDataRow(ics_producer_jobs_arr[i]) + "
" htmlStr=htmlStr+s } } htmlStr=htmlStr+"
"; - for(i=0;i" htmlStr=htmlStr+s } } htmlStr=htmlStr+"
"; - for(i=0;i" htmlStr=htmlStr+s @@ -1025,5 +1025,5 @@ var httpPort=9999; httpServer.listen(httpPort); console.log("Simulator monitor listening (http) at "+httpPort); console.log("Open the web page on localhost:9999/mon to view the policy statistics page.") -console.log("Open the web page on localhost:9999/mon2 to view the enrichment statistics page.") +console.log("Open the web page on localhost:9999/mon2 to view the information statistics page.") console.log("Open the web page on localhost:9999/mon3 to view CR DB in json.") \ No newline at end of file -- 2.16.6