Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
NONRTRIC - Implement DMaaP mediator producer service in Java
[nonrtric.git]
/
test
/
auto-test
/
FTC100.sh
diff --git
a/test/auto-test/FTC100.sh
b/test/auto-test/FTC100.sh
index
3b9dcd7
..
ff9b901
100755
(executable)
--- a/
test/auto-test/FTC100.sh
+++ b/
test/auto-test/FTC100.sh
@@
-21,15
+21,20
@@
TC_ONELINE_DESCR="Full agent API walkthrough using agent REST/DMAAP and with/without SDNC A1 Controller"
#App names to include in the test when running docker, space separated list
TC_ONELINE_DESCR="Full agent API walkthrough using agent REST/DMAAP and with/without SDNC A1 Controller"
#App names to include in the test when running docker, space separated list
-DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM SDNC"
+DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM SDNC
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="CP CR MR PA RICSIM SDNC"
+KUBE_INCLUDED_IMAGES="CP CR MR PA RICSIM SDNC
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 test environment profiles
-SUPPORTED_PROFILES="ONAP-GUILIN ONAP-HONOLULU
ORAN-CHERRY ORAN-DAWN
"
+SUPPORTED_PROFILES="ONAP-GUILIN 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"
@@
-41,11
+46,14
@@
SUPPORTED_RUNMODES="DOCKER KUBE"
. ../common/cr_api_functions.sh
. ../common/mr_api_functions.sh
. ../common/ricsimulator_api_functions.sh
. ../common/cr_api_functions.sh
. ../common/mr_api_functions.sh
. ../common/ricsimulator_api_functions.sh
+. ../common/kube_proxy_api_functions.sh
+. ../common/gateway_api_functions.sh
+setup_testenvironment
#### TEST BEGIN ####
#### TEST BEGIN ####
-generate_uuid
+generate_
policy_
uuid
# Tested variants of REST/DMAAP/SDNC config
TESTED_VARIANTS="REST DMAAP REST+SDNC DMAAP+SDNC"
# Tested variants of REST/DMAAP/SDNC config
TESTED_VARIANTS="REST DMAAP REST+SDNC DMAAP+SDNC"
@@
-65,6
+73,10
@@
for __httpx in $TESTED_PROTOCOLS ; do
# Clean container and start all needed containers #
clean_environment
# Clean container and start all needed containers #
clean_environment
+ if [ $RUNMODE == "KUBE" ]; then
+ start_kube_proxy
+ fi
+
if [ $__httpx == "HTTPS" ]; then
use_cr_https
use_agent_rest_https
if [ $__httpx == "HTTPS" ]; then
use_cr_https
use_agent_rest_https
@@
-73,7
+85,7
@@
for __httpx in $TESTED_PROTOCOLS ; do
use_cr_http
fi
use_cr_http
fi
- start_policy_agent NORPOXY $SIM_GROUP/$POLICY_AGENT_COMPOSE_DIR/
application.yaml
+ start_policy_agent NORPOXY $SIM_GROUP/$POLICY_AGENT_COMPOSE_DIR/
$POLICY_AGENT_CONFIG_FILE
set_agent_debug
set_agent_debug
@@
-116,7
+128,11
@@
for __httpx in $TESTED_PROTOCOLS ; do
start_cr
start_cr
- start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/application.properties
+ 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 [ $RUNMODE == "DOCKER" ]; then
start_consul_cbs
if [ $RUNMODE == "DOCKER" ]; then
start_consul_cbs
@@
-560,7
+576,6
@@
for __httpx in $TESTED_PROTOCOLS ; do
fi
check_policy_agent_logs
fi
check_policy_agent_logs
- check_control_panel_logs
if [[ $interface = *"SDNC"* ]]; then
check_sdnc_logs
if [[ $interface = *"SDNC"* ]]; then
check_sdnc_logs