Function test updates
Removal of dmaap interface for A1PMS
Removal of old ICS interface
Optimized image sizes for simulators
Integrated ric mediator to the test env
Added testcase for ric mediator
Added testcase for custom adapter in A1PMS
Issue-ID: NONRTRIC-827
Signed-off-by: BjornMagnussonXA <bjorn.magnusson@est.tech>
Change-Id: I49baf0146204a1602fdc411d7187e816997a54db
diff --git a/test/auto-test/.gitignore b/test/auto-test/.gitignore
index c40137d..5b7bf90 100644
--- a/test/auto-test/.gitignore
+++ b/test/auto-test/.gitignore
@@ -7,6 +7,7 @@
.image-list
.tmp.curl.json
.consul*
+.a1pms*
.ext.consul*
.dockererr
.output.*
diff --git a/test/auto-test/FTC1.sh b/test/auto-test/FTC1.sh
index 092efe5..4ab8aff 100755
--- a/test/auto-test/FTC1.sh
+++ b/test/auto-test/FTC1.sh
@@ -1,7 +1,7 @@
#!/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.
@@ -18,7 +18,7 @@
#
-TC_ONELINE_DESCR="Sanity test, create service and then create,update and delete a policy using http/https and A1PMS REST/DMAAP with/without SDNC controller"
+TC_ONELINE_DESCR="Sanity test, create service and then create,update and delete a policy using http/https and A1PMS REST with/without SDNC controller"
#App names to include in the test when running docker, space separated list
DOCKER_INCLUDED_IMAGES="CP CR MR DMAAPMR A1PMS RICSIM SDNC NGW KUBEPROXY"
@@ -44,7 +44,7 @@
#### TEST BEGIN ####
-generate_policy_uuid
+sim_generate_policy_uuid
# Tested variants of REST/DMAAP/SDNC config
TESTED_VARIANTS="REST DMAAP REST+SDNC DMAAP+SDNC"
@@ -86,7 +86,12 @@
use_cr_https
use_simulator_https
if [[ $interface = *"SDNC"* ]]; then
- use_sdnc_https
+ if [[ "$SDNC_FEATURE_LEVEL" == *"NO_NB_HTTPS"* ]]; then
+ deviation "SDNC does not support NB https"
+ use_sdnc_http
+ else
+ use_sdnc_https
+ fi
fi
if [[ $interface = *"DMAAP"* ]]; then
use_a1pms_dmaap_https
@@ -137,6 +142,7 @@
if [[ $interface = *"SDNC"* ]]; then
start_sdnc
+ controller_api_wait_for_status_ok 200 ricsim_g1_1
prepare_a1pms_config SDNC ".a1pms_config.json"
else
prepare_a1pms_config NOSDNC ".a1pms_config.json"
diff --git a/test/auto-test/FTC10.sh b/test/auto-test/FTC10.sh
index 32b6b1c..e109d83 100755
--- a/test/auto-test/FTC10.sh
+++ b/test/auto-test/FTC10.sh
@@ -1,7 +1,7 @@
#!/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.
@@ -17,7 +17,7 @@
# ============LICENSE_END=================================================
#
-TC_ONELINE_DESCR="Basic use case, register service, create/update policy, delete policy, de-register service using both STD and OSC interface while mixing REST and Dmaap"
+TC_ONELINE_DESCR="Basic use case, register service, create/update policy, delete policy, de-register service using both STD and OSC interface while mixing REST"
#App names to include in the test when running docker, space separated list
DOCKER_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM NGW KUBEPROXY"
@@ -43,7 +43,7 @@
#### TEST BEGIN ####
-generate_policy_uuid
+sim_generate_policy_uuid
use_simulator_http
use_mr_http
@@ -60,7 +60,11 @@
start_ric_simulators ricsim_g3 1 STD_2.0.0
-start_mr
+if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ :
+else
+ start_mr
+fi
start_cr 1
@@ -113,8 +117,11 @@
sim_equal ricsim_g1_1 num_instances 1
-
-use_a1pms_dmaap_http
+if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ use_a1pms_rest_http
+else
+ use_a1pms_dmaap_http
+fi
a1pms_api_put_policy 201 "service1" ricsim_g1_1 1 3000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json 1
@@ -128,7 +135,11 @@
sim_equal ricsim_g2_1 num_instances 1
-use_a1pms_dmaap_http
+if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ use_a1pms_rest_http
+else
+ use_a1pms_dmaap_http
+fi
a1pms_api_put_policy 201 "service1" ricsim_g2_1 NOTYPE 3100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json 1
@@ -140,7 +151,11 @@
sim_equal ricsim_g3_1 num_instances 1
-use_a1pms_dmaap_http
+if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ use_a1pms_rest_http
+else
+ use_a1pms_dmaap_http
+fi
a1pms_api_put_policy 201 "service1" ricsim_g3_1 STD_QOS_0_2_0 3200 NOTRANSIENT $notificationurl testdata/STD2/pi_qos_template.json 1
@@ -156,7 +171,11 @@
sim_equal ricsim_g1_1 num_instances 2
-use_a1pms_dmaap_http
+if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ use_a1pms_rest_http
+else
+ use_a1pms_dmaap_http
+fi
a1pms_api_put_policy 200 "service1" ricsim_g1_1 1 3000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json 1
@@ -171,7 +190,11 @@
sim_equal ricsim_g2_1 num_instances 2
-use_a1pms_dmaap_http
+if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ use_a1pms_rest_http
+else
+ use_a1pms_dmaap_http
+fi
a1pms_api_put_policy 200 "service1" ricsim_g2_1 NOTYPE 3100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json 1
@@ -184,7 +207,11 @@
sim_equal ricsim_g3_1 num_instances 2
-use_a1pms_dmaap_http
+if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ use_a1pms_rest_http
+else
+ use_a1pms_dmaap_http
+fi
a1pms_api_put_policy 200 "service1" ricsim_g3_1 STD_QOS_0_2_0 3200 true $notificationurl testdata/STD2/pi_qos_template.json 1
@@ -205,15 +232,27 @@
# Remove policies
-use_a1pms_dmaap_http
+if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ use_a1pms_rest_http
+else
+ use_a1pms_dmaap_http
+fi
a1pms_api_delete_policy 204 2000
use_a1pms_rest_http
a1pms_api_delete_policy 204 3000
-use_a1pms_dmaap_http
+if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ use_a1pms_rest_http
+else
+ use_a1pms_dmaap_http
+fi
a1pms_api_delete_policy 204 2100
use_a1pms_rest_http
a1pms_api_delete_policy 204 3100
-use_a1pms_dmaap_http
+if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ use_a1pms_rest_http
+else
+ use_a1pms_dmaap_http
+fi
a1pms_api_delete_policy 204 2200
use_a1pms_rest_http
a1pms_api_delete_policy 204 3200
@@ -240,7 +279,11 @@
a1pms_api_get_policy 404 3200
# Remove the service
-use_a1pms_dmaap_http
+if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ use_a1pms_rest_http
+else
+ use_a1pms_dmaap_http
+fi
a1pms_api_delete_services 204 "service1"
a1pms_api_get_services 404 "service1"
diff --git a/test/auto-test/FTC100.sh b/test/auto-test/FTC100.sh
index c7c80aa..a5348a8 100755
--- a/test/auto-test/FTC100.sh
+++ b/test/auto-test/FTC100.sh
@@ -1,7 +1,7 @@
#!/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.
@@ -18,7 +18,7 @@
#
-TC_ONELINE_DESCR="Full a1pms API walkthrough using a1pms REST/DMAAP and with/without SDNC A1 Controller"
+TC_ONELINE_DESCR="Full a1pms API walkthrough using a1pms REST and with/without SDNC A1 Controller"
USE_ISTIO=0
@@ -50,11 +50,15 @@
#### TEST BEGIN ####
-generate_policy_uuid
+sim_generate_policy_uuid
if [ $USE_ISTIO -eq 0 ]; then
# Tested variants of REST/DMAAP/SDNC config
- TESTED_VARIANTS="REST DMAAP REST+SDNC DMAAP+SDNC"
+ if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ TESTED_VARIANTS="REST REST+SDNC"
+ else
+ TESTED_VARIANTS="REST DMAAP REST+SDNC DMAAP+SDNC"
+ fi
#Test a1pms and simulator protocol versions (others are http only)
TESTED_PROTOCOLS="HTTP HTTPS"
@@ -66,7 +70,11 @@
echo -e $RED"#########################################"$ERED
fi
# Tested variants of REST/DMAAP/SDNC config
- TESTED_VARIANTS="REST DMAAP"
+ if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ TESTED_VARIANTS="REST DMAAP"
+ else
+ TESTED_VARIANTS="REST"
+ fi
#Test a1pms and simulator protocol versions (others are http only)
TESTED_PROTOCOLS="HTTP"
@@ -179,7 +187,12 @@
use_simulator_https
use_mr_https
if [[ $interface = *"SDNC"* ]]; then
- use_sdnc_https
+ if [[ "$SDNC_FEATURE_LEVEL" == *"NO_NB_HTTPS"* ]]; then
+ deviation "SDNC does not support NB https"
+ use_sdnc_http
+ else
+ use_sdnc_https
+ fi
fi
if [[ $interface = *"DMAAP"* ]]; then
use_a1pms_dmaap_https
@@ -209,7 +222,11 @@
sim_put_policy_type 201 ricsim_g3_1 STD_QOS_0_2_0 testdata/STD2/sim_qos.json
sim_put_policy_type 201 ricsim_g3_1 STD_QOS2_0.1.0 testdata/STD2/sim_qos2.json
- start_mr
+ if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ :
+ else
+ start_mr
+ fi
start_cr 1
@@ -222,6 +239,7 @@
if [[ $interface = *"SDNC"* ]]; then
start_sdnc
+ controller_api_wait_for_status_ok 200 ricsim_g1_1
prepare_a1pms_config SDNC ".a1pms_config.json"
else
prepare_a1pms_config NOSDNC ".a1pms_config.json"
@@ -270,7 +288,11 @@
cr_equal 0 received_callbacks 3 120
cr_api_check_all_sync_events 200 0 ric-registration ricsim_g1_1 ricsim_g2_1 ricsim_g3_1
- mr_equal requests_submitted 0
+ if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ :
+ else
+ mr_equal requests_submitted 0
+ fi
echo "############################################"
@@ -560,7 +582,11 @@
mr_equal current_requests 0
mr_equal current_responses 0
else
- mr_equal requests_submitted 0
+ if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ :
+ else
+ mr_equal requests_submitted 0
+ fi
fi
if [ $USE_ISTIO -eq 0 ]; then
if [[ $interface = *"SDNC"* ]]; then
diff --git a/test/auto-test/FTC110.sh b/test/auto-test/FTC110.sh
index e3f3c85..6d14589 100755
--- a/test/auto-test/FTC110.sh
+++ b/test/auto-test/FTC110.sh
@@ -1,7 +1,7 @@
#!/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.
@@ -44,7 +44,7 @@
#### TEST BEGIN ####
-generate_policy_uuid
+sim_generate_policy_uuid
use_cr_http
use_simulator_http
@@ -59,7 +59,11 @@
start_ric_simulators ricsim_g2 1 STD_1.1.3
start_ric_simulators ricsim_g3 1 STD_2.0.0
-start_mr
+if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ :
+else
+ start_mr
+fi
start_cr 1
@@ -82,7 +86,11 @@
set_a1pms_debug
-mr_equal requests_submitted 0
+if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ :
+else
+ mr_equal requests_submitted 0
+fi
sleep_wait 120 "Let A1PMS cofiguration take effect"
@@ -228,7 +236,11 @@
a1pms_api_get_service_ids 200
-mr_equal requests_submitted 0
+if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ :
+else
+ mr_equal requests_submitted 0
+fi
check_a1pms_logs
diff --git a/test/auto-test/FTC1100.sh b/test/auto-test/FTC1100.sh
index 2c3cd3b..749b725 100755
--- a/test/auto-test/FTC1100.sh
+++ b/test/auto-test/FTC1100.sh
@@ -1,7 +1,7 @@
#!/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.
@@ -50,8 +50,6 @@
#### TEST BEGIN ####
-FLAT_A1_EI="1"
-
clean_environment
if [ $RUNMODE != "KUBE" ]; then
@@ -336,313 +334,174 @@
ics_api_a1_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
- ics_api_edp_get_type_2 404 test-type
-fi
+ics_api_edp_get_type_2 404 test-type
-if [ $ICS_VERSION == "V1-1" ]; then
- ics_api_edp_get_producer_ids 200 EMPTY
- ics_api_edp_get_producer 404 test-prod
-else
- ics_api_edp_get_producer_ids_2 200 NOTYPE EMPTY
- ics_api_edp_get_producer_2 404 test-prod
-fi
+ics_api_edp_get_producer_ids_2 200 NOTYPE EMPTY
+ics_api_edp_get_producer_2 404 test-prod
+
ics_api_edp_get_producer_status 404 test-prod
ics_api_edp_delete_producer 404 test-prod
-if [ -z "$FLAT_A1_EI" ]; then
- ics_api_a1_get_job_ids 404 test-type NOWNER
- ics_api_a1_get_job_ids 404 test-type test-owner
+ics_api_a1_get_job_ids 200 test-type NOWNER EMPTY
+ics_api_a1_get_job_ids 200 test-type test-owner EMPTY
- ics_api_a1_get_job 404 test-type test-job
+ics_api_a1_get_job 404 test-job
- ics_api_a1_get_job_status 404 test-type test-job
-else
- ics_api_a1_get_job_ids 200 test-type NOWNER EMPTY
- ics_api_a1_get_job_ids 200 test-type test-owner EMPTY
+ics_api_a1_get_job_status 404 test-job
- ics_api_a1_get_job 404 test-job
+ics_api_a1_delete_job 404 test-job
- ics_api_a1_get_job_status 404 test-job
-fi
+ics_api_edp_get_producer_ids_2 200 NOTYPE EMPTY
+ics_api_edp_get_producer_2 404 test-prod
-if [ -z "$FLAT_A1_EI" ]; then
- ics_api_a1_delete_job 404 test-type test-job
-else
- ics_api_a1_delete_job 404 test-job
-fi
-
-if [ $ICS_VERSION == "V1-1" ]; then
- ics_api_edp_get_producer_jobs 404 test-prod
-else
- ics_api_edp_get_producer_jobs_2 404 test-prod
-fi
-
-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
+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-a
-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
+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
+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
- #V1-2
- 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
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
- ics_api_edp_put_type_2 201 type1 testdata/ics/ei-type-1.json
- fi
- 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
- ics_api_edp_get_type_2 200 type1 testdata/ics/ei-type-1.json
- fi
-
- 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 [[ "$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_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
+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
+ ics_api_edp_get_type_2 200 type1 testdata/ics/ei-type-1.json
fi
+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 [[ "$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_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
ics_api_a1_get_type_ids 200 type1
-if [ -z "$FLAT_A1_EI" ]; then
- ics_api_a1_get_type 200 type1 testdata/ics/ei-type-1.json
-else
- ics_api_a1_get_type 200 type1 testdata/ics/empty-type.json
-fi
+ics_api_a1_get_type 200 type1 testdata/ics/empty-type.json
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
+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
- 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
- ics_api_edp_get_type_2 200 type1 testdata/ics/ei-type-1.json
- fi
+ ics_api_edp_get_type_2 200 type1 testdata/ics/ei-type-1.json
fi
-if [ $ICS_VERSION == "V1-1" ]; then
- ics_api_edp_get_producer_ids 200 prod-a
-else
- 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
+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
-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
- ics_api_edp_get_producer_2 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1
-fi
+ics_api_edp_get_producer_2 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1
ics_api_edp_get_producer_status 200 prod-a ENABLED
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
- ics_api_a1_get_job 404 type1 test-job
+ics_api_a1_get_job 404 test-job
- ics_api_a1_get_job_status 404 type1 test-job
-else
- ics_api_a1_get_job 404 test-job
+ics_api_a1_get_job_status 404 test-job
- ics_api_a1_get_job_status 404 test-job
-fi
-if [ $ICS_VERSION == "V1-1" ]; then
- ics_api_edp_get_producer_jobs 200 prod-a EMPTY
-else
- ics_api_edp_get_producer_jobs_2 200 prod-a EMPTY
-fi
+ics_api_edp_get_producer_jobs_2 200 prod-a EMPTY
## Create a job for prod-a
## job1 - prod-a
-if [ -z "$FLAT_A1_EI" ]; then
- ics_api_a1_put_job 201 type1 job1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json
-else
- ics_api_a1_put_job 201 job1 type1 $TARGET1 ricsim_g3_1 $STATUS1 testdata/ics/job-template.json
-fi
+ics_api_a1_put_job 201 job1 type1 $TARGET1 ricsim_g3_1 $STATUS1 testdata/ics/job-template.json
# Check the job data in the producer
-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 [[ "$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/ics/job-template.json
- fi
-fi
+prodstub_check_jobdata_3 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json
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
- ics_api_a1_get_job_ids 200 NOTYPE NOWNER job1
-fi
+ics_api_a1_get_job_ids 200 NOTYPE NOWNER job1
-if [ -z "$FLAT_A1_EI" ]; then
- ics_api_a1_get_job 200 type1 job1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json
+ics_api_a1_get_job 200 job1 type1 $TARGET1 ricsim_g3_1 $STATUS1 testdata/ics/job-template.json
- ics_api_a1_get_job_status 200 type1 job1 ENABLED
-else
- ics_api_a1_get_job 200 job1 type1 $TARGET1 ricsim_g3_1 $STATUS1 testdata/ics/job-template.json
-
- ics_api_a1_get_job_status 200 job1 ENABLED
-fi
+ics_api_a1_get_job_status 200 job1 ENABLED
prodstub_equal create/prod-a/job1 1
-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
- ics_api_edp_get_producer_jobs_2 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json
-fi
+ics_api_edp_get_producer_jobs_2 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json
+
## Create a second job for prod-a
## job2 - prod-a
-if [ -z "$FLAT_A1_EI" ]; then
- ics_api_a1_put_job 201 type1 job2 $TARGET2 ricsim_g3_2 testdata/ics/job-template.json
-else
- ics_api_a1_put_job 201 job2 type1 $TARGET2 ricsim_g3_2 $STATUS2 testdata/ics/job-template.json
-fi
+ics_api_a1_put_job 201 job2 type1 $TARGET2 ricsim_g3_2 $STATUS2 testdata/ics/job-template.json
# Check the job data in the producer
-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 [[ "$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/ics/job-template.json
- fi
-fi
+prodstub_check_jobdata_3 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ics/job-template.json
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
- ics_api_a1_get_job_ids 200 NOTYPE NOWNER job1 job2
-fi
+ics_api_a1_get_job_ids 200 NOTYPE NOWNER job1 job2
-if [ -z "$FLAT_A1_EI" ]; then
- ics_api_a1_get_job 200 type1 job2 $TARGET2 ricsim_g3_2 testdata/ics/job-template.json
+ics_api_a1_get_job 200 job2 type1 $TARGET2 ricsim_g3_2 $STATUS2 testdata/ics/job-template.json
- ics_api_a1_get_job_status 200 type1 job2 ENABLED
-else
- ics_api_a1_get_job 200 job2 type1 $TARGET2 ricsim_g3_2 $STATUS2 testdata/ics/job-template.json
-
- ics_api_a1_get_job_status 200 job2 ENABLED
-fi
+ics_api_a1_get_job_status 200 job2 ENABLED
prodstub_equal create/prod-a/job2 1
-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
- 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
+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
## Setup prod-b
-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
+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_ics_subscription_events 200 0 type-status1 type2 testdata/ics/ei-type-2.json REGISTERED
else
- 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_ics_subscription_events 200 0 type-status1 type2 testdata/ics/ei-type-2.json REGISTERED
- else
- cr_equal 0 received_callbacks 0
- fi
+ cr_equal 0 received_callbacks 0
fi
ics_api_a1_get_type_ids 200 type1 type2
-if [ -z "$FLAT_A1_EI" ]; then
- 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
- 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
+
+ics_api_a1_get_type 200 type1 testdata/ics/empty-type.json
+ics_api_a1_get_type 200 type2 testdata/ics/empty-type.json
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
+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
- 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
- ics_api_edp_get_type_2 200 type1 testdata/ics/ei-type-1.json
- fi
- ics_api_edp_get_type_2 200 type2 testdata/ics/ei-type-2.json
+ ics_api_edp_get_type_2 200 type1 testdata/ics/ei-type-1.json
fi
+ics_api_edp_get_type_2 200 type2 testdata/ics/ei-type-2.json
-if [ $ICS_VERSION == "V1-1" ]; then
- ics_api_edp_get_producer_ids 200 prod-a prod-b
-else
- ics_api_edp_get_producer_ids_2 200 NOTYPE prod-a prod-b
-fi
+ics_api_edp_get_producer_ids_2 200 NOTYPE prod-a prod-b
-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
- 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
+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_status 200 prod-b ENABLED
## Create job for prod-b
## job3 - prod-b
-if [ -z "$FLAT_A1_EI" ]; then
- ics_api_a1_put_job 201 type2 job3 $TARGET3 ricsim_g3_3 testdata/ics/job-template.json
-else
- ics_api_a1_put_job 201 job3 type2 $TARGET3 ricsim_g3_3 $STATUS3 testdata/ics/job-template.json
-fi
+ics_api_a1_put_job 201 job3 type2 $TARGET3 ricsim_g3_3 $STATUS3 testdata/ics/job-template.json
prodstub_equal create/prod-b/job3 1
# Check the job data in the producer
-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 [[ "$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/ics/job-template.json
- fi
-fi
+prodstub_check_jobdata_3 200 prod-b job3 type2 $TARGET3 ricsim_g3_3 testdata/ics/job-template.json
ics_api_a1_get_job_ids 200 type1 NOWNER job1 job2
ics_api_a1_get_job_ids 200 type2 NOWNER job3
@@ -650,46 +509,22 @@
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
- ics_api_a1_get_job 200 type2 job3 $TARGET3 ricsim_g3_3 testdata/ics/job-template.json
+ics_api_a1_get_job 200 job3 type2 $TARGET3 ricsim_g3_3 $STATUS3 testdata/ics/job-template.json
- ics_api_a1_get_job_status 200 type2 job3 ENABLED
-else
- ics_api_a1_get_job 200 job3 type2 $TARGET3 ricsim_g3_3 $STATUS3 testdata/ics/job-template.json
+ics_api_a1_get_job_status 200 job3 ENABLED
- ics_api_a1_get_job_status 200 job3 ENABLED
-fi
+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
-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
- 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 [ $ICS_VERSION == "V1-1" ]; then
- ics_api_edp_put_producer 201 prod-c $CB_JOB/prod-c $CB_SV/prod-c NOTYPE
-else
- ics_api_edp_put_producer_2 201 prod-c $CB_JOB/prod-c $CB_SV/prod-c NOTYPE
-fi
+ics_api_edp_put_producer_2 201 prod-c $CB_JOB/prod-c $CB_SV/prod-c NOTYPE
-if [ $ICS_VERSION == "V1-1" ]; then
- ics_api_edp_get_producer_ids 200 prod-a prod-b prod-c
-else
- ics_api_edp_get_producer_ids_2 200 NOTYPE prod-a prod-b prod-c
-fi
+ics_api_edp_get_producer_ids_2 200 NOTYPE prod-a prod-b prod-c
-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
- 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
+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
ics_api_edp_get_producer_status 200 prod-c ENABLED
@@ -698,92 +533,40 @@
# Delete job then producer
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
- ics_api_edp_get_producer_ids_2 200 NOTYPE prod-a prod-b prod-c
-fi
+ics_api_edp_get_producer_ids_2 200 NOTYPE prod-a prod-b prod-c
-if [ -z "$FLAT_A1_EI" ]; then
- ics_api_a1_delete_job 204 type2 job3
-else
- ics_api_a1_delete_job 204 job3
-fi
+ics_api_a1_delete_job 204 job3
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
- ics_api_edp_get_producer_ids_2 200 NOTYPE prod-a prod-b prod-c
-fi
+ics_api_edp_get_producer_ids_2 200 NOTYPE prod-a prod-b prod-c
ics_api_edp_delete_producer 204 prod-b
ics_api_edp_get_producer_status 404 prod-b
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
- ics_api_edp_get_producer_ids_2 200 NOTYPE prod-a prod-c
-fi
+ics_api_edp_get_producer_ids_2 200 NOTYPE prod-a prod-c
prodstub_equal delete/prod-b/job3 1
-if [ -z "$FLAT_A1_EI" ]; then
- ics_api_a1_put_job 404 type2 job3 $TARGET3 ricsim_g3_3 testdata/ics/job-template.json
-else
- 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
- 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
+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
# Put producer then job
-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
- ics_api_edp_put_producer_2 201 prod-b $CB_JOB/prod-b $CB_SV/prod-b type2
-fi
+ics_api_edp_put_producer_2 201 prod-b $CB_JOB/prod-b $CB_SV/prod-b type2
ics_api_edp_get_producer_status 200 prod-b ENABLED
-if [ -z "$FLAT_A1_EI" ]; then
- 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 [ $ICS_VERSION == "V1-1" ]; then
- ics_api_a1_put_job 201 job3 type2 $TARGET3 ricsim_g3_3 $STATUS3 testdata/ics/job-template2.json
- else
- ics_api_a1_put_job 200 job3 type2 $TARGET3 ricsim_g3_3 $STATUS3 testdata/ics/job-template2.json
- fi
- ics_api_a1_get_job_status 200 job3 ENABLED
-fi
+ ics_api_a1_put_job 200 job3 type2 $TARGET3 ricsim_g3_3 $STATUS3 testdata/ics/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 [[ "$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/ics/job-template2.json
- fi
-fi
+ics_api_a1_get_job_status 200 job3 ENABLED
+
+prodstub_check_jobdata_3 200 prod-b job3 type2 $TARGET3 ricsim_g3_3 testdata/ics/job-template2.json
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
- ics_api_edp_get_producer_ids_2 200 NOTYPE prod-a prod-b prod-c
-fi
+ics_api_edp_get_producer_ids_2 200 NOTYPE prod-a prod-b prod-c
-if [ $ICS_VERSION == "V1-1" ]; then
- prodstub_equal create/prod-b/job3 2
-else
- prodstub_equal create/prod-b/job3 3
-fi
+prodstub_equal create/prod-b/job3 3
prodstub_equal delete/prod-b/job3 1
# Delete only the producer
@@ -792,17 +575,9 @@
ics_api_edp_get_producer_status 404 prod-b
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
- ics_api_edp_get_producer_ids_2 200 NOTYPE prod-a prod-c
-fi
+ics_api_edp_get_producer_ids_2 200 NOTYPE prod-a prod-c
-if [ -z "$FLAT_A1_EI" ]; then
- ics_api_a1_get_job_status 200 type2 job3 DISABLED
-else
- ics_api_a1_get_job_status 200 job3 DISABLED
-fi
+ics_api_a1_get_job_status 200 job3 DISABLED
if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then
cr_equal 0 received_callbacks 5 30
@@ -816,19 +591,11 @@
fi
# Re-create the producer
-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
- ics_api_edp_put_producer_2 201 prod-b $CB_JOB/prod-b $CB_SV/prod-b type2
-fi
+ics_api_edp_put_producer_2 201 prod-b $CB_JOB/prod-b $CB_SV/prod-b type2
ics_api_edp_get_producer_status 200 prod-b ENABLED
-if [ -z "$FLAT_A1_EI" ]; then
- ics_api_a1_get_job_status 200 type2 job3 ENABLED
-else
- ics_api_a1_get_job_status 200 job3 ENABLED
-fi
+ics_api_a1_get_job_status 200 job3 ENABLED
if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then
cr_equal 0 received_callbacks 6 30
@@ -841,23 +608,11 @@
cr_api_check_all_ics_events 200 0 job3-status ENABLED
fi
-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 [[ "$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/ics/job-template2.json
- fi
-fi
+prodstub_check_jobdata_3 200 prod-b job3 type2 $TARGET3 ricsim_g3_3 testdata/ics/job-template2.json
## Setup prod-d
-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
- 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
+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
if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then
cr_equal 0 received_callbacks 7 30
@@ -867,52 +622,24 @@
ics_api_a1_get_job_ids 200 type4 NOWNER EMPTY
-if [ -z "$FLAT_A1_EI" ]; then
- ics_api_a1_put_job 201 type4 job8 $TARGET8 ricsim_g3_4 testdata/ics/job-template.json
-else
- ics_api_a1_put_job 201 job8 type4 $TARGET8 ricsim_g3_4 $STATUS8 testdata/ics/job-template.json
-fi
+ics_api_a1_put_job 201 job8 type4 $TARGET8 ricsim_g3_4 $STATUS8 testdata/ics/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 [[ "$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/ics/job-template.json
- fi
-fi
+prodstub_check_jobdata_3 200 prod-d job8 type4 $TARGET8 ricsim_g3_4 testdata/ics/job-template.json
prodstub_equal create/prod-d/job8 1
prodstub_equal delete/prod-d/job8 0
ics_api_a1_get_job_ids 200 type4 NOWNER job8
-if [ -z "$FLAT_A1_EI" ]; then
- ics_api_a1_get_job_status 200 type4 job8 ENABLED
-else
- ics_api_a1_get_job_status 200 job8 ENABLED
-fi
+ics_api_a1_get_job_status 200 job8 ENABLED
# Re-PUT the producer with zero types
-if [ $ICS_VERSION == "V1-1" ]; then
- ics_api_edp_put_producer 200 prod-d $CB_JOB/prod-d $CB_SV/prod-d NOTYPE
-else
- ics_api_edp_put_producer_2 200 prod-d $CB_JOB/prod-d $CB_SV/prod-d NOTYPE
-fi
+ics_api_edp_put_producer_2 200 prod-d $CB_JOB/prod-d $CB_SV/prod-d NOTYPE
-if [ -z "$FLAT_A1_EI" ]; then
- ics_api_a1_get_job_ids 404 type4 NOWNER
-else
- ics_api_a1_get_job_ids 200 type4 NOWNER job8
- ics_api_a1_get_job_ids 200 NOTYPE NOWNER job1 job2 job3 job8
-fi
+ics_api_a1_get_job_ids 200 type4 NOWNER job8
+ics_api_a1_get_job_ids 200 NOTYPE NOWNER job1 job2 job3 job8
-if [ -z "$FLAT_A1_EI" ]; then
- ics_api_a1_get_job_status 200 type4 job8 DISABLED
-else
- ics_api_a1_get_job_status 200 job8 DISABLED
-fi
+ics_api_a1_get_job_status 200 job8 DISABLED
if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then
cr_equal 0 received_callbacks 8 30
@@ -929,25 +656,13 @@
prodstub_equal delete/prod-d/job8 0
## Re-setup prod-d
-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
- 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
+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
-if [ -z "$FLAT_A1_EI" ]; then
- ics_api_a1_get_job_ids 404 type4 NOWNER
-else
- ics_api_a1_get_job_ids 200 type4 NOWNER job8
- ics_api_a1_get_job_ids 200 NOTYPE NOWNER job1 job2 job3 job8
-fi
+ics_api_a1_get_job_ids 200 type4 NOWNER job8
+ics_api_a1_get_job_ids 200 NOTYPE NOWNER job1 job2 job3 job8
-if [ -z "$FLAT_A1_EI" ]; then
- ics_api_a1_get_job_status 200 type4 job8 ENABLED
-else
- ics_api_a1_get_job_status 200 job8 ENABLED
-fi
+ics_api_a1_get_job_status 200 job8 ENABLED
ics_api_edp_get_producer_status 200 prod-a ENABLED
ics_api_edp_get_producer_status 200 prod-b ENABLED
@@ -971,12 +686,8 @@
prodstub_equal delete/prod-d/job8 0
## Setup prod-e
-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
- 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
+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
if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then
cr_equal 0 received_callbacks 11 30
@@ -986,40 +697,20 @@
ics_api_a1_get_job_ids 200 type6 NOWNER EMPTY
-if [ -z "$FLAT_A1_EI" ]; then
- ics_api_a1_put_job 201 type6 job10 $TARGET10 ricsim_g3_4 testdata/ics/job-template.json
-else
- ics_api_a1_put_job 201 job10 type6 $TARGET10 ricsim_g3_4 $STATUS10 testdata/ics/job-template.json
-fi
+ics_api_a1_put_job 201 job10 type6 $TARGET10 ricsim_g3_4 $STATUS10 testdata/ics/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 [[ "$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/ics/job-template.json
- fi
-fi
+prodstub_check_jobdata_3 200 prod-e job10 type6 $TARGET10 ricsim_g3_4 testdata/ics/job-template.json
prodstub_equal create/prod-e/job10 1
prodstub_equal delete/prod-e/job10 0
ics_api_a1_get_job_ids 200 type6 NOWNER job10
-if [ -z "$FLAT_A1_EI" ]; then
- ics_api_a1_get_job_status 200 type6 job10 ENABLED
-else
- ics_api_a1_get_job_status 200 job10 ENABLED
-fi
+ics_api_a1_get_job_status 200 job10 ENABLED
## Setup prod-f
-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
- 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
+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
if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then
cr_equal 0 received_callbacks 12 30
@@ -1029,34 +720,18 @@
ics_api_a1_get_job_ids 200 type6 NOWNER job10
-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 [[ "$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/ics/job-template.json
- fi
-fi
+prodstub_check_jobdata_3 200 prod-f job10 type6 $TARGET10 ricsim_g3_4 testdata/ics/job-template.json
prodstub_equal create/prod-f/job10 1
prodstub_equal delete/prod-f/job10 0
ics_api_a1_get_job_ids 200 type6 NOWNER job10
-if [ -z "$FLAT_A1_EI" ]; then
- ics_api_a1_get_job_status 200 type6 job10 ENABLED
-else
- ics_api_a1_get_job_status 200 job10 ENABLED
-fi
+ics_api_a1_get_job_status 200 job10 ENABLED
## Status updates prod-a and jobs
-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
- ics_api_edp_get_producer_ids_2 200 NOTYPE prod-a prod-b prod-c prod-d prod-e prod-f
-fi
+ics_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_status 200 prod-a ENABLED
ics_api_edp_get_producer_status 200 prod-b ENABLED
@@ -1071,11 +746,7 @@
# Wait for producer prod-a to go disabled
ics_api_edp_get_producer_status 200 prod-a DISABLED 360
-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
- ics_api_edp_get_producer_ids_2 200 NOTYPE prod-a prod-b prod-c prod-d prod-e prod-f
-fi
+ics_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_status 200 prod-a DISABLED
ics_api_edp_get_producer_status 200 prod-b ENABLED
@@ -1085,19 +756,11 @@
ics_api_edp_get_producer_status 200 prod-f ENABLED
-if [ -z "$FLAT_A1_EI" ]; then
- 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
- 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
+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
# Arm producer prod-a for supervision
prodstub_arm_producer 200 prod-a 200
@@ -1105,11 +768,7 @@
# Wait for producer prod-a to go enabled
ics_api_edp_get_producer_status 200 prod-a ENABLED 360
-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
- ics_api_edp_get_producer_ids_2 200 NOTYPE prod-a prod-b prod-c prod-d prod-e prod-f
-fi
+ics_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_status 200 prod-a ENABLED
ics_api_edp_get_producer_status 200 prod-b ENABLED
@@ -1118,19 +777,11 @@
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
- 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
- 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
+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
# Arm producer prod-a for supervision failure
prodstub_arm_producer 200 prod-a 400
@@ -1138,11 +789,7 @@
# Wait for producer prod-a to go disabled
ics_api_edp_get_producer_status 200 prod-a DISABLED 360
-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
- ics_api_edp_get_producer_ids_2 200 NOTYPE prod-a prod-b prod-c prod-d prod-e prod-f
-fi
+ics_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_status 200 prod-a DISABLED
ics_api_edp_get_producer_status 200 prod-b ENABLED
@@ -1151,32 +798,16 @@
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
- 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
- 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
+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
# Wait for producer prod-a to be removed
-if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
- ics_equal json:data-producer/v1/info-producers 5 1000
-else
- ics_equal json:ei-producer/v1/eiproducers 5 1000
-fi
+ics_equal json:data-producer/v1/info-producers 5 1000
-if [ $ICS_VERSION == "V1-1" ]; then
- ics_api_edp_get_producer_ids 200 prod-b prod-c prod-d prod-e prod-f
-else
- ics_api_edp_get_producer_ids_2 200 NOTYPE prod-b prod-c prod-d prod-e prod-f
-fi
+ics_api_edp_get_producer_ids_2 200 NOTYPE prod-b prod-c prod-d prod-e prod-f
ics_api_edp_get_producer_status 404 prod-a
@@ -1186,19 +817,11 @@
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
- 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
- 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
+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
if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then
cr_equal 0 received_callbacks 14 30
@@ -1218,11 +841,7 @@
ics_api_edp_get_producer_status 200 prod-e DISABLED 1000
-if [ $ICS_VERSION == "V1-1" ]; then
- ics_api_edp_get_producer_ids 200 prod-b prod-c prod-d prod-e prod-f
-else
- ics_api_edp_get_producer_ids_2 200 NOTYPE prod-b prod-c prod-d prod-e prod-f
-fi
+ics_api_edp_get_producer_ids_2 200 NOTYPE prod-b prod-c prod-d prod-e prod-f
ics_api_edp_get_producer_status 404 prod-a
ics_api_edp_get_producer_status 200 prod-b ENABLED
@@ -1231,69 +850,37 @@
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
- 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
- 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
+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
#Disable create for job10 in prod-e
prodstub_arm_job_create 200 prod-e job10 400
#Update tjob 10 - only prod-f will be updated
-if [ -z "$FLAT_A1_EI" ]; then
- ics_api_a1_put_job 200 type6 job10 $TARGET10 ricsim_g3_4 testdata/ics/job-template2.json
-else
- ics_api_a1_put_job 200 job10 type6 $TARGET10 ricsim_g3_4 $STATUS10 testdata/ics/job-template2.json
-fi
+ics_api_a1_put_job 200 job10 type6 $TARGET10 ricsim_g3_4 $STATUS10 testdata/ics/job-template2.json
#Reset producer and job responses
prodstub_arm_producer 200 prod-e 200
prodstub_arm_job_create 200 prod-e job10 200
ics_api_edp_get_producer_status 200 prod-e ENABLED 360
-if [ $ICS_VERSION == "V1-1" ]; then
- ics_api_edp_get_producer_ids 200 prod-b prod-c prod-d prod-e prod-f
-else
- ics_api_edp_get_producer_ids_2 200 NOTYPE prod-b prod-c prod-d prod-e prod-f
-fi
+ics_api_edp_get_producer_ids_2 200 NOTYPE prod-b prod-c prod-d prod-e prod-f
#Wait for job to be updated
sleep_wait 120
-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 [[ "$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/ics/job-template2.json
- fi
-fi
+prodstub_check_jobdata_3 200 prod-f job10 type6 $TARGET10 ricsim_g3_4 testdata/ics/job-template2.json
prodstub_arm_producer 200 prod-f 400
ics_api_edp_get_producer_status 200 prod-f DISABLED 360
-if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
- ics_equal json:data-producer/v1/info-producers 4 1000
-else
- ics_equal json:ei-producer/v1/eiproducers 4 1000
-fi
+ics_equal json:data-producer/v1/info-producers 4 1000
-if [ $ICS_VERSION == "V1-1" ]; then
- ics_api_edp_get_producer_ids 200 prod-b prod-c prod-d prod-e
-else
- ics_api_edp_get_producer_ids_2 200 NOTYPE prod-b prod-c prod-d prod-e
-fi
+ics_api_edp_get_producer_ids_2 200 NOTYPE prod-b prod-c prod-d prod-e
ics_api_edp_get_producer_status 404 prod-a
ics_api_edp_get_producer_status 200 prod-b ENABLED
@@ -1302,19 +889,11 @@
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
- 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
- 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
+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
if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then
cr_equal 0 received_callbacks 14 30
@@ -1323,21 +902,6 @@
fi
-if [[ "$ICS_FEATURE_LEVEL" != *"INFO-TYPES"* ]]; then
-
- # End test if info types is not impl in tested version
- check_ics_logs
-
- store_logs END
-
- #### TEST COMPLETE ####
-
- print_result
-
- auto_clean_environment
-fi
-
-
############################################
# Test of info types
############################################
@@ -1863,11 +1427,7 @@
ics_api_idc_get_job_status2 200 job110 ENABLED 2 prod-ie prod-if
# Wait for producer prod-ia to be removed
-if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
- ics_equal json:data-producer/v1/info-producers 9 1000
-else
- ics_equal json:ei-producer/v1/eiproducers 9 1000
-fi
+ics_equal json:data-producer/v1/info-producers 9 1000
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
@@ -1945,11 +1505,7 @@
ics_api_edp_get_producer_status 200 prod-if DISABLED 360
-if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
- ics_equal json:data-producer/v1/info-producers 8 1000
-else
- ics_equal json:ei-producer/v1/eiproducers 8 1000
-fi
+ics_equal json:data-producer/v1/info-producers 8 1000
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
diff --git a/test/auto-test/FTC150.sh b/test/auto-test/FTC150.sh
index a0110d9..f30f3e9 100755
--- a/test/auto-test/FTC150.sh
+++ b/test/auto-test/FTC150.sh
@@ -1,7 +1,7 @@
#!/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.
@@ -43,7 +43,7 @@
#### TEST BEGIN ####
-generate_policy_uuid
+sim_generate_policy_uuid
#Test a1pms and simulator protocol versions (others are http only)
NB_TESTED_PROTOCOLS="HTTP HTTPS"
@@ -68,16 +68,23 @@
start_ric_simulators ricsim_g2 1 STD_1.1.3
start_ric_simulators ricsim_g3 1 STD_2.0.0
- start_sdnc
if [ $__nb_httpx == "HTTPS" ]; then
# "Using secure ports towards SDNC"
- use_sdnc_https
+ if [[ "$SDNC_FEATURE_LEVEL" == *"NO_NB_HTTPS"* ]]; then
+ deviation "SDNC does not support NB https"
+ use_sdnc_http
+ else
+ use_sdnc_https
+ fi
else
#"Using non-secure ports towards SDNC"
use_sdnc_http
fi
+ start_sdnc
+ controller_api_wait_for_status_ok 200 ricsim_g1_1
+
if [ $__sb_httpx == "HTTPS" ]; then
# "Using secure ports towards SDNC"
use_simulator_https
diff --git a/test/auto-test/FTC1800.sh b/test/auto-test/FTC1800.sh
index 8447049..d6215c7 100755
--- a/test/auto-test/FTC1800.sh
+++ b/test/auto-test/FTC1800.sh
@@ -1,7 +1,7 @@
#!/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.
@@ -44,8 +44,6 @@
#### TEST BEGIN ####
-FLAT_A1_EI="1"
-
clean_environment
start_kube_proxy
@@ -72,12 +70,7 @@
CB_SV="$PROD_STUB_SERVICE_PATH$PROD_STUB_SUPERVISION_CALLBACK"
TARGET="http://localhost:80/target" # Dummy target
-NUM_JOBS=10000
-use_info_jobs=false #Set flag if interface supporting info-types is used
-if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
- use_info_jobs=true
- NUM_JOBS=5000 # 5K ei jobs and 5K info jobs
-fi
+NUM_JOBS=5000 # 5K ei jobs and 5K info jobs
if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then
#Type registration status callbacks
@@ -134,129 +127,110 @@
fi
done
-if [ $use_info_jobs ]; then
- 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_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-a type101
- prodstub_arm_type 200 prod-b type101
- prodstub_arm_type 200 prod-b type102
+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-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
+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
-fi
-
-
-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 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
-
- 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
-
- 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
-
- 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
-
- ics_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-c $CB_JOB/prod-c $CB_SV/prod-c type1 type2 type3
-
- ics_api_edp_put_producer_2 201 prod-d $CB_JOB/prod-d $CB_SV/prod-d type4 type5
-
- if [ $use_info_jobs ]; then
- 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 [[ "$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
+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
+
+ics_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-c $CB_JOB/prod-c $CB_SV/prod-c type1 type2 type3
+
+ics_api_edp_put_producer_2 201 prod-d $CB_JOB/prod-d $CB_SV/prod-d type4 type5
+
+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 [[ "$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
-if [ $use_info_jobs ]; then
- ics_equal json:data-producer/v1/info-producers 4
-else
- ics_equal json:ei-producer/v1/eiproducers 4
-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
@@ -267,86 +241,46 @@
do
if [ $(($i%5)) -eq 0 ]; then
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
- if [ -z "$FLAT_A1_EI" ]; then
- ics_api_a1_get_job_status 200 type1 job$i ENABLED
- else
- ics_api_a1_get_job_status 200 job$i ENABLED 120
- fi
- if [ $use_info_jobs ]; then
- 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
+ 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
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
- if [ -z "$FLAT_A1_EI" ]; then
- ics_api_a1_get_job_status 200 type2 job$i ENABLED
- else
- ics_api_a1_get_job_status 200 job$i ENABLED 120
- fi
- if [ $use_info_jobs ]; then
- 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
+ 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
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
- if [ -z "$FLAT_A1_EI" ]; then
- ics_api_a1_get_job_status 200 type3 job$i ENABLED
- else
- ics_api_a1_get_job_status 200 job$i ENABLED 120
- fi
- if [ $use_info_jobs ]; then
- 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
+ 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
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
- if [ -z "$FLAT_A1_EI" ]; then
- ics_api_a1_get_job_status 200 type4 job$i ENABLED
- else
- ics_api_a1_get_job_status 200 job$i ENABLED 120
- fi
- if [ $use_info_jobs ]; then
- 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
+ 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
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
- if [ -z "$FLAT_A1_EI" ]; then
- ics_api_a1_get_job_status 200 type5 job$i ENABLED
- else
- ics_api_a1_get_job_status 200 job$i ENABLED 120
- fi
- if [ $use_info_jobs ]; then
- 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
+ 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
- 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
- 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
- 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
+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
@@ -364,11 +298,7 @@
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
- ics_equal json:data-producer/v1/info-types 10 1000
- else
- ics_equal json:ei-producer/v1/eitypes 5 1000
- fi
+ ics_equal json:data-producer/v1/info-types 10 1000
fi
@@ -387,11 +317,7 @@
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
- ics_equal json:data-producer/v1/info-types 10 1000
- else
- ics_equal json:ei-producer/v1/eitypes 5 1000
- fi
+ ics_equal json:data-producer/v1/info-types 10 1000
fi
cr_equal 0 received_callbacks 0
@@ -402,37 +328,27 @@
prodstub_delete_jobdata 204 prod-a job$i
prodstub_delete_jobdata 204 prod-b job$i
prodstub_delete_jobdata 204 prod-c job$i
- if [ $use_info_jobs ]; then
- 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
+ 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
- if [ $use_info_jobs ]; then
- prodstub_delete_jobdata 204 prod-b job$(($i+$NUM_JOBS))
- prodstub_delete_jobdata 204 prod-c job$(($i+$NUM_JOBS))
- fi
+ 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
- if [ $use_info_jobs ]; then
- prodstub_delete_jobdata 204 prod-c job$(($i+$NUM_JOBS))
- fi
+ 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
- if [ $use_info_jobs ]; then
- prodstub_delete_jobdata 204 prod-d job$(($i+$NUM_JOBS))
- fi
+ 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
- if [ $use_info_jobs ]; then
- prodstub_delete_jobdata 204 prod-d job$(($i+$NUM_JOBS))
- fi
+ prodstub_delete_jobdata 204 prod-d job$(($i+$NUM_JOBS))
fi
done
@@ -444,93 +360,36 @@
for ((i=1; i<=$NUM_JOBS; i++))
do
if [ $(($i%5)) -eq 0 ]; then
- if [ -z "$FLAT_A1_EI" ]; then
- ics_api_a1_get_job_status 200 type1 job$i DISABLED
- else
- ics_api_a1_get_job_status 200 job$i DISABLED 120
- fi
- if [ $use_info_jobs ]; then
- ics_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) DISABLED EMPTYPROD 120
- 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
- ics_api_a1_get_job_status 200 type2 job$i DISABLED
- else
- ics_api_a1_get_job_status 200 job$i DISABLED 120
- fi
- if [ $use_info_jobs ]; then
- ics_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) DISABLED EMPTYPROD 120
- 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
- ics_api_a1_get_job_status 200 type3 job$i DISABLED
- else
- ics_api_a1_get_job_status 200 job$i DISABLED 120
- fi
- if [ $use_info_jobs ]; then
- ics_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) DISABLED EMPTYPROD 120
- 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
- ics_api_a1_get_job_status 200 type4 job$i DISABLED
- else
- ics_api_a1_get_job_status 200 job$i DISABLED 120
- fi
- if [ $use_info_jobs ]; then
- ics_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) DISABLED EMPTYPROD 120
- 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
- ics_api_a1_get_job_status 200 type5 job$i DISABLED
- else
- ics_api_a1_get_job_status 200 job$i DISABLED 120
- fi
- if [ $use_info_jobs ]; then
- ics_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) DISABLED EMPTYPROD 120
- 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
-if [ $ICS_VERSION == "V1-1" ]; then
+ics_api_edp_put_producer_2 201 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 type101
- 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_2 201 prod-b $CB_JOB/prod-b $CB_SV/prod-b type1 type2 type101 type102
- 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
+ics_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 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
+ics_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 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
- ics_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-b $CB_JOB/prod-b $CB_SV/prod-b type1 type2 type101 type102
-
- ics_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-d $CB_JOB/prod-d $CB_SV/prod-d type4 type5 type104 type105
- else
- ics_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-b $CB_JOB/prod-b $CB_SV/prod-b type1 type2
-
- ics_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-d $CB_JOB/prod-d $CB_SV/prod-d type4 type5
- fi
-
-fi
-
-if [ $use_info_jobs ]; then
- ics_equal json:data-producer/v1/info-producers 4
-else
- ics_equal json:ei-producer/v1/eiproducers 4
-fi
+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
@@ -540,164 +399,68 @@
for ((i=1; i<=$NUM_JOBS; i++))
do
if [ $(($i%5)) -eq 0 ]; then
- if [ -z "$FLAT_A1_EI" ]; then
- ics_api_a1_get_job_status 200 type1 job$i ENABLED
- else
- ics_api_a1_get_job_status 200 job$i ENABLED 120
- fi
- if [ $use_info_jobs ]; then
- ics_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) ENABLED 3 prod-a prod-b prod-c 120
- 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
- ics_api_a1_get_job_status 200 type2 job$i ENABLED
- else
- ics_api_a1_get_job_status 200 job$i ENABLED 120
- fi
- if [ $use_info_jobs ]; then
- ics_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) ENABLED 2 prod-b prod-c 120
- 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
- ics_api_a1_get_job_status 200 type3 job$i ENABLED
- else
- ics_api_a1_get_job_status 200 job$i ENABLED 120
- fi
- if [ $use_info_jobs ]; then
- ics_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) ENABLED 1 prod-c 120
- 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
- ics_api_a1_get_job_status 200 type4 job$i ENABLED
- else
- ics_api_a1_get_job_status 200 job$i ENABLED 120
- fi
- if [ $use_info_jobs ]; then
- ics_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) ENABLED 1 prod-d 120
- 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
- ics_api_a1_get_job_status 200 type5 job$i ENABLED
- else
- ics_api_a1_get_job_status 200 job$i ENABLED 120
- fi
- if [ $use_info_jobs ]; then
- ics_api_idc_get_job_status2 200 job$(($i+$NUM_JOBS)) ENABLED 1 prod-d 120
- 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
- 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
- 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
+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))
-if [ $use_info_jobs ]; then
- 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
+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
- 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/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/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/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
+ 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
- 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/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/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/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
+ 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
- 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/ics/job-template.json
- else
- 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/ics/job-template.json
- fi
+ 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
- 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/ics/job-template.json
- else
- 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/ics/job-template.json
- fi
+ 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
- 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/ics/job-template.json
- else
- 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/ics/job-template.json
- fi
+ 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
@@ -706,77 +469,51 @@
do
if [ $(($i%5)) -eq 0 ]; then
ics_api_a1_delete_job 204 job$i
- if [ $use_info_jobs ]; then
- ics_api_idc_delete_job 204 job$(($i+$NUM_JOBS))
- fi
+ ics_api_idc_delete_job 204 job$(($i+$NUM_JOBS))
fi
if [ $(($i%5)) -eq 1 ]; then
ics_api_a1_delete_job 204 job$i
- if [ $use_info_jobs ]; then
- ics_api_idc_delete_job 204 job$(($i+$NUM_JOBS))
- fi
+ ics_api_idc_delete_job 204 job$(($i+$NUM_JOBS))
fi
if [ $(($i%5)) -eq 2 ]; then
ics_api_a1_delete_job 204 job$i
- if [ $use_info_jobs ]; then
- ics_api_idc_delete_job 204 job$(($i+$NUM_JOBS))
- fi
+ ics_api_idc_delete_job 204 job$(($i+$NUM_JOBS))
fi
if [ $(($i%5)) -eq 3 ]; then
ics_api_a1_delete_job 204 job$i
- if [ $use_info_jobs ]; then
- ics_api_idc_delete_job 204 job$(($i+$NUM_JOBS))
- fi
+ ics_api_idc_delete_job 204 job$(($i+$NUM_JOBS))
fi
if [ $(($i%5)) -eq 4 ]; then
ics_api_a1_delete_job 204 job$i
- if [ $use_info_jobs ]; then
- ics_api_idc_delete_job 204 job$(($i+$NUM_JOBS))
- fi
+ ics_api_idc_delete_job 204 job$(($i+$NUM_JOBS))
fi
done
-if [ $use_info_jobs ]; then
- ics_equal json:data-producer/v1/info-producers 4
-else
- ics_equal json:ei-producer/v1/eiproducers 4
-fi
+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
-if [ -z "$FLAT_A1_EI" ]; then
- 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
- 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
+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
-if [ $use_info_jobs ]; then
- 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
+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 [ $use_info_jobs ]; then
- 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
+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
if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then
diff --git a/test/auto-test/FTC1_A1PMS_ADAPTER.sh b/test/auto-test/FTC1_A1PMS_ADAPTER.sh
new file mode 100755
index 0000000..9228ee7
--- /dev/null
+++ b/test/auto-test/FTC1_A1PMS_ADAPTER.sh
@@ -0,0 +1,233 @@
+#!/bin/bash
+
+# ============LICENSE_START===============================================
+# Copyright (C) 2020 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=================================================
+#
+
+
+TC_ONELINE_DESCR="Sanity test, create service and then create,update and delete a policy with A1PMS adapter using http/https and A1PMS REST with/without SDNC controller"
+
+#App names to include in the test when running docker, space separated list
+DOCKER_INCLUDED_IMAGES="CP CR A1PMS RICSIM SDNC NGW KUBEPROXY"
+
+#App names to include in the test when running kubernetes, space separated list
+KUBE_INCLUDED_IMAGES="CP CR A1PMS RICSIM SDNC NGW KUBEPROXY "
+#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list
+KUBE_PRESTARTED_IMAGES=""
+
+#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="ORAN-H-RELEASE ONAP-LONDON"
+#Supported run modes
+SUPPORTED_RUNMODES="DOCKER KUBE"
+
+. ../common/testcase_common.sh $@
+
+setup_testenvironment
+
+#### TEST BEGIN ####
+
+sim_generate_policy_uuid
+
+# Tested variants of REST/DMAAP/SDNC config
+TESTED_VARIANTS="REST REST+SDNC"
+
+#Test a1pms and simulator protocol versions (others are http only)
+TESTED_PROTOCOLS="HTTP HTTPS"
+for __httpx in $TESTED_PROTOCOLS ; do
+ for interface in $TESTED_VARIANTS ; do
+
+ echo "#####################################################################"
+ echo "#####################################################################"
+ echo "### Testing a1pms: $interface using $__httpx"
+ echo "#####################################################################"
+ echo "#####################################################################"
+
+ clean_environment
+
+ start_kube_proxy
+
+ if [ $__httpx == "HTTPS" ]; then
+ use_a1pms_rest_https
+ else
+ use_a1pms_rest_http
+ fi
+
+ start_a1pms NORPOXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE
+
+ set_a1pms_trace
+
+ # Create service to be able to receive events when rics becomes available
+ # Must use rest towards the a1pms since dmaap is not configured yet
+ a1pms_api_put_service 201 "ric-registration" 0 "$CR_SERVICE_APP_PATH_0/ric-registration"
+
+ if [ $__httpx == "HTTPS" ]; then
+ use_cr_https
+ use_simulator_https
+ if [[ $interface = *"SDNC"* ]]; then
+ if [[ "$SDNC_FEATURE_LEVEL" == *"NO_NB_HTTPS"* ]]; then
+ deviation "SDNC does not support NB https"
+ use_sdnc_http
+ else
+ use_sdnc_https
+ fi
+ fi
+ use_a1pms_rest_https
+ else
+ use_cr_http
+ use_simulator_http
+ if [[ $interface = *"SDNC"* ]]; then
+ use_sdnc_http
+ fi
+ use_a1pms_rest_http
+ fi
+
+ start_ric_simulators ricsim_g1 1 STD_2.0.0
+ start_ric_simulators ricsim_g2 1 STD_2.0.0 #APMS will use adapter class towards this sim
+
+ start_cr 1
+
+ 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
+
+ if [ -z "$A1PMS_ADAPTER_CLASS" ]; then
+ echo -e $RED"Env var A1PMS_ADAPTER_CLASS must be set with override file"$ERED
+ exit 1
+ fi
+ if [[ $interface = *"SDNC"* ]]; then
+ start_sdnc
+ controller_api_wait_for_status_ok 200 ricsim_g1_1
+ prepare_a1pms_config SDNC ".a1pms_config.json" ricsim-g2 $A1PMS_ADAPTER_CLASS
+ else
+ prepare_a1pms_config NOSDNC ".a1pms_config.json" ricsim-g2 $A1PMS_ADAPTER_CLASS
+ fi
+
+ if [ $RUNMODE == "KUBE" ]; then
+ a1pms_load_config ".a1pms_config.json"
+ else
+ #Temporary switch to http/https if dmaap use. Otherwise it is not possibble to push config
+ if [ $__httpx == "HTTPS" ]; then
+ use_a1pms_rest_https
+ else
+ use_a1pms_rest_http
+ fi
+ a1pms_api_put_configuration 200 ".a1pms_config.json"
+ if [ $__httpx == "HTTPS" ]; then
+ use_a1pms_rest_https
+ else
+ use_a1pms_rest_http
+ fi
+ fi
+
+ sim_put_policy_type 201 ricsim_g1_1 STD_QOS_0_2_0 testdata/STD2/sim_qos.json
+ sim_put_policy_type 201 ricsim_g2_1 $A1PMS_ADAPTER_POLICY_NAME testdata/STD2/sim_qos.json
+
+ a1pms_equal json:rics 2 300
+
+ a1pms_equal json:policy-types 2 120
+
+ a1pms_equal json:policies 0
+
+ a1pms_equal json:policy-instances 0
+
+ cr_equal 0 received_callbacks 2 120
+
+ cr_api_check_all_sync_events 200 0 ric-registration ricsim_g1_1 ricsim_g2_1
+
+ echo "############################################"
+ echo "############## Health check ################"
+ echo "############################################"
+
+ sleep_wait 120 "Let A1PMS cofiguration take effect"
+
+ a1pms_api_get_status 200
+
+ echo "############################################"
+ echo "##### Service registry and supervision #####"
+ echo "############################################"
+
+ a1pms_api_put_service 201 "serv1" 1000 "$CR_SERVICE_APP_PATH_0/1"
+
+ a1pms_api_get_service_ids 200 "serv1" "ric-registration"
+
+ a1pms_api_put_services_keepalive 200 "serv1"
+
+ echo "############################################"
+ echo "############## RIC Repository ##############"
+ echo "############################################"
+
+ a1pms_api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:STD_QOS_0_2_0:AVAILABLE ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:$A1PMS_ADAPTER_POLICY_NAME:AVAILABLE"
+
+ echo "############################################"
+ echo "########### A1 Policy Management ###########"
+ echo "############################################"
+
+ notificationurl=$CR_SERVICE_APP_PATH_0"/test"
+
+ a1pms_api_put_policy 201 "serv1" ricsim_g1_1 STD_QOS_0_2_0 5000 true $notificationurl testdata/STD2/pi_qos_template.json
+ a1pms_api_put_policy 200 "serv1" ricsim_g1_1 STD_QOS_0_2_0 5000 true $notificationurl testdata/STD2/pi_qos_template.json
+
+ a1pms_api_put_policy 201 "serv1" ricsim_g2_1 $A1PMS_ADAPTER_POLICY_NAME 5100 true $notificationurl testdata/STD2/pi_qos_template.json
+ a1pms_api_put_policy 200 "serv1" ricsim_g2_1 $A1PMS_ADAPTER_POLICY_NAME 5100 true $notificationurl testdata/STD2/pi_qos_template.json
+
+ a1pms_equal json:policies 2
+
+ a1pms_api_delete_policy 204 5000
+
+ a1pms_api_delete_policy 204 5100
+
+ a1pms_equal json:policies 0
+
+ a1pms_equal json:policy-instances 0
+
+ cr_equal 0 received_callbacks 2
+
+
+ if [[ $interface = *"SDNC"* ]]; then
+ sim_contains_str ricsim_g1_1 remote_hosts $SDNC_APP_NAME
+ # Adatper does not go through SDNC
+ sim_contains_str ricsim_g2_1 remote_hosts $A1PMS_APP_NAME
+ else
+ sim_contains_str ricsim_g1_1 remote_hosts $A1PMS_APP_NAME
+ sim_contains_str ricsim_g2_1 remote_hosts $A1PMS_APP_NAME
+ fi
+
+ check_a1pms_logs
+
+
+ if [[ $interface = *"SDNC"* ]]; then
+ check_sdnc_logs
+ fi
+
+ store_logs "${__httpx}__${interface}"
+
+ done
+
+done
+
+#### TEST COMPLETE ####
+
+
+print_result
+
+auto_clean_environment
diff --git a/test/auto-test/FTC1_RICMEDIATOR.sh b/test/auto-test/FTC1_RICMEDIATOR.sh
new file mode 100755
index 0000000..e34d8aa
--- /dev/null
+++ b/test/auto-test/FTC1_RICMEDIATOR.sh
@@ -0,0 +1,248 @@
+#!/bin/bash
+
+# ============LICENSE_START===============================================
+# Copyright (C) 2020 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=================================================
+#
+
+
+TC_ONELINE_DESCR="Sanity test, create service and then create,update and delete a policy using http/https and A1PMS REST with/without SDNC controller"
+
+#App names to include in the test when running docker, space separated list
+DOCKER_INCLUDED_IMAGES="CP CR A1PMS RICSIM RICMEDIATORSIM SDNC NGW KUBEPROXY"
+
+#App names to include in the test when running kubernetes, space separated list
+KUBE_INCLUDED_IMAGES="CP CR A1PMS RICSIM RICMEDIATORSIM SDNC NGW KUBEPROXY "
+#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list
+KUBE_PRESTARTED_IMAGES=""
+
+#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="ORAN-H-RELEASE"
+#Supported run modes
+SUPPORTED_RUNMODES="DOCKER KUBE"
+
+. ../common/testcase_common.sh $@
+
+setup_testenvironment
+
+#### TEST BEGIN ####
+
+sim_generate_policy_uuid
+
+# Tested variants of REST/DMAAP/SDNC config
+TESTED_VARIANTS="REST REST+SDNC"
+
+#Test a1pms and simulator protocol versions (others are http only)
+TESTED_PROTOCOLS="HTTP HTTPS"
+for __httpx in $TESTED_PROTOCOLS ; do
+ for interface in $TESTED_VARIANTS ; do
+
+ echo "#####################################################################"
+ echo "#####################################################################"
+ echo "### Testing a1pms: $interface using $__httpx"
+ echo "#####################################################################"
+ echo "#####################################################################"
+
+ clean_environment
+
+ start_kube_proxy
+
+ if [ $__httpx == "HTTPS" ]; then
+ use_a1pms_rest_https
+ use_ricmediator_simulator_http
+ else
+ use_a1pms_rest_http
+ use_ricmediator_simulator_http
+ fi
+
+ start_a1pms NORPOXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE
+
+ set_a1pms_trace
+
+ # Create service to be able to receive events when rics becomes available
+ # Must use rest towards the a1pms since dmaap is not configured yet
+ a1pms_api_put_service 201 "ric-registration" 0 "$CR_SERVICE_APP_PATH_0/ric-registration"
+
+ if [ $__httpx == "HTTPS" ]; then
+ use_cr_https
+ use_simulator_https
+ use_ricmediator_simulator_http
+ if [[ $interface = *"SDNC"* ]]; then
+ if [[ "$SDNC_FEATURE_LEVEL" == *"NO_NB_HTTPS"* ]]; then
+ deviation "SDNC does not support NB https"
+ use_sdnc_http
+ else
+ use_sdnc_https
+ fi
+ fi
+ use_a1pms_rest_https
+ else
+ use_cr_http
+ use_simulator_http
+ use_ricmediator_simulator_http
+ if [[ $interface = *"SDNC"* ]]; then
+ use_sdnc_http
+ fi
+ if [[ $interface = *"DMAAP"* ]]; then
+ use_a1pms_dmaap_http
+ else
+ use_a1pms_rest_http
+ fi
+ fi
+
+ start_ric_simulators ricsim_g1 1 OSC_2.1.0
+ start_ric_simulators ricsim_g2 1 STD_1.1.3
+ start_ric_simulators ricsim_g3 1 STD_2.0.0
+ start_ricmediator_simulators ricsim_g4 1 NONE
+
+ start_cr 1
+
+ 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
+
+
+ if [[ $interface = *"SDNC"* ]]; then
+ start_sdnc
+ controller_api_wait_for_status_ok 200 ricsim_g1_1
+ prepare_a1pms_config SDNC ".a1pms_config.json"
+ else
+ prepare_a1pms_config NOSDNC ".a1pms_config.json"
+ fi
+
+ if [ $RUNMODE == "KUBE" ]; then
+ a1pms_load_config ".a1pms_config.json"
+ else
+ #Temporary switch to http/https if dmaap use. Otherwise it is not possibble to push config
+ if [ $__httpx == "HTTPS" ]; then
+ use_a1pms_rest_https
+ else
+ use_a1pms_rest_http
+ fi
+ a1pms_api_put_configuration 200 ".a1pms_config.json"
+ if [ $__httpx == "HTTPS" ]; then
+ use_a1pms_rest_https
+ else
+ use_a1pms_rest_http
+ fi
+ fi
+
+ sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json
+
+ sim_put_policy_type 201 ricsim_g3_1 STD_QOS_0_2_0 testdata/STD2/sim_qos.json
+
+ ricmediatorsim_put_policy_type 201 ricsim_g4_1 1 testdata/OSC/sim_1.json
+
+ a1pms_equal json:rics 4 300
+
+ a1pms_equal json:policy-types 3 120
+
+ a1pms_equal json:policies 0
+
+ a1pms_equal json:policy-instances 0
+
+ cr_equal 0 received_callbacks 4 120
+
+ cr_api_check_all_sync_events 200 0 ric-registration ricsim_g1_1 ricsim_g2_1 ricsim_g3_1 ricsim_g4_1
+
+ echo "############################################"
+ echo "############## Health check ################"
+ echo "############################################"
+
+ sleep_wait 120 "Let A1PMS cofiguration take effect"
+
+ a1pms_api_get_status 200
+
+ echo "############################################"
+ echo "##### Service registry and supervision #####"
+ echo "############################################"
+
+ a1pms_api_put_service 201 "serv1" 1000 "$CR_SERVICE_APP_PATH_0/1"
+
+ a1pms_api_get_service_ids 200 "serv1" "ric-registration"
+
+ a1pms_api_put_services_keepalive 200 "serv1"
+
+ echo "############################################"
+ echo "############## RIC Repository ##############"
+ echo "############################################"
+
+ a1pms_api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1:AVAILABLE ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:EMPTYTYPE:AVAILABLE ricsim_g3_1:me1_ricsim_g3_1,me2_ricsim_g3_1:STD_QOS_0_2_0:AVAILABLE ricsim_g4_1:me1_ricsim_g4_1,me2_ricsim_g4_1:1:AVAILABLE "
+
+ echo "############################################"
+ echo "########### A1 Policy Management ###########"
+ echo "############################################"
+
+ notificationurl=$CR_SERVICE_APP_PATH_0"/test"
+ a1pms_api_put_policy 201 "serv1" ricsim_g1_1 1 5000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json
+ a1pms_api_put_policy 200 "serv1" ricsim_g1_1 1 5000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json
+ a1pms_api_put_policy 201 "serv1" ricsim_g3_1 STD_QOS_0_2_0 5200 true $notificationurl testdata/STD2/pi_qos_template.json
+ a1pms_api_put_policy 200 "serv1" ricsim_g3_1 STD_QOS_0_2_0 5200 true $notificationurl testdata/STD2/pi_qos_template.json
+ a1pms_api_put_policy 201 "serv1" ricsim_g4_1 1 5300 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json
+ a1pms_api_put_policy 200 "serv1" ricsim_g4_1 1 5300 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json
+
+ a1pms_api_put_policy 201 "serv1" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json
+ a1pms_api_put_policy 200 "serv1" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json
+
+ a1pms_equal json:policies 4
+
+ a1pms_api_delete_policy 204 5000
+
+ a1pms_api_delete_policy 204 5100
+
+ a1pms_api_delete_policy 204 5200
+
+ a1pms_api_delete_policy 204 5300
+
+ a1pms_equal json:policies 0
+
+ a1pms_equal json:policy-instances 0
+
+ cr_equal 0 received_callbacks 4
+
+ if [[ $interface = *"SDNC"* ]]; then
+ sim_contains_str ricsim_g2_1 remote_hosts $SDNC_APP_NAME
+ sim_contains_str ricsim_g3_1 remote_hosts $SDNC_APP_NAME
+ else
+ sim_contains_str ricsim_g2_1 remote_hosts $A1PMS_APP_NAME
+ sim_contains_str ricsim_g3_1 remote_hosts $A1PMS_APP_NAME
+ fi
+
+ check_a1pms_logs
+
+
+ if [[ $interface = *"SDNC"* ]]; then
+ check_sdnc_logs
+ fi
+
+ store_logs "${__httpx}__${interface}"
+
+ done
+
+done
+
+#### TEST COMPLETE ####
+
+
+print_result
+
+auto_clean_environment
diff --git a/test/auto-test/FTC2001.sh b/test/auto-test/FTC2001.sh
index 3b53e8e..d94b3d7 100755
--- a/test/auto-test/FTC2001.sh
+++ b/test/auto-test/FTC2001.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env 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.
@@ -64,7 +64,11 @@
start_ric_simulators $RIC_SIM_PREFIX"_g3" $STD_NUM_RICS STD_2.0.0
-start_mr #Just to prevent errors in the a1pms log...
+if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ :
+else
+ start_mr #Just to prevent errors in the a1pms log...
+fi
start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE
@@ -133,9 +137,9 @@
# Create policies in STD
for ((i=1; i<=$STD_NUM_RICS; i++))
do
- generate_policy_uuid
+ sim_generate_policy_uuid
a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g3_"$i STD_QOS_0_2_0 $((2300+$i)) NOTRANSIENT $notificationurl demo-testdata/STD2/pi1_template.json 1
- generate_policy_uuid
+ sim_generate_policy_uuid
a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g3_"$i 'STD_QOS2_0.1.0' $((2400+$i)) NOTRANSIENT $notificationurl demo-testdata/STD2/pi1_template.json 1
done
@@ -153,7 +157,6 @@
sim_contains_str $RIC_SIM_PREFIX"_g3_"$i remote_hosts proxy
done
-FLAT_A1_EI="1"
CB_JOB="$PROD_STUB_SERVICE_PATH$PROD_STUB_JOB_CALLBACK"
CB_SV="$PROD_STUB_SERVICE_PATH$PROD_STUB_SUPERVISION_CALLBACK"
@@ -187,59 +190,28 @@
fi
## Setup prod-a
-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_type_2 201 type1 testdata/ics/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
- ics_api_edp_put_type_2 201 type1 testdata/ics/ei-type-1.json
+ics_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
-
- ics_api_edp_get_producer_2 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1
-fi
+ics_api_edp_get_producer_2 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1
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
- ics_api_a1_put_job 201 type1 job1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json
-else
- ics_api_a1_put_job 201 job1 type1 $TARGET1 ricsim_g3_1 $STATUS1 testdata/ics/job-template.json
-fi
+ics_api_a1_put_job 201 job1 type1 $TARGET1 ricsim_g3_1 $STATUS1 testdata/ics/job-template.json
# Check the job data in the producer
-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 [[ "$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/ics/job-template.json
- fi
-fi
-
+prodstub_check_jobdata_3 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json
## Create a second job for prod-a
## job2 - prod-a
-if [ -z "$FLAT_A1_EI" ]; then
- ics_api_a1_put_job 201 type1 job2 $TARGET2 ricsim_g3_2 testdata/ics/job-template.json
-else
- ics_api_a1_put_job 201 job2 type1 $TARGET2 ricsim_g3_2 $STATUS2 testdata/ics/job-template.json
-fi
+ics_api_a1_put_job 201 job2 type1 $TARGET2 ricsim_g3_2 $STATUS2 testdata/ics/job-template.json
# Check the job data in the producer
-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 [[ "$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/ics/job-template.json
- fi
-fi
+prodstub_check_jobdata_3 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ics/job-template.json
# Arm producer prod-a for supervision failure
prodstub_arm_producer 200 prod-a 400
@@ -247,11 +219,7 @@
# Wait for producer prod-a to go disabled
ics_api_edp_get_producer_status 200 prod-a DISABLED 360
-if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
- ics_equal json:data-producer/v1/info-producers 0 1000
-else
- ics_equal json:ei-producer/v1/eiproducers 0 1000
-fi
+ics_equal json:data-producer/v1/info-producers 0 1000
if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then
cr_equal 0 received_callbacks 3 30
diff --git a/test/auto-test/FTC2002.sh b/test/auto-test/FTC2002.sh
index 3774b69..28afcf4 100755
--- a/test/auto-test/FTC2002.sh
+++ b/test/auto-test/FTC2002.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env 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.
@@ -42,7 +42,7 @@
#### TEST BEGIN ####
-generate_policy_uuid
+sim_generate_policy_uuid
#Test a1pms and simulator protocol versions (others are http only)
NB_TESTED_PROTOCOLS="HTTP HTTPS"
@@ -75,10 +75,16 @@
start_ric_simulators ricsim_g3 1 STD_2.0.0
start_sdnc
+ controller_api_wait_for_status_ok 200 ricsim_g1_1
if [ $__nb_httpx == "HTTPS" ]; then
# "Using secure ports towards SDNC"
- use_sdnc_https
+ if [[ "$SDNC_FEATURE_LEVEL" == *"NO_NB_HTTPS"* ]]; then
+ deviation "SDNC does not support NB https"
+ use_sdnc_http
+ else
+ use_sdnc_https
+ fi
else
#"Using non-secure ports towards SDNC"
use_sdnc_http
diff --git a/test/auto-test/FTC2003.sh b/test/auto-test/FTC2003.sh
index c98eeac..e4a8f79 100755
--- a/test/auto-test/FTC2003.sh
+++ b/test/auto-test/FTC2003.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env 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.
@@ -46,7 +46,6 @@
#Local vars in test script
##########################
-FLAT_A1_EI="1"
NUM_JOBS=10
clean_environment
@@ -72,11 +71,7 @@
set_dmaapadp_trace
-if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
- ics_equal json:data-producer/v1/info-producers 1 60
-else
- ics_equal json:ei-producer/v1/eiproducers 1 60
-fi
+ics_equal json:data-producer/v1/info-producers 1 60
ics_api_idc_get_job_ids 200 NOTYPE NOWNER EMPTY
ics_api_idc_get_type_ids 200 ExampleInformationType ExampleInformationTypeKafka
@@ -93,10 +88,14 @@
ics_api_edp_get_producer_ids_2 200 NOTYPE DmaapGenericInfoProducer
fi
-
+if [[ "$DMAAP_ADP_FEATURE_LEVEL" == *"FILTERSCHEMA"* ]]; then
+ _template_json=job-template1.1.json
+else
+ _template_json=job-template1.json
+fi
for ((i=1; i<=$NUM_JOBS; i++))
do
- 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-template1.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/$_template_json
done
for ((i=1; i<=$NUM_JOBS; i++))
diff --git a/test/auto-test/FTC300.sh b/test/auto-test/FTC300.sh
index b260c55..0e32eaf 100755
--- a/test/auto-test/FTC300.sh
+++ b/test/auto-test/FTC300.sh
@@ -1,7 +1,7 @@
#!/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.
@@ -43,10 +43,14 @@
#### TEST BEGIN ####
-generate_policy_uuid
+sim_generate_policy_uuid
# Tested variants of REST/DMAAP/SDNC config
-TESTED_VARIANTS="REST DMAAP REST+SDNC DMAAP+SDNC DMAAP_BATCH DMAAP_BATCH+SDNC"
+if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ TESTED_VARIANTS="REST REST+SDNC"
+else
+ TESTED_VARIANTS="REST DMAAP REST+SDNC DMAAP+SDNC DMAAP_BATCH DMAAP_BATCH+SDNC"
+fi
#Test a1pms and simulator protocol versions (others are http only)
TESTED_PROTOCOLS="HTTP HTTPS"
@@ -62,9 +66,18 @@
if [ $__httpx == "HTTPS" ]; then
use_cr_https
use_simulator_https
- use_mr_https
+ if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ :
+ else
+ use_mr_https
+ fi
if [[ $interface = *"SDNC"* ]]; then
- use_sdnc_https
+ if [[ "$SDNC_FEATURE_LEVEL" == *"NO_NB_HTTPS"* ]]; then
+ deviation "SDNC does not support NB https"
+ use_sdnc_http
+ else
+ use_sdnc_https
+ fi
fi
if [[ $interface = *"DMAAP"* ]]; then
use_a1pms_dmaap_https
@@ -74,7 +87,11 @@
else
use_cr_http
use_simulator_http
- use_mr_http
+ if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ :
+ else
+ use_mr_http
+ fi
if [[ $interface = *"SDNC"* ]]; then
use_sdnc_http
fi
@@ -96,7 +113,11 @@
start_ric_simulators ricsim_g3 4 STD_2.0.0
- start_mr
+ if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ :
+ else
+ start_mr
+ fi
start_cr 1
@@ -113,6 +134,7 @@
if [[ $interface = *"SDNC"* ]]; then
start_sdnc
+ controller_api_wait_for_status_ok 200 ricsim_g1_1
prepare_a1pms_config SDNC ".a1pms_config.json"
else
prepare_a1pms_config NOSDNC ".a1pms_config.json"
diff --git a/test/auto-test/FTC3000.sh b/test/auto-test/FTC3000.sh
index 2eb1d9f..db0f56d 100755
--- a/test/auto-test/FTC3000.sh
+++ b/test/auto-test/FTC3000.sh
@@ -46,7 +46,7 @@
#Local vars in test script
##########################
-FLAT_A1_EI="1"
+
NUM_CR=10 # Number of callback receivers, divide all callbacks to this number of servers - for load sharing
## Note: The number jobs must be a multiple of the number of CRs in order to calculate the number of expected event in each CR
NUM_JOBS=200 # Mediator and adapter gets same number of jobs for every type
@@ -448,7 +448,7 @@
#in one batch
#########################################################
-DATA_DELIV_JOBS=7 #Each job will eventuall get 5+2 msgs
+DATA_DELIV_JOBS=7 #Each job will eventually get 5+2 msgs
# Wait for data recetption, adapter
EXPECTED_DATA_DELIV=$(($NUM_JOBS*2/$NUM_CR+$EXPECTED_DATA_DELIV))
diff --git a/test/auto-test/FTC3001.sh b/test/auto-test/FTC3001.sh
index 7123665..1426d66 100755
--- a/test/auto-test/FTC3001.sh
+++ b/test/auto-test/FTC3001.sh
@@ -46,7 +46,7 @@
#Local vars in test script
##########################
-FLAT_A1_EI="1"
+
NUM_CR=1 # Number of callback receivers, max 1
## Note: The number jobs must be a multiple of the number of CRs in order to calculate the number of expected event in each CR
NUM_JOBS=100 # Mediator and adapter gets same number of jobs for every type
diff --git a/test/auto-test/FTC310.sh b/test/auto-test/FTC310.sh
index 6d024d7..1d451ca 100755
--- a/test/auto-test/FTC310.sh
+++ b/test/auto-test/FTC310.sh
@@ -1,7 +1,7 @@
#!/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.
@@ -39,7 +39,7 @@
#### TEST BEGIN ####
-generate_policy_uuid
+sim_generate_policy_uuid
# Clean container and start all needed containers #
clean_environment
@@ -59,7 +59,11 @@
start_ric_simulators ricsim_g2 1 STD_1.1.3
start_ric_simulators ricsim_g3 1 STD_2.0.0
-start_mr
+if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ :
+else
+ start_mr
+fi
start_cr 1
@@ -80,6 +84,7 @@
cr_api_check_all_sync_events 200 0 ric-registration ricsim_g1_1 ricsim_g2_1 ricsim_g3_1
# Add an STD RIC and check
+
start_ric_simulators ricsim_g2 2 STD_1.1.3
prepare_a1pms_config NOSDNC ".a1pms_config.json"
@@ -94,8 +99,7 @@
check_a1pms_logs
-
-# Remove one RIC RIC and check
+# Remove one RIC and check
start_ric_simulators ricsim_g2 1 STD_1.1.3
prepare_a1pms_config NOSDNC ".a1pms_config.json"
diff --git a/test/auto-test/FTC350.sh b/test/auto-test/FTC350.sh
index 2b677d0..f3fee12 100755
--- a/test/auto-test/FTC350.sh
+++ b/test/auto-test/FTC350.sh
@@ -1,7 +1,7 @@
#!/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.
@@ -43,7 +43,7 @@
#### TEST BEGIN ####
-generate_policy_uuid
+sim_generate_policy_uuid
use_cr_http
@@ -73,13 +73,17 @@
start_cr 1
- start_mr
-
+ if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ :
+ else
+ start_mr
+ fi
# Create first config
if [[ $interface = *"SDNC"* ]]; then
start_sdnc
+ controller_api_wait_for_status_ok 200 ricsim_g1_1
prepare_a1pms_config SDNC ".a1pms_config_initial.json"
else
prepare_a1pms_config NOSDNC ".a1pms_config_initial.json"
diff --git a/test/auto-test/FTC800.sh b/test/auto-test/FTC800.sh
index 1ecd5ff..d1ee766 100755
--- a/test/auto-test/FTC800.sh
+++ b/test/auto-test/FTC800.sh
@@ -1,7 +1,7 @@
#!/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.
@@ -17,7 +17,7 @@
# ============LICENSE_END=================================================
#
-TC_ONELINE_DESCR="Create 10000 policies in sequence using http/https and a1pms REST/DMAAP with/without SDNC controller"
+TC_ONELINE_DESCR="Create 10000 policies in sequence using http/https and a1pms REST with/without SDNC controller"
#App names to include in the test when running docker, space separated list
DOCKER_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM SDNC NGW KUBEPROXY"
@@ -43,14 +43,14 @@
#### TEST BEGIN ####
-generate_policy_uuid
+sim_generate_policy_uuid
#Local vars in test script
##########################
# Number of policies in each sequence
NUM_POLICIES=10000
-# Tested variants of REST/DMAAP/SDNC config
+# Tested variants of SDNC config
TESTED_VARIANTS="NOSDNC SDNC"
#Test a1pms and simulator protocol versions (others are http only)
@@ -88,7 +88,11 @@
start_ric_simulators ricsim_g2 1 STD_1.1.3
start_ric_simulators ricsim_g3 1 STD_2.0.0
- start_mr
+ if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ :
+ else
+ start_mr
+ fi
start_cr 1
@@ -102,7 +106,11 @@
set_a1pms_debug
- mr_equal requests_submitted 0
+ if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ :
+ else
+ mr_equal requests_submitted 0
+ fi
sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json
sim_put_policy_type 201 ricsim_g3_1 STD_QOS2_0.1.0 testdata/STD2/sim_qos2.json
@@ -110,6 +118,7 @@
if [[ $interface == "SDNC" ]]; then
start_sdnc
+ controller_api_wait_for_status_ok 200 ricsim_g1_1
prepare_a1pms_config SDNC ".a1pms_config.json"
else
prepare_a1pms_config NOSDNC ".a1pms_config.json"
@@ -160,65 +169,77 @@
sim_equal ricsim_g3_1 num_instances $NUM_POLICIES
- if [ $__httpx == "HTTPS" ]; then
- echo "Using secure ports towards dmaap"
- use_a1pms_dmaap_https
+ INTERFACE_VARIANT=
+ if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ INTERFACE_VARIANT=REST
+ if [ $__httpx == "HTTPS" ]; then
+ use_a1pms_rest_https
+ else
+ use_a1pms_rest_http
+ fi
else
- echo "Using non-secure ports towards dmaap"
- use_a1pms_dmaap_http
+ INTERFACE_VARIANT=DMAAP
+ if [ $__httpx == "HTTPS" ]; then
+ echo "Using secure ports towards dmaap"
+ use_a1pms_dmaap_https
+ else
+ echo "Using non-secure ports towards dmaap"
+ use_a1pms_dmaap_http
+ fi
fi
START_ID=$(($START_ID+$NUM_POLICIES))
- start_timer "Create polices in OSC via a1pms DMAAP, one by one, and $interface using "$__httpx
+ start_timer "Create polices in OSC via a1pms $INTERFACE_VARIANT, one by one, and $interface using "$__httpx
a1pms_api_put_policy 201 "serv1" ricsim_g1_1 1 $START_ID NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json $NUM_POLICIES
- print_timer "Create polices in OSC via a1pms DMAAP, one by one, and $interface using "$__httpx
+ print_timer "Create polices in OSC via a1pms $INTERFACE_VARIANT, one by one, and $interface using "$__httpx
sim_equal ricsim_g1_1 num_instances $((2*$NUM_POLICIES))
START_ID=$(($START_ID+$NUM_POLICIES))
- start_timer "Create polices in STD via a1pms DMAAP, one by one, and $interface using "$__httpx
+ start_timer "Create polices in STD via a1pms $INTERFACE_VARIANT, one by one, and $interface using "$__httpx
a1pms_api_put_policy 201 "serv1" ricsim_g2_1 NOTYPE $START_ID NOTRANSIENT $notificationurl testdata/STD/pi1_template.json $NUM_POLICIES
- print_timer "Create polices in STD via a1pms DMAAP, one by one, and $interface using "$__httpx
+ print_timer "Create polices in STD via a1pms $INTERFACE_VARIANT, one by one, and $interface using "$__httpx
sim_equal ricsim_g2_1 num_instances $((2*$NUM_POLICIES))
START_ID=$(($START_ID+$NUM_POLICIES))
- start_timer "Create polices in STD 2 via a1pms DMAAP, one by one, and $interface using "$__httpx
+ start_timer "Create polices in STD 2 via a1pms $INTERFACE_VARIANT, one by one, and $interface using "$__httpx
a1pms_api_put_policy 201 "serv1" ricsim_g3_1 STD_QOS2_0.1.0 $START_ID NOTRANSIENT $notificationurl testdata/STD2/pi_qos2_template.json $NUM_POLICIES
- print_timer "Create polices in STD via a1pms DMAAP, one by one, and $interface using "$__httpx
+ print_timer "Create polices in STD via a1pms $INTERFACE_VARIANT, one by one, and $interface using "$__httpx
sim_equal ricsim_g3_1 num_instances $((2*$NUM_POLICIES))
+ if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ :
+ else
+ START_ID=$(($START_ID+$NUM_POLICIES))
+ start_timer "Create polices in OSC via a1pms $INTERFACE_VARIANT in batch and $interface using "$__httpx
+ a1pms_api_put_policy_batch 201 "serv1" ricsim_g1_1 1 $START_ID NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json $NUM_POLICIES
+ print_timer "Create polices in OSC via a1pms $INTERFACE_VARIANT in batch and $interface using "$__httpx
- START_ID=$(($START_ID+$NUM_POLICIES))
+ sim_equal ricsim_g1_1 num_instances $((3*$NUM_POLICIES))
- start_timer "Create polices in OSC via a1pms DMAAP in batch and $interface using "$__httpx
- a1pms_api_put_policy_batch 201 "serv1" ricsim_g1_1 1 $START_ID NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json $NUM_POLICIES
- print_timer "Create polices in OSC via a1pms DMAAP in batch and $interface using "$__httpx
+ START_ID=$(($START_ID+$NUM_POLICIES))
- sim_equal ricsim_g1_1 num_instances $((3*$NUM_POLICIES))
+ start_timer "Create polices in STD via a1pms $INTERFACE_VARIANT in batch and $interface using "$__httpx
+ a1pms_api_put_policy_batch 201 "serv1" ricsim_g2_1 NOTYPE $START_ID NOTRANSIENT $notificationurl testdata/STD/pi1_template.json $NUM_POLICIES
+ print_timer "Create polices in STD via a1pms $INTERFACE_VARIANT in batch and $interface using "$__httpx
- START_ID=$(($START_ID+$NUM_POLICIES))
-
- start_timer "Create polices in STD via a1pms DMAAP in batch and $interface using "$__httpx
- a1pms_api_put_policy_batch 201 "serv1" ricsim_g2_1 NOTYPE $START_ID NOTRANSIENT $notificationurl testdata/STD/pi1_template.json $NUM_POLICIES
- print_timer "Create polices in STD via a1pms DMAAP in batch and $interface using "$__httpx
-
- sim_equal ricsim_g2_1 num_instances $((3*$NUM_POLICIES))
+ sim_equal ricsim_g2_1 num_instances $((3*$NUM_POLICIES))
- START_ID=$(($START_ID+$NUM_POLICIES))
+ START_ID=$(($START_ID+$NUM_POLICIES))
- start_timer "Create polices in STD via a1pms DMAAP in batch and $interface using "$__httpx
- a1pms_api_put_policy_batch 201 "serv1" ricsim_g3_1 STD_QOS2_0.1.0 $START_ID NOTRANSIENT $notificationurl testdata/STD2/pi_qos2_template.json $NUM_POLICIES
- print_timer "Create polices in STD via a1pms DMAAP in batch and $interface using "$__httpx
+ start_timer "Create polices in STD via a1pms $INTERFACE_VARIANT in batch and $interface using "$__httpx
+ a1pms_api_put_policy_batch 201 "serv1" ricsim_g3_1 STD_QOS2_0.1.0 $START_ID NOTRANSIENT $notificationurl testdata/STD2/pi_qos2_template.json $NUM_POLICIES
+ print_timer "Create polices in STD via a1pms $INTERFACE_VARIANT in batch and $interface using "$__httpx
- sim_equal ricsim_g3_1 num_instances $((3*$NUM_POLICIES))
-
+ sim_equal ricsim_g3_1 num_instances $((3*$NUM_POLICIES))
+ fi
if [ $interface == "SDNC" ]; then
sim_contains_str ricsim_g1_1 remote_hosts $SDNC_APP_NAME
diff --git a/test/auto-test/FTC805.sh b/test/auto-test/FTC805.sh
index e652757..24ef2b6 100755
--- a/test/auto-test/FTC805.sh
+++ b/test/auto-test/FTC805.sh
@@ -1,7 +1,7 @@
#!/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.
@@ -56,7 +56,7 @@
NUM_POLICIES_PER_RIC=2000
-generate_policy_uuid
+sim_generate_policy_uuid
notificationurl=$CR_SERVICE_APP_PATH_0"/test"
@@ -73,7 +73,12 @@
use_cr_https
use_simulator_https
if [[ $interface = *"SDNC"* ]]; then
- use_sdnc_https
+ if [[ "$SDNC_FEATURE_LEVEL" == *"NO_NB_HTTPS"* ]]; then
+ deviation "SDNC does not support NB https"
+ use_sdnc_http
+ else
+ use_sdnc_https
+ fi
fi
use_a1pms_rest_https
else
@@ -106,6 +111,7 @@
if [[ $interface = *"SDNC"* ]]; then
start_sdnc
+ controller_api_wait_for_status_ok 200 ricsim_g1_1
prepare_a1pms_config SDNC ".a1pms_config.json"
else
prepare_a1pms_config NOSDNC ".a1pms_config.json"
@@ -164,6 +170,8 @@
stop_a1pms
+ sleep_wait 60
+
start_stopped_a1pms
set_a1pms_debug
@@ -172,6 +180,8 @@
stop_a1pms
+ sleep_wait 60
+
for ((i=1; i<=$NUM_RICS; i++))
do
sim_post_delete_instances 200 ricsim_g1_$i
@@ -214,6 +224,8 @@
stop_a1pms
+ sleep_wait 60
+
start_stopped_a1pms
set_a1pms_debug
diff --git a/test/auto-test/FTC810.sh b/test/auto-test/FTC810.sh
index 5ce79c0..f977d14 100755
--- a/test/auto-test/FTC810.sh
+++ b/test/auto-test/FTC810.sh
@@ -1,7 +1,7 @@
#!/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.
@@ -17,7 +17,7 @@
# ============LICENSE_END=================================================
#
-TC_ONELINE_DESCR="Repeatedly create and delete policies in each RICs for 24h (or configured number of days). Via a1pms REST/DMAAP/DMAAP_BATCH and SDNC using http or https"
+TC_ONELINE_DESCR="Repeatedly create and delete policies in each RICs for 24h (or configured number of days). Via a1pms REST and with SDNC using http or https"
#App names to include in the test when running docker, space separated list
DOCKER_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM SDNC NGW KUBEPROXY"
@@ -43,7 +43,7 @@
#### TEST BEGIN ####
-generate_policy_uuid
+sim_generate_policy_uuid
#Local vars in test script
##########################
@@ -71,7 +71,12 @@
else
use_cr_https
use_a1pms_rest_https
- use_sdnc_https
+ if [[ "$SDNC_FEATURE_LEVEL" == *"NO_NB_HTTPS"* ]]; then
+ deviation "SDNC does not support NB https"
+ use_sdnc_http
+ else
+ use_sdnc_https
+ fi
use_simulator_https
fi
@@ -81,7 +86,11 @@
start_ric_simulators ricsim_g3 $NUM_RICS STD_2.0.0
-start_mr
+if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ :
+else
+ start_mr
+fi
start_cr 1
@@ -105,6 +114,7 @@
fi
start_sdnc
+controller_api_wait_for_status_ok 200 ricsim_g1_1
sleep_wait 120 "Let A1PMS cofiguration take effect"
@@ -172,9 +182,14 @@
a1pms_api_put_service 201 "serv1" 0 "$CR_SERVICE_APP_PATH_0/1"
TEST_DURATION=$((24*3600*$DAYS))
+
TEST_START=$SECONDS
-A1PMS_INTERFACES="REST REST_PARALLEL DMAAP DMAAP-BATCH"
+if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ A1PMS_INTERFACES="REST REST_PARALLEL"
+else
+ A1PMS_INTERFACES="REST REST_PARALLEL DMAAP DMAAP-BATCH"
+fi
MR_MESSAGES=0
@@ -342,12 +357,16 @@
a1pms_equal json:policy-instances $INSTANCES
- mr_equal requests_submitted $MR_MESSAGES
- mr_equal requests_fetched $MR_MESSAGES
- mr_equal responses_submitted $MR_MESSAGES
- mr_equal responses_fetched $MR_MESSAGES
- mr_equal current_requests 0
- mr_equal current_responses 0
+ if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ :
+ else
+ mr_equal requests_submitted $MR_MESSAGES
+ mr_equal requests_fetched $MR_MESSAGES
+ mr_equal responses_submitted $MR_MESSAGES
+ mr_equal responses_fetched $MR_MESSAGES
+ mr_equal current_requests 0
+ mr_equal current_responses 0
+ fi
for ((i=1; i<=$NUM_RICS; i++))
diff --git a/test/auto-test/FTC850.sh b/test/auto-test/FTC850.sh
index 4b795c0..54c4b3a 100755
--- a/test/auto-test/FTC850.sh
+++ b/test/auto-test/FTC850.sh
@@ -1,7 +1,7 @@
#!/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.
@@ -55,7 +55,7 @@
NUM_RICS=20
NUM_POLICIES_PER_RIC=500
-generate_policy_uuid
+sim_generate_policy_uuid
notificationurl=$CR_SERVICE_APP_PATH_0"/test"
@@ -71,15 +71,28 @@
if [ $__httpx == "HTTPS" ]; then
use_cr_https
use_simulator_https
- use_mr_https
+ if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ :
+ else
+ use_mr_https
+ fi
if [[ $interface = *"SDNC"* ]]; then
- use_sdnc_https
+ if [[ "$SDNC_FEATURE_LEVEL" == *"NO_NB_HTTPS"* ]]; then
+ deviation "SDNC does not support NB https"
+ use_sdnc_http
+ else
+ use_sdnc_https
+ fi
fi
use_a1pms_rest_https
else
use_cr_http
use_simulator_http
- use_mr_http
+ if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ :
+ else
+ use_mr_http
+ fi
if [[ $interface = *"SDNC"* ]]; then
use_sdnc_http
fi
@@ -107,6 +120,7 @@
if [[ $interface = *"SDNC"* ]]; then
start_sdnc
+ controller_api_wait_for_status_ok 200 ricsim_g1_1
prepare_a1pms_config SDNC ".a1pms_config.json"
else
prepare_a1pms_config NOSDNC ".a1pms_config.json"
@@ -118,7 +132,11 @@
a1pms_api_put_configuration 200 ".a1pms_config.json"
fi
- start_mr # Not used, but removes error messages from the a1pms log
+ if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ :
+ else
+ start_mr #Just to prevent errors in the a1pms log...
+ fi
start_cr 1
diff --git a/test/auto-test/FTC900.sh b/test/auto-test/FTC900.sh
index b9a6654..a85eed2 100755
--- a/test/auto-test/FTC900.sh
+++ b/test/auto-test/FTC900.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env 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.
@@ -56,7 +56,11 @@
start_ric_simulators $RIC_SIM_PREFIX"_g3" $STD_NUM_RICS STD_2.0.0
-start_mr #Just to prevent errors in the a1pms log...
+if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ :
+else
+ start_mr #Just to prevent errors in the a1pms log...
+fi
start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE
@@ -158,11 +162,11 @@
# Create policies in OSC
for ((i=1; i<=$OSC_NUM_RICS; i++))
do
- generate_policy_uuid
+ sim_generate_policy_uuid
a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 2 $((2000+$i)) NOTRANSIENT $notificationurl testdata/OSC/pihw_template.json 1
- generate_policy_uuid
+ sim_generate_policy_uuid
a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 100 $((3000+$i)) NOTRANSIENT $notificationurl testdata/OSC/piqos_template.json 1
- generate_policy_uuid
+ sim_generate_policy_uuid
a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 20008 $((4000+$i)) NOTRANSIENT $notificationurl testdata/OSC/pitsa_template.json 1
done
@@ -177,11 +181,11 @@
# Create policies in STD
for ((i=1; i<=$STD_NUM_RICS; i++))
do
- generate_policy_uuid
+ sim_generate_policy_uuid
a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g2_"$i NOTYPE $((2100+$i)) NOTRANSIENT $notificationurl testdata/STD/pi1_template.json 1
- generate_policy_uuid
+ sim_generate_policy_uuid
a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g3_"$i STD_QOS_0_2_0 $((2300+$i)) NOTRANSIENT $notificationurl demo-testdata/STD2/pi1_template.json 1
- generate_policy_uuid
+ sim_generate_policy_uuid
a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g3_"$i 'STD_QOS2_0.1.0' $((2400+$i)) NOTRANSIENT $notificationurl demo-testdata/STD2/pi1_template.json 1
done
diff --git a/test/auto-test/FTC_HELM_E_RELEASE.sh b/test/auto-test/FTC_HELM_E_RELEASE.sh
index f6433ad..8178551 100755
--- a/test/auto-test/FTC_HELM_E_RELEASE.sh
+++ b/test/auto-test/FTC_HELM_E_RELEASE.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env 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.
@@ -54,12 +54,7 @@
use_prod_stub_https
use_dmaapmed_https
-if [ $ICS_VERSION == "V1-1" ]; then
- use_rapp_catalogue_http # https not yet supported
-else
- ########################################use_rapp_catalogue_https
- use_rapp_catalogue_http
-fi
+use_rapp_catalogue_http
echo -e "$RED CHECK WHY RC HTTPS DOES NOT WORK $ERED"
@@ -103,6 +98,7 @@
start_control_panel
start_sdnc
+controller_api_wait_for_status_ok 200 a1-sim-std-1
start_a1pms
@@ -234,9 +230,9 @@
for ((i=0; i<$STD_NUM_RICS; i++))
do
ricid=$((3+$i))
- generate_policy_uuid
+ sim_generate_policy_uuid
a1pms_api_put_policy 201 "Emergency-response-app" ric$ricid NOTYPE $((1100+$i)) NOTRANSIENT $CR_SERVICE_APP_PATH_0/"std2" testdata/STD/pi1_template.json 1
- generate_policy_uuid
+ sim_generate_policy_uuid
a1pms_api_put_policy 201 "Emergency-response-app" ric$ricid NOTYPE $((1200+$i)) NOTRANSIENT $CR_SERVICE_APP_PATH_0/"std2" testdata/STD/pi1_template.json 1
done
@@ -244,9 +240,9 @@
for ((i=0; i<$STD_NUM_RICS; i++))
do
ricid=$((5+$i))
- generate_policy_uuid
+ sim_generate_policy_uuid
a1pms_api_put_policy 201 "Emergency-response-app" ric$ricid STD_QOS_0_2_0 $((2100+$i)) NOTRANSIENT $CR_SERVICE_APP_PATH_0/"std2" testdata/STD2/pi_qos_template.json 1
- generate_policy_uuid
+ sim_generate_policy_uuid
a1pms_api_put_policy 201 "Emergency-response-app" ric$ricid STD_QOS2_0.1.0 $((2200+$i)) NOTRANSIENT $CR_SERVICE_APP_PATH_0/"std2" testdata/STD2/pi_qos2_template.json 1
done
@@ -254,9 +250,9 @@
for ((i=0; i<$OSC_NUM_RICS; i++))
do
ricid=$((1+$i))
- generate_policy_uuid
+ sim_generate_policy_uuid
a1pms_api_put_policy 201 "Emergency-response-app" ric$ricid 1 $((3100+$i)) NOTRANSIENT $CR_SERVICE_APP_PATH_0/"osc" testdata/OSC/pi1_template.json 1
- generate_policy_uuid
+ sim_generate_policy_uuid
a1pms_api_put_policy 201 "Emergency-response-app" ric$ricid 2 $((3200+$i)) NOTRANSIENT $CR_SERVICE_APP_PATH_0/"osc" testdata/OSC/pi2_template.json 1
done
@@ -306,8 +302,6 @@
echo "ADD EVENT/STATUS CHECK"
echo "ADD MR CHECK"
-FLAT_A1_EI="1"
-
ics_api_admin_reset
CB_JOB="$PROD_STUB_SERVICE_PATH$PROD_STUB_JOB_CALLBACK"
@@ -328,60 +322,30 @@
ics_api_service_status 200
## Setup prod-a
-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_type_2 201 type1 testdata/ics/ei-type-1.json
+ics_api_edp_get_type_2 200 type1
- ics_api_edp_get_producer 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 testdata/ics/ei-type-1.json
-else
- 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_get_type_ids 200 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
+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
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
- ics_api_a1_put_job 201 type1 job1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json
-else
- ics_api_a1_put_job 201 job1 type1 $TARGET1 ricsim_g3_1 $STATUS1 testdata/ics/job-template.json
-fi
+ics_api_a1_put_job 201 job1 type1 $TARGET1 ricsim_g3_1 $STATUS1 testdata/ics/job-template.json
# Check the job data in the producer
-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 [[ "$ICS_FEATURE3LEVEL" == *"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/ics/job-template.json
- fi
-fi
+prodstub_check_jobdata_3 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json
## Create a second job for prod-a
## job2 - prod-a
-if [ -z "$FLAT_A1_EI" ]; then
- ics_api_a1_put_job 201 type1 job2 $TARGET2 ricsim_g3_2 testdata/ics/job-template.json
-else
- ics_api_a1_put_job 201 job2 type1 $TARGET2 ricsim_g3_2 $STATUS2 testdata/ics/job-template.json
-fi
+ics_api_a1_put_job 201 job2 type1 $TARGET2 ricsim_g3_2 $STATUS2 testdata/ics/job-template.json
# Check the job data in the producer
-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 [[ "$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/ics/job-template.json
- fi
-fi
+prodstub_check_jobdata_3 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ics/job-template.json
# Dmaap mediator and adapter
start_dmaapadp NOPROXY $SIM_GROUP/$DMAAP_ADP_COMPOSE_DIR/$DMAAP_ADP_CONFIG_FILE_TEMPLATE $SIM_GROUP/$DMAAP_ADP_COMPOSE_DIR/$DMAAP_ADP_DATA_FILE
@@ -451,13 +415,8 @@
# Check ICS status after restart
-if [ -z "$FLAT_A1_EI" ]; then
- ics_api_a1_get_job_status 200 type1 job1 DISABLED
- ics_api_a1_get_job_status 200 type1 job2 DISABLED
-else
- ics_api_a1_get_job_status 200 job1 DISABLED
- ics_api_a1_get_job_status 200 job2 DISABLED
-fi
+ics_api_a1_get_job_status 200 job1 DISABLED
+ics_api_a1_get_job_status 200 job2 DISABLED
check_a1pms_logs
check_ics_logs
diff --git a/test/auto-test/ONAP_UC.sh b/test/auto-test/ONAP_UC.sh
index 7d7c935..c41c725 100755
--- a/test/auto-test/ONAP_UC.sh
+++ b/test/auto-test/ONAP_UC.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env 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.
@@ -48,16 +48,32 @@
use_cr_https
use_a1pms_rest_https
-use_sdnc_https
+if [[ "$SDNC_FEATURE_LEVEL" == *"NO_NB_HTTPS"* ]]; then
+ deviation "SDNC does not support NB https"
+ use_sdnc_http
+else
+ use_sdnc_https
+fi
use_simulator_https
-use_mr_https
+if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ :
+else
+ use_mr_https
+fi
__httpx="HTTPS"
notificationurl=$CR_SERVICE_APP_PATH_0"/test"
-generate_policy_uuid
+sim_generate_policy_uuid
# Tested variants of REST/DMAAP/SDNC config
-TESTED_VARIANTS="REST DMAAP REST+SDNC DMAAP+SDNC"
+
+
+if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ TESTED_VARIANTS="REST REST+SDNC"
+else
+ TESTED_VARIANTS="REST DMAAP REST+SDNC DMAAP+SDNC"
+fi
+
for interface in $TESTED_VARIANTS ; do
echo "#####################################################################"
@@ -85,8 +101,12 @@
start_ric_simulators $RIC_SIM_PREFIX"_g3" $STD_NUM_RICS STD_2.0.0
- start_mr "$MR_READ_TOPIC" "/events" "users/policy-agent" \
- "$MR_WRITE_TOPIC" "/events" "users/mr-stub"
+ if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ :
+ else
+ start_mr "$MR_READ_TOPIC" "/events" "users/policy-agent" \
+ "$MR_WRITE_TOPIC" "/events" "users/mr-stub"
+ fi
start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE
@@ -98,6 +118,7 @@
if [[ $interface = *"SDNC"* ]]; then
start_sdnc
+ controller_api_wait_for_status_ok 200 ricsim_g1_1
prepare_a1pms_config SDNC ".a1pms_config.json"
else
prepare_a1pms_config NOSDNC ".a1pms_config.json"
diff --git a/test/auto-test/PM_DEMO.sh b/test/auto-test/PM_DEMO.sh
index f4adcd6..6da3ef5 100755
--- a/test/auto-test/PM_DEMO.sh
+++ b/test/auto-test/PM_DEMO.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env 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.
@@ -48,7 +48,12 @@
use_cr_https
use_a1pms_rest_https
-use_sdnc_https
+if [[ "$SDNC_FEATURE_LEVEL" == *"NO_NB_HTTPS"* ]]; then
+ deviation "SDNC does not support NB https"
+ use_sdnc_http
+else
+ use_sdnc_https
+fi
use_simulator_https
notificationurl=$CR_SERVICE_APP_PATH_0"/test"
@@ -66,7 +71,11 @@
start_ric_simulators $RIC_SIM_PREFIX"_g3" $STD_NUM_RICS STD_2.0.0
-start_mr #Just to prevent errors in the a1pms log...
+if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ :
+else
+ start_mr #Just to prevent errors in the a1pms log...
+fi
start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE
@@ -75,6 +84,7 @@
fi
start_sdnc
+controller_api_wait_for_status_ok 200 ricsim_g1_1
start_a1pms NORPOXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE
@@ -172,9 +182,9 @@
# Create policies in OSC
for ((i=1; i<=$OSC_NUM_RICS; i++))
do
- generate_policy_uuid
+ sim_generate_policy_uuid
a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 100 $((3000+$i)) NOTRANSIENT $notificationurl demo-testdata/OSC/piqos_template.json 1
- generate_policy_uuid
+ sim_generate_policy_uuid
a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 20008 $((4000+$i)) NOTRANSIENT $notificationurl demo-testdata/OSC/pitsa_template.json 1
done
@@ -189,11 +199,11 @@
# Create policies in STD
for ((i=1; i<=$STD_NUM_RICS; i++))
do
- generate_policy_uuid
+ sim_generate_policy_uuid
a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g2_"$i NOTYPE $((2100+$i)) NOTRANSIENT $notificationurl demo-testdata/STD/pi1_template.json 1
- generate_policy_uuid
+ sim_generate_policy_uuid
a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g3_"$i STD_QOS_0_2_0 $((2300+$i)) NOTRANSIENT $notificationurl demo-testdata/STD2/pi1_template.json 1
- generate_policy_uuid
+ sim_generate_policy_uuid
a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g3_"$i 'STD_QOS2_0.1.0' $((2400+$i)) NOTRANSIENT $notificationurl demo-testdata/STD2/pi1_template.json 1
done
diff --git a/test/auto-test/PM_EI_DEMO.sh b/test/auto-test/PM_EI_DEMO.sh
index 7b8a6ed..e252e1d 100755
--- a/test/auto-test/PM_EI_DEMO.sh
+++ b/test/auto-test/PM_EI_DEMO.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env 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.
@@ -48,15 +48,16 @@
use_cr_https
use_a1pms_rest_https
-use_sdnc_https
+if [[ "$SDNC_FEATURE_LEVEL" == *"NO_NB_HTTPS"* ]]; then
+ deviation "SDNC does not support NB https"
+ use_sdnc_http
+else
+ use_sdnc_https
+fi
use_simulator_https
use_ics_rest_https
use_prod_stub_https
-if [ $ICS_VERSION == "V1-1" ]; then
- use_rapp_catalogue_http # https not yet supported
-else
- use_rapp_catalogue_https
-fi
+use_rapp_catalogue_https
notificationurl=$CR_SERVICE_APP_PATH_0"/test"
@@ -71,7 +72,11 @@
start_ric_simulators $RIC_SIM_PREFIX"_g3" $STD_NUM_RICS STD_2.0.0
-start_mr #Just to prevent errors in the a1pms log...
+if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ :
+else
+ start_mr #Just to prevent errors in the a1pms log...
+fi
start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE
@@ -80,6 +85,7 @@
fi
start_sdnc # Comment this line to run A1PMS with proxy
+controller_api_wait_for_status_ok 200 ricsim_g3_1 # Comment this line to run A1PMS with proxy
start_a1pms PROXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE
@@ -105,11 +111,6 @@
set_ics_trace
-use_info_jobs=false #Set flag if interface supporting info-types is used
-if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
- use_info_jobs=true
-fi
-
rapp_cat_api_get_services 200 EMPTY
rapp_cat_api_put_service 201 "Emergency-response-app" v1 "Emergency-response-app" "Emergency-response-app"
@@ -155,9 +156,9 @@
# Create policies in STD
for ((i=1; i<=$STD_NUM_RICS; i++))
do
- generate_policy_uuid
+ sim_generate_policy_uuid
a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g3_"$i STD_QOS_0_2_0 $((2300+$i)) NOTRANSIENT $notificationurl demo-testdata/STD2/pi1_template.json 1
- generate_policy_uuid
+ sim_generate_policy_uuid
a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g3_"$i 'STD_QOS2_0.1.0' $((2400+$i)) NOTRANSIENT $notificationurl demo-testdata/STD2/pi1_template.json 1
done
@@ -174,8 +175,6 @@
sim_print $RIC_SIM_PREFIX"_g3_"$i remote_hosts
done
-FLAT_A1_EI="1"
-
CB_JOB="$PROD_STUB_SERVICE_PATH$PROD_STUB_JOB_CALLBACK"
CB_SV="$PROD_STUB_SERVICE_PATH$PROD_STUB_SUPERVISION_CALLBACK"
RIC_G1_1=$RIC_SIM_PREFIX"_g3_1"
@@ -199,59 +198,28 @@
ics_api_service_status 200
## Setup prod-a
-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_type_2 201 type1 testdata/ics/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
- ics_api_edp_put_type_2 201 type1 testdata/ics/ei-type-1.json
+ics_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
-
- ics_api_edp_get_producer_2 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1
-fi
+ics_api_edp_get_producer_2 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1
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
- ics_api_a1_put_job 201 type1 job1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json
-else
- ics_api_a1_put_job 201 job1 type1 $TARGET1 ricsim_g3_1 $STATUS1 testdata/ics/job-template.json
-fi
+ics_api_a1_put_job 201 job1 type1 $TARGET1 ricsim_g3_1 $STATUS1 testdata/ics/job-template.json
# Check the job data in the producer
-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/ics/job-template.json
- else
- prodstub_check_jobdata_2 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json
- fi
-fi
-
+ prodstub_check_jobdata_3 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json
## Create a second job for prod-a
## job2 - prod-a
-if [ -z "$FLAT_A1_EI" ]; then
- ics_api_a1_put_job 201 type1 job2 $TARGET2 ricsim_g3_2 testdata/ics/job-template.json
-else
- ics_api_a1_put_job 201 job2 type1 $TARGET2 ricsim_g3_2 $STATUS2 testdata/ics/job-template.json
-fi
+ics_api_a1_put_job 201 job2 type1 $TARGET2 ricsim_g3_2 $STATUS2 testdata/ics/job-template.json
# Check the job data in the producer
-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/ics/job-template.json
- else
- prodstub_check_jobdata_2 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ics/job-template.json
- fi
-fi
+prodstub_check_jobdata_3 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ics/job-template.json
check_a1pms_logs
check_ics_logs
diff --git a/test/auto-test/Suite-alternative-a1pms.sh b/test/auto-test/Suite-alternative-a1pms.sh
index cca3eb7..59d6e8f 100755
--- a/test/auto-test/Suite-alternative-a1pms.sh
+++ b/test/auto-test/Suite-alternative-a1pms.sh
@@ -1,7 +1,7 @@
#!/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.
@@ -17,7 +17,7 @@
# ============LICENSE_END=================================================
#
-TS_ONELINE_DESCR="Test suite - alternative A1PMS endpoint image testing. a1pms REST, DMAAP and SNDC controller resconf"
+TS_ONELINE_DESCR="Test suite - alternative A1PMS endpoint image testing. a1pms REST and SNDC controller resconf"
. ../common/testsuite_common.sh
diff --git a/test/auto-test/Suite-policy-interfaces.sh b/test/auto-test/Suite-policy-interfaces.sh
index f9baedf..c1a5e27 100755
--- a/test/auto-test/Suite-policy-interfaces.sh
+++ b/test/auto-test/Suite-policy-interfaces.sh
@@ -1,7 +1,7 @@
#!/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.
@@ -17,7 +17,7 @@
# ============LICENSE_END=================================================
#
-TS_ONELINE_DESCR="Test suite - interface testing. A1PMS REST, DMAAP and SNDC controller resconf"
+TS_ONELINE_DESCR="Test suite - interface testing. A1PMS REST and SNDC controller resconf"
. ../common/testsuite_common.sh
diff --git a/test/auto-test/Suite-short-alternative-a1pms.sh b/test/auto-test/Suite-short-alternative-a1pms.sh
index 0b1b10d..0036d92 100755
--- a/test/auto-test/Suite-short-alternative-a1pms.sh
+++ b/test/auto-test/Suite-short-alternative-a1pms.sh
@@ -1,7 +1,7 @@
#!/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.
@@ -17,7 +17,7 @@
# ============LICENSE_END=================================================
#
-TS_ONELINE_DESCR="Test suite - short list of tests on alternative A1PMS endpoint image testing. a1pms REST, DMAAP and SNDC controller resconf"
+TS_ONELINE_DESCR="Test suite - short list of tests on alternative A1PMS endpoint image testing. a1pms RES and SNDC controller resconf"
. ../common/testsuite_common.sh
diff --git a/test/auto-test/override-adapter.sh b/test/auto-test/override-adapter.sh
new file mode 100644
index 0000000..5edb9e6
--- /dev/null
+++ b/test/auto-test/override-adapter.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+################################################################################
+# Copyright (c) 2023 Nordix Foundation. #
+# #
+# Licensed under the Apache License, Version 2.0 (the "License"); #
+# you may not use this file except in compliance with the License. #
+# You may obtain a copy of the License at #
+# #
+# http://www.apache.org/licenses/LICENSE-2.0 #
+# #
+# Unless required by applicable law or agreed to in writing, software #
+# distributed under the License is distributed on an "AS IS" BASIS, #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and #
+# limitations under the License. #
+################################################################################
+
+A1PMS_ADAPTER_CLASS="" # adapter java class
+A1PMS_ADAPTER_POLICY_NAME="" # policy type for adaper