Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Adaptations to execute in multi-node kube cluster
[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
324d892
..
9d9d559
100755
(executable)
--- a/
test/auto-test/PM_EI_DEMO.sh
+++ b/
test/auto-test/PM_EI_DEMO.sh
@@
-20,13
+20,18
@@
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"
+DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM SDNC ECS PRODSTUB RC HTTPPROXY
NGW
"
#App names to include in the test when running kubernetes, space separated list
#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"
+KUBE_INCLUDED_IMAGES=" MR CR PA RC PRODSTUB RICSIM CP ECS SDNC HTTPPROXY
KUBEPROXY NGW
"
#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list
KUBE_PRESTARTED_IMAGES=""
#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="ONAP-HONOLULU ORAN-CHERRY ORAN-DAWN"
#Supported run modes
#Supported test environment profiles
SUPPORTED_PROFILES="ONAP-HONOLULU ORAN-CHERRY ORAN-DAWN"
#Supported run modes
@@
-44,6
+49,10
@@
SUPPORTED_RUNMODES="DOCKER KUBE"
. ../common/controller_api_functions.sh
. ../common/consul_cbs_functions.sh
. ../common/http_proxy_api_functions.sh
. ../common/controller_api_functions.sh
. ../common/consul_cbs_functions.sh
. ../common/http_proxy_api_functions.sh
+. ../common/kube_proxy_api_functions.sh
+. ../common/gateway_api_functions.sh
+
+setup_testenvironment
#### TEST BEGIN ####
#### TEST BEGIN ####
@@
-56,7
+65,12
@@
use_sdnc_https
use_simulator_https
use_ecs_rest_https
use_prod_stub_https
use_simulator_https
use_ecs_rest_https
use_prod_stub_https
-use_rapp_catalogue_http # https not yet supported
+if [ $ECS_VERSION == "V1-1" ]; then
+ use_rapp_catalogue_http # https not yet supported
+else
+ use_rapp_catalogue_https
+fi
+
if [ "$PMS_VERSION" == "V2" ]; then
notificationurl=$CR_SERVICE_PATH"/test"
if [ "$PMS_VERSION" == "V2" ]; then
notificationurl=$CR_SERVICE_PATH"/test"
@@
-67,23
+81,33
@@
fi
clean_environment
clean_environment
+if [ $RUNMODE == "KUBE" ]; then
+ start_kube_proxy
+fi
+
STD_NUM_RICS=2
STD_NUM_RICS=2
+#start_http_proxy #Remove the comment on this line, comment out 'start_sdnc' and change SDNC to NOSDNC a few lines below to run with proxy
+
start_ric_simulators $RIC_SIM_PREFIX"_g3" $STD_NUM_RICS STD_2.0.0
start_mr #Just to prevent errors in the agent log...
start_ric_simulators $RIC_SIM_PREFIX"_g3" $STD_NUM_RICS STD_2.0.0
start_mr #Just to prevent errors in the agent log...
-start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/
application.properties
+start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/
$CONTROL_PANEL_CONFIG_FILE
-start_sdnc
+if [ ! -z "$NRT_GATEWAY_APP_NAME" ]; then
+ start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE
+fi
+
+start_sdnc # Comment this line to run PMS with proxy
-start_policy_agent PROXY $SIM_GROUP/$POLICY_AGENT_COMPOSE_DIR/
application.yaml
+start_policy_agent PROXY $SIM_GROUP/$POLICY_AGENT_COMPOSE_DIR/
$POLICY_AGENT_CONFIG_FILE
if [ $RUNMODE == "DOCKER" ]; then
start_consul_cbs
fi
if [ $RUNMODE == "DOCKER" ]; then
start_consul_cbs
fi
-prepare_consul_config SDNC ".consul_config.json"
+prepare_consul_config SDNC ".consul_config.json"
#Change to NOSDNC if running PMS with proxy
if [ $RUNMODE == "KUBE" ]; then
agent_load_config ".consul_config.json"
if [ $RUNMODE == "KUBE" ]; then
agent_load_config ".consul_config.json"
@@
-95,7
+119,7
@@
start_cr
start_prod_stub
start_prod_stub
-start_ecs
$SIM_GROUP/$ECS_COMPOSE_DIR/application.yaml
+start_ecs
PROXY $SIM_GROUP/$ECS_COMPOSE_DIR/$ECS_CONFIG_FILE
start_rapp_catalogue
start_rapp_catalogue
@@
-146,9
+170,9
@@
api_put_service 201 "Emergency-response-app" 0 "$CR_SERVICE_PATH/1"
# Create policies in STD
for ((i=1; i<=$STD_NUM_RICS; i++))
do
# Create policies in STD
for ((i=1; i<=$STD_NUM_RICS; i++))
do
- generate_uuid
+ generate_
policy_
uuid
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
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_uuid
+ generate_
policy_
uuid
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
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
@@
-214,7
+238,11
@@
else
fi
# Check the job data in the producer
fi
# Check the job data in the producer
-prodstub_check_jobdata 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ecs/job-template.json
+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
+fi
## Create a second job for prod-a
## Create a second job for prod-a
@@
-226,7
+254,11
@@
else
fi
# Check the job data in the producer
fi
# Check the job data in the producer
-prodstub_check_jobdata 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ecs/job-template.json
+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
+fi
check_policy_agent_logs
check_ecs_logs
check_policy_agent_logs
check_ecs_logs
@@
-237,3
+269,5
@@
check_sdnc_logs
store_logs END
print_result
store_logs END
print_result
+
+auto_clean_environment
\ No newline at end of file