Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Use retry when calling DMaaP and ECS
[nonrtric.git]
/
test
/
auto-test
/
PM_EI_DEMO.sh
diff --git
a/test/auto-test/PM_EI_DEMO.sh
b/test/auto-test/PM_EI_DEMO.sh
index
9d9d559
..
15e7377
100755
(executable)
--- a/
test/auto-test/PM_EI_DEMO.sh
+++ b/
test/auto-test/PM_EI_DEMO.sh
@@
-33,7
+33,7
@@
KUBE_PRESTARTED_IMAGES=""
CONDITIONALLY_IGNORED_IMAGES="NGW"
#Supported test environment profiles
CONDITIONALLY_IGNORED_IMAGES="NGW"
#Supported test environment profiles
-SUPPORTED_PROFILES="ONAP-HONOLULU
ORAN-CHERRY ORAN-DAWN
"
+SUPPORTED_PROFILES="ONAP-HONOLULU
ONAP-ISTANBUL ORAN-CHERRY ORAN-D-RELEASE ORAN-E-RELEASE
"
#Supported run modes
SUPPORTED_RUNMODES="DOCKER KUBE"
#Supported run modes
SUPPORTED_RUNMODES="DOCKER KUBE"
@@
-127,6
+127,11
@@
set_agent_trace
set_ecs_trace
set_ecs_trace
+use_info_jobs=false #Set flag if interface supporting info-types is used
+if [[ "$ECS_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"
rapp_cat_api_get_services 200 EMPTY
rapp_cat_api_put_service 201 "Emergency-response-app" v1 "Emergency-response-app" "Emergency-response-app"
@@
-241,7
+246,11
@@
fi
if [ $ECS_VERSION == "V1-1" ]; then
prodstub_check_jobdata 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ecs/job-template.json
else
if [ $ECS_VERSION == "V1-1" ]; then
prodstub_check_jobdata 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ecs/job-template.json
else
- prodstub_check_jobdata_2 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ecs/job-template.json
+ if [ $use_info_jobs ]; then
+ prodstub_check_jobdata_3 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ecs/job-template.json
+ else
+ prodstub_check_jobdata_2 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ecs/job-template.json
+ fi
fi
fi
@@
-257,7
+266,11
@@
fi
if [ $ECS_VERSION == "V1-1" ]; then
prodstub_check_jobdata 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ecs/job-template.json
else
if [ $ECS_VERSION == "V1-1" ]; then
prodstub_check_jobdata 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ecs/job-template.json
else
- prodstub_check_jobdata_2 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ecs/job-template.json
+ if [ $use_info_jobs ]; then
+ prodstub_check_jobdata_3 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ecs/job-template.json
+ else
+ prodstub_check_jobdata_2 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ecs/job-template.json
+ fi
fi
check_policy_agent_logs
fi
check_policy_agent_logs