#!/bin/bash
# ============LICENSE_START===============================================
-# Copyright (C) 2020 Nordix Foundation. All rights reserved.
+# Copyright (C) 2020-2023 Nordix Foundation. All rights reserved.
# ========================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
#
-TC_ONELINE_DESCR="ECS Create 10000 jobs and restart, test job persisency"
+TC_ONELINE_DESCR="ICS Create 10000 jobs (ei and info) restart, test job persistency"
-#App names to include in the test, space separated list
-INCLUDED_IMAGES="ECS PRODSTUB CR CP"
+#App names to include in the test when running docker, space separated list
+DOCKER_INCLUDED_IMAGES="ICS PRODSTUB CR CP NGW KUBEPROXY"
-#SUPPORTED TEST ENV FILE
-SUPPORTED_PROFILES="ONAP-MASTER ORAN-CHERRY"
+#App names to include in the test when running kubernetes, space separated list
+KUBE_INCLUDED_IMAGES="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=""
-. ../common/testcase_common.sh $@
-. ../common/ecs_api_functions.sh
-. ../common/prodstub_api_functions.sh
+#Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if
+#the image is not configured in the supplied env_file
+#Used for images not applicable to all supported profile
+CONDITIONALLY_IGNORED_IMAGES="NGW"
+
+#Supported test environment profiles
+SUPPORTED_PROFILES="ONAP-JAKARTA ONAP-KOHN ONAP-LONDON ORAN-F-RELEASE ORAN-G-RELEASE ORAN-H-RELEASE"
+#Supported run modes
+SUPPORTED_RUNMODES="DOCKER KUBE"
+
+. ../common/testcase_common.sh $@
+
+setup_testenvironment
#### TEST BEGIN ####
-FLAT_A1_EI="1"
+clean_environment
-clean_containers
+start_kube_proxy
-use_ecs_rest_http
+use_ics_rest_http
use_prod_stub_http
-start_ecs
+start_ics NOPROXY $SIM_GROUP/$ICS_COMPOSE_DIR/$ICS_CONFIG_FILE
start_prod_stub
-set_ecs_trace
+set_ics_trace
-start_control_panel
+start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE
+
+if [ ! -z "$NRT_GATEWAY_APP_NAME" ]; then
+ start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE
+fi
-start_cr
+start_cr 1
-CB_JOB="http://$PROD_STUB_APP_NAME:$PROD_STUB_PORT/callbacks/job"
-CB_SV="http://$PROD_STUB_APP_NAME:$PROD_STUB_PORT/callbacks/supervision"
+CB_JOB="$PROD_STUB_SERVICE_PATH$PROD_STUB_JOB_CALLBACK"
+CB_SV="$PROD_STUB_SERVICE_PATH$PROD_STUB_SUPERVISION_CALLBACK"
TARGET="http://localhost:80/target" # Dummy target
-NUM_JOBS=10000
+NUM_JOBS=5000 # 5K ei jobs and 5K info jobs
+
+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"
+
+ ics_api_idc_put_subscription 201 subscription-id-1 owner1 $TYPESTATUS1
+
+ ics_api_idc_get_subscription_ids 200 owner1 subscription-id-1
+
+ ics_api_idc_put_subscription 201 subscription-id-2 owner2 $TYPESTATUS2
+
+ ics_api_idc_get_subscription_ids 200 owner2 subscription-id-2
+
+fi
# Setup prodstub sim to accept calls for producers, types and jobs
prodstub_arm_producer 200 prod-a
fi
done
-ecs_api_edp_put_producer 201 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 testdata/ecs/ei-type-1.json
+prodstub_arm_producer 200 prod-a
+prodstub_arm_producer 200 prod-b
+prodstub_arm_producer 200 prod-c
+prodstub_arm_producer 200 prod-d
+
+prodstub_arm_type 200 prod-a type101
+
+prodstub_arm_type 200 prod-b type101
+prodstub_arm_type 200 prod-b type102
+
+prodstub_arm_type 200 prod-c type101
+prodstub_arm_type 200 prod-c type102
+prodstub_arm_type 200 prod-c type103
+
+prodstub_arm_type 200 prod-d type104
+prodstub_arm_type 200 prod-d type105
+
+for ((i=1; i<=$NUM_JOBS; i++))
+do
+ if [ $(($i%5)) -eq 0 ]; then
+ prodstub_arm_job_create 200 prod-a job$(($i+$NUM_JOBS))
+ prodstub_arm_job_create 200 prod-b job$(($i+$NUM_JOBS))
+ prodstub_arm_job_create 200 prod-c job$(($i+$NUM_JOBS))
+ fi
+ if [ $(($i%5)) -eq 1 ]; then
+ prodstub_arm_job_create 200 prod-b job$(($i+$NUM_JOBS))
+ prodstub_arm_job_create 200 prod-c job$(($i+$NUM_JOBS))
+ fi
+ if [ $(($i%5)) -eq 2 ]; then
+ prodstub_arm_job_create 200 prod-c job$(($i+$NUM_JOBS))
+ fi
+ if [ $(($i%5)) -eq 3 ]; then
+ prodstub_arm_job_create 200 prod-d job$(($i+$NUM_JOBS))
+ fi
+ if [ $(($i%5)) -eq 4 ]; then
+ prodstub_arm_job_create 200 prod-d job$(($i+$NUM_JOBS))
+ fi
+done
+
+
+
+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
+
+ics_api_edp_put_producer_2 201 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1
-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_2 201 prod-b $CB_JOB/prod-b $CB_SV/prod-b type1 type2
-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_2 201 prod-c $CB_JOB/prod-c $CB_SV/prod-c type1 type2 type3
-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_2 201 prod-d $CB_JOB/prod-d $CB_SV/prod-d type4 type5
-ecs_equal json:ei-producer/v1/eiproducers 4
+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
-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
+
+
+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_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_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
+
+ics_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-b $CB_JOB/prod-b $CB_SV/prod-b type1 type2 type101 type102
+
+ics_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-d $CB_JOB/prod-d $CB_SV/prod-d type4 type5 type104 type105
+
+
+ics_equal json:data-producer/v1/info-producers 4
+
+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_PATH/job_status_ric1 testdata/ecs/job-template.json
- if [ -z "$FLAT_A1_EI" ]; then
- ecs_api_a1_get_job_status 200 type1 job$i ENABLED
- else
- ecs_api_a1_get_job_status 200 job$i ENABLED
- fi
+ ics_api_a1_put_job 201 job$i type1 $TARGET ric1 $CR_SERVICE_APP_PATH_0/job_status_ric1_$(($i+$NUM_JOBS)) testdata/ics/job-template.json
+ ics_api_a1_get_job_status 200 job$i ENABLED 120
+ ics_api_idc_put_job 201 job$(($i+$NUM_JOBS)) type101 $TARGET info-owner $CR_SERVICE_APP_PATH_0/job_status_info-owner$(($i+$NUM_JOBS)) 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
if [ $(($i%5)) -eq 1 ]; then
- ecs_api_a1_put_job 201 job$i type2 $TARGET ric1 $CR_PATH/job_status_ric1 testdata/ecs/job-template.json
- if [ -z "$FLAT_A1_EI" ]; then
- ecs_api_a1_get_job_status 200 type2 job$i ENABLED
- else
- ecs_api_a1_get_job_status 200 job$i ENABLED
- fi
+ ics_api_a1_put_job 201 job$i type2 $TARGET ric1 $CR_SERVICE_APP_PATH_0/job_status_ric1_$(($i+$NUM_JOBS)) testdata/ics/job-template.json
+ ics_api_a1_get_job_status 200 job$i ENABLED 120
+ ics_api_idc_put_job 201 job$(($i+$NUM_JOBS)) type102 $TARGET info-owner $CR_SERVICE_APP_PATH_0/job_status_info-owner$(($i+$NUM_JOBS)) 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
if [ $(($i%5)) -eq 2 ]; then
- ecs_api_a1_put_job 201 job$i type3 $TARGET ric1 $CR_PATH/job_status_ric1 testdata/ecs/job-template.json
- if [ -z "$FLAT_A1_EI" ]; then
- ecs_api_a1_get_job_status 200 type3 job$i ENABLED
- else
- ecs_api_a1_get_job_status 200 job$i ENABLED
- fi
+ ics_api_a1_put_job 201 job$i type3 $TARGET ric1 $CR_SERVICE_APP_PATH_0/job_status_ric1_$(($i+$NUM_JOBS)) testdata/ics/job-template.json
+ ics_api_a1_get_job_status 200 job$i ENABLED 120
+ ics_api_idc_put_job 201 job$(($i+$NUM_JOBS)) type103 $TARGET info-owner $CR_SERVICE_APP_PATH_0/job_status_info-owner$(($i+$NUM_JOBS)) testdata/ics/job-template.json VALIDATE
+ ics_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) ENABLED 1 prod-c 120
fi
if [ $(($i%5)) -eq 3 ]; then
- ecs_api_a1_put_job 201 job$i type4 $TARGET ric1 $CR_PATH/job_status_ric1 testdata/ecs/job-template.json
- if [ -z "$FLAT_A1_EI" ]; then
- ecs_api_a1_get_job_status 200 type4 job$i ENABLED
- else
- ecs_api_a1_get_job_status 200 job$i ENABLED
- fi
+ ics_api_a1_put_job 201 job$i type4 $TARGET ric1 $CR_SERVICE_APP_PATH_0/job_status_ric1_$(($i+$NUM_JOBS)) testdata/ics/job-template.json
+ ics_api_a1_get_job_status 200 job$i ENABLED 120
+ ics_api_idc_put_job 201 job$(($i+$NUM_JOBS)) type104 $TARGET info-owner $CR_SERVICE_APP_PATH_0/job_status_info-owner$(($i+$NUM_JOBS)) testdata/ics/job-template.json VALIDATE
+ ics_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) ENABLED 1 prod-d 120
fi
if [ $(($i%5)) -eq 4 ]; then
- ecs_api_a1_put_job 201 job$i type5 $TARGET ric1 $CR_PATH/job_status_ric1 testdata/ecs/job-template.json
- if [ -z "$FLAT_A1_EI" ]; then
- ecs_api_a1_get_job_status 200 type5 job$i ENABLED
- else
- ecs_api_a1_get_job_status 200 job$i ENABLED
- fi
+ ics_api_a1_put_job 201 job$i type5 $TARGET ric1 $CR_SERVICE_APP_PATH_0/job_status_ric1_$(($i+$NUM_JOBS)) testdata/ics/job-template.json
+ ics_api_a1_get_job_status 200 job$i ENABLED 120
+ ics_api_idc_put_job 201 job$(($i+$NUM_JOBS)) type105 $TARGET info-owner $CR_SERVICE_APP_PATH_0/job_status_info-owner$(($i+$NUM_JOBS)) testdata/ics/job-template.json VALIDATE
+ ics_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) ENABLED 1 prod-d 120
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/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))
+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))
+
+if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then
+ cr_equal 0 received_callbacks 20 30
+
else
- ecs_equal json:A1-EI/v1/eijobs?eiTypeId=type1 $(($NUM_JOBS/5))
- ecs_equal json:A1-EI/v1/eijobs?eiTypeId=type1 $(($NUM_JOBS/5))
- ecs_equal json:A1-EI/v1/eijobs?eiTypeId=type1 $(($NUM_JOBS/5))
- ecs_equal json:A1-EI/v1/eijobs?eiTypeId=type1 $(($NUM_JOBS/5))
- ecs_equal json:A1-EI/v1/eijobs?eiTypeId=type1 $(($NUM_JOBS/5))
+ cr_equal 0 received_callbacks 0 30
+
fi
-restart_ecs
-set_ecs_trace
+if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then
+
+ ics_equal json:data-consumer/v1/info-type-subscription 2 200
+
+ ics_api_idc_get_subscription_ids 200 owner1 subscription-id-1
+ ics_api_idc_get_subscription_ids 200 owner2 subscription-id-2
+
+ ics_equal json:data-producer/v1/info-types 10 1000
+
+fi
+
+stop_ics
+
+cr_api_reset 0
+
+start_stopped_ics
+
+set_ics_trace
+
+if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then
+
+ ics_equal json:data-consumer/v1/info-type-subscription 2 200
+
+ ics_api_idc_get_subscription_ids 200 owner1 subscription-id-1
+ ics_api_idc_get_subscription_ids 200 owner2 subscription-id-2
+
+ ics_equal json:data-producer/v1/info-types 10 1000
+fi
+
+cr_equal 0 received_callbacks 0
for ((i=1; i<=$NUM_JOBS; i++))
do
prodstub_delete_jobdata 204 prod-a job$i
prodstub_delete_jobdata 204 prod-b job$i
prodstub_delete_jobdata 204 prod-c job$i
+ prodstub_delete_jobdata 204 prod-a job$(($i+$NUM_JOBS))
+ prodstub_delete_jobdata 204 prod-b job$(($i+$NUM_JOBS))
+ prodstub_delete_jobdata 204 prod-c job$(($i+$NUM_JOBS))
fi
if [ $(($i%5)) -eq 1 ]; then
prodstub_delete_jobdata 204 prod-b job$i
prodstub_delete_jobdata 204 prod-c job$i
+ prodstub_delete_jobdata 204 prod-b job$(($i+$NUM_JOBS))
+ prodstub_delete_jobdata 204 prod-c job$(($i+$NUM_JOBS))
fi
if [ $(($i%5)) -eq 2 ]; then
prodstub_delete_jobdata 204 prod-c job$i
+ prodstub_delete_jobdata 204 prod-c job$(($i+$NUM_JOBS))
fi
if [ $(($i%5)) -eq 3 ]; then
prodstub_delete_jobdata 204 prod-d job$i
+ prodstub_delete_jobdata 204 prod-d job$(($i+$NUM_JOBS))
fi
if [ $(($i%5)) -eq 4 ]; then
prodstub_delete_jobdata 204 prod-d job$i
+ prodstub_delete_jobdata 204 prod-d job$(($i+$NUM_JOBS))
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
- else
- ecs_api_a1_get_job_status 200 job$i DISABLED
- fi
+ ics_api_a1_get_job_status 200 job$i DISABLED 120
+ ics_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) DISABLED EMPTYPROD 120
fi
if [ $(($i%5)) -eq 1 ]; then
- if [ -z "$FLAT_A1_EI" ]; then
- ecs_api_a1_get_job_status 200 type2 job$i DISABLED
- else
- ecs_api_a1_get_job_status 200 job$i DISABLED
- fi
+ ics_api_a1_get_job_status 200 job$i DISABLED 120
+ ics_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) DISABLED EMPTYPROD 120
fi
if [ $(($i%5)) -eq 2 ]; then
- if [ -z "$FLAT_A1_EI" ]; then
- ecs_api_a1_get_job_status 200 type3 job$i DISABLED
- else
- ecs_api_a1_get_job_status 200 job$i DISABLED
- fi
+ ics_api_a1_get_job_status 200 job$i DISABLED 120
+ ics_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) DISABLED EMPTYPROD 120
fi
if [ $(($i%5)) -eq 3 ]; then
- if [ -z "$FLAT_A1_EI" ]; then
- ecs_api_a1_get_job_status 200 type4 job$i DISABLED
- else
- ecs_api_a1_get_job_status 200 job$i DISABLED
- fi
+ ics_api_a1_get_job_status 200 job$i DISABLED 120
+ ics_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) DISABLED EMPTYPROD 120
fi
if [ $(($i%5)) -eq 4 ]; then
- if [ -z "$FLAT_A1_EI" ]; then
- ecs_api_a1_get_job_status 200 type5 job$i DISABLED
- else
- ecs_api_a1_get_job_status 200 job$i DISABLED
- fi
+ ics_api_a1_get_job_status 200 job$i DISABLED 120
+ ics_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) DISABLED EMPTYPROD 120
fi
done
+ics_api_edp_put_producer_2 201 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 type101
-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_2 201 prod-b $CB_JOB/prod-b $CB_SV/prod-b type1 type2 type101 type102
-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_2 201 prod-c $CB_JOB/prod-c $CB_SV/prod-c type1 type2 type3 type101 type102 type103
-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_2 201 prod-d $CB_JOB/prod-d $CB_SV/prod-d type4 type5 type104 type105
-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_equal json:data-producer/v1/info-producers 4
-ecs_equal json:ei-producer/v1/eiproducers 4
-
-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
- else
- ecs_api_a1_get_job_status 200 job$i ENABLED
- fi
+ ics_api_a1_get_job_status 200 job$i ENABLED 120
+ ics_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) ENABLED 3 prod-a prod-b prod-c 120
fi
if [ $(($i%5)) -eq 1 ]; then
- if [ -z "$FLAT_A1_EI" ]; then
- ecs_api_a1_get_job_status 200 type2 job$i ENABLED
- else
- ecs_api_a1_get_job_status 200 job$i ENABLED
- fi
+ ics_api_a1_get_job_status 200 job$i ENABLED 120
+ ics_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) ENABLED 2 prod-b prod-c 120
fi
if [ $(($i%5)) -eq 2 ]; then
- if [ -z "$FLAT_A1_EI" ]; then
- ecs_api_a1_get_job_status 200 type3 job$i ENABLED
- else
- ecs_api_a1_get_job_status 200 job$i ENABLED
- fi
+ ics_api_a1_get_job_status 200 job$i ENABLED 120
+ ics_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) ENABLED 1 prod-c 120
fi
if [ $(($i%5)) -eq 3 ]; then
- if [ -z "$FLAT_A1_EI" ]; then
- ecs_api_a1_get_job_status 200 type4 job$i ENABLED
- else
- ecs_api_a1_get_job_status 200 job$i ENABLED
- fi
+ ics_api_a1_get_job_status 200 job$i ENABLED 120
+ ics_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) ENABLED 1 prod-d 120
fi
if [ $(($i%5)) -eq 4 ]; then
- if [ -z "$FLAT_A1_EI" ]; then
- ecs_api_a1_get_job_status 200 type5 job$i ENABLED
- else
- ecs_api_a1_get_job_status 200 job$i ENABLED
- fi
+ ics_api_a1_get_job_status 200 job$i ENABLED 120
+ ics_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) ENABLED 1 prod-d 120
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))
-else
- ecs_equal json:A1-EI/v1/eijobs?eiTypeId=type1 $(($NUM_JOBS/5))
- ecs_equal json:A1-EI/v1/eijobs?eiTypeId=type1 $(($NUM_JOBS/5))
- ecs_equal json:A1-EI/v1/eijobs?eiTypeId=type1 $(($NUM_JOBS/5))
- ecs_equal json:A1-EI/v1/eijobs?eiTypeId=type1 $(($NUM_JOBS/5))
- ecs_equal json:A1-EI/v1/eijobs?eiTypeId=type1 $(($NUM_JOBS/5))
-fi
+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))
+
+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))
for ((i=1; i<=$NUM_JOBS; i++))
do
if [ $(($i%5)) -eq 0 ]; then
- prodstub_check_jobdata 200 prod-a job$i type1 $TARGET testdata/ecs/job-template.json
- prodstub_check_jobdata 200 prod-b job$i type1 $TARGET testdata/ecs/job-template.json
- prodstub_check_jobdata 200 prod-c job$i type1 $TARGET 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
+ 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
if [ $(($i%5)) -eq 1 ]; then
- prodstub_check_jobdata 200 prod-b job$i type2 $TARGET testdata/ecs/job-template.json
- prodstub_check_jobdata 200 prod-c job$i type2 $TARGET 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
+ 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
if [ $(($i%5)) -eq 2 ]; then
- prodstub_check_jobdata 200 prod-c job$i type3 $TARGET testdata/ecs/job-template.json
+ prodstub_check_jobdata_3 200 prod-c job$i type3 $TARGET ric1 testdata/ics/job-template.json
+ prodstub_check_jobdata_3 200 prod-c job$(($i+$NUM_JOBS)) type103 $TARGET info-owner testdata/ics/job-template.json
fi
if [ $(($i%5)) -eq 3 ]; then
- prodstub_check_jobdata 200 prod-d job$i type4 $TARGET testdata/ecs/job-template.json
+ prodstub_check_jobdata_3 200 prod-d job$i type4 $TARGET ric1 testdata/ics/job-template.json
+ prodstub_check_jobdata_3 200 prod-d job$(($i+$NUM_JOBS)) type104 $TARGET info-owner testdata/ics/job-template.json
fi
if [ $(($i%5)) -eq 4 ]; then
- prodstub_check_jobdata 200 prod-d job$i type5 $TARGET testdata/ecs/job-template.json
+ prodstub_check_jobdata_3 200 prod-d job$i type5 $TARGET ric1 testdata/ics/job-template.json
+ prodstub_check_jobdata_3 200 prod-d job$(($i+$NUM_JOBS)) type105 $TARGET info-owner testdata/ics/job-template.json
fi
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
+ ics_api_idc_delete_job 204 job$(($i+$NUM_JOBS))
fi
if [ $(($i%5)) -eq 1 ]; then
- ecs_api_a1_delete_job 204 job$i
+ ics_api_a1_delete_job 204 job$i
+ ics_api_idc_delete_job 204 job$(($i+$NUM_JOBS))
fi
if [ $(($i%5)) -eq 2 ]; then
- ecs_api_a1_delete_job 204 job$i
+ ics_api_a1_delete_job 204 job$i
+ ics_api_idc_delete_job 204 job$(($i+$NUM_JOBS))
fi
if [ $(($i%5)) -eq 3 ]; then
- ecs_api_a1_delete_job 204 job$i
+ ics_api_a1_delete_job 204 job$i
+ ics_api_idc_delete_job 204 job$(($i+$NUM_JOBS))
fi
if [ $(($i%5)) -eq 4 ]; then
- ecs_api_a1_delete_job 204 job$i
+ ics_api_a1_delete_job 204 job$i
+ ics_api_idc_delete_job 204 job$(($i+$NUM_JOBS))
fi
done
-ecs_equal json:ei-producer/v1/eiproducers 4
+ics_equal json:data-producer/v1/info-producers 4
+
+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_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
+
+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
+
+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
-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
+if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then
+ deviation "Total number of job callbacks are not stable - there may be additional job status callbacks"
+ cr_equal 0 received_callbacks 10 30 # 10 type status
+ cr_equal 0 received_callbacks?id=type-status1 5
+ cr_equal 0 received_callbacks?id=type-status2 5
+
+ 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_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
-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
else
- ecs_equal json:A1-EI/v1/eijobs?eiTypeId=type1 0
- ecs_equal json:A1-EI/v1/eijobs?eiTypeId=type1 0
- ecs_equal json:A1-EI/v1/eijobs?eiTypeId=type1 0
- ecs_equal json:A1-EI/v1/eijobs?eiTypeId=type1 0
- ecs_equal json:A1-EI/v1/eijobs?eiTypeId=type1 0
+ cr_equal 0 received_callbacks 0 30
fi
-check_ecs_logs
+check_ics_logs
store_logs END
print_result
-auto_clean_containers
+auto_clean_environment
\ No newline at end of file
Code Review / nonrtric.git / blobdiff