Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Adaptation of test env to helm chart
[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
66b6454
..
c93a6d7
100755
(executable)
--- a/
test/auto-test/PM_EI_DEMO.sh
+++ b/
test/auto-test/PM_EI_DEMO.sh
@@
-20,7
+20,7
@@
TC_ONELINE_DESCR="Preparation demo setup - policy management and enrichment information"
#App names to include in the test when running docker, space separated list
TC_ONELINE_DESCR="Preparation demo setup - policy management and enrichment information"
#App names to include in the test when running docker, space separated list
-DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM SDNC ECS PRODSTUB RC HTTPPROXY NGW"
+DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM SDNC ECS PRODSTUB RC HTTPPROXY
KUBEPROXY
NGW"
#App names to include in the test when running kubernetes, space separated list
KUBE_INCLUDED_IMAGES=" MR CR PA RC PRODSTUB RICSIM CP ECS SDNC HTTPPROXY KUBEPROXY NGW"
#App names to include in the test when running kubernetes, space separated list
KUBE_INCLUDED_IMAGES=" MR CR PA RC PRODSTUB RICSIM CP ECS SDNC HTTPPROXY KUBEPROXY NGW"
@@
-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 ONAP-ISTANBUL ORAN-CHERRY ORAN-D
AWN
"
+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"
@@
-73,7
+73,7
@@
fi
if [ "$PMS_VERSION" == "V2" ]; then
if [ "$PMS_VERSION" == "V2" ]; then
- notificationurl=$CR_SERVICE_PATH"/test"
+ notificationurl=$CR_SERVICE_
APP_
PATH"/test"
else
echo "PMS VERSION 2 (V2) is required"
exit 1
else
echo "PMS VERSION 2 (V2) is required"
exit 1
@@
-81,9
+81,7
@@
fi
clean_environment
clean_environment
-if [ $RUNMODE == "KUBE" ]; then
- start_kube_proxy
-fi
+start_kube_proxy
STD_NUM_RICS=2
STD_NUM_RICS=2
@@
-127,6
+125,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"
@@
-165,7
+168,7
@@
done
#Check the number of types
api_equal json:policy-types 2 300
#Check the number of types
api_equal json:policy-types 2 300
-api_put_service 201 "Emergency-response-app" 0 "$CR_SERVICE_PATH/1"
+api_put_service 201 "Emergency-response-app" 0 "$CR_SERVICE_
APP_
PATH/1"
# Create policies in STD
for ((i=1; i<=$STD_NUM_RICS; i++))
# Create policies in STD
for ((i=1; i<=$STD_NUM_RICS; i++))
@@
-202,8
+205,8
@@
fi
TARGET1="$RIC_SIM_HTTPX://$RIC_G1_1:$RIC_SIM_PORT/datadelivery"
TARGET2="$RIC_SIM_HTTPX://$RIC_G1_1:$RIC_SIM_PORT/datadelivery"
TARGET1="$RIC_SIM_HTTPX://$RIC_G1_1:$RIC_SIM_PORT/datadelivery"
TARGET2="$RIC_SIM_HTTPX://$RIC_G1_1:$RIC_SIM_PORT/datadelivery"
-STATUS1="$CR_SERVICE_PATH/callbacks/job1-status"
-STATUS2="$CR_SERVICE_PATH/callbacks/job2-status"
+STATUS1="$CR_SERVICE_
APP_
PATH/callbacks/job1-status"
+STATUS2="$CR_SERVICE_
APP_
PATH/callbacks/job2-status"
prodstub_arm_producer 200 prod-a
prodstub_arm_type 200 prod-a type1
prodstub_arm_producer 200 prod-a
prodstub_arm_type 200 prod-a type1
@@
-241,7
+244,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
+264,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