Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add docker-compose files for dmaap-mediator"
[nonrtric.git]
/
test
/
auto-test
/
FTC310.sh
diff --git
a/test/auto-test/FTC310.sh
b/test/auto-test/FTC310.sh
index
dd79b33
..
33e4966
100755
(executable)
--- a/
test/auto-test/FTC310.sh
+++ b/
test/auto-test/FTC310.sh
@@
-21,10
+21,10
@@
TC_ONELINE_DESCR="Resync of RIC via changes in the consul config or pushed config"
#App names to include in the test when running docker, space separated list
TC_ONELINE_DESCR="Resync of RIC via changes in the consul config or pushed config"
#App names to include in the test when running docker, space separated list
-DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM"
+DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM
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"
#Supported run modes
SUPPORTED_RUNMODES="DOCKER"
@@
-35,6
+35,10
@@
SUPPORTED_RUNMODES="DOCKER"
. ../common/mr_api_functions.sh
. ../common/control_panel_api_functions.sh
. ../common/controller_api_functions.sh
. ../common/mr_api_functions.sh
. ../common/control_panel_api_functions.sh
. ../common/controller_api_functions.sh
+. ../common/consul_cbs_functions.sh
+. ../common/gateway_api_functions.sh
+
+setup_testenvironment
#### TEST BEGIN ####
#### TEST BEGIN ####
@@
-45,12
+49,12
@@
else
fi
for consul_conf in $TESTED_VARIANTS ; do
fi
for consul_conf in $TESTED_VARIANTS ; do
- generate_uuid
+ generate_
policy_
uuid
# Clean container and start all needed containers #
clean_environment
# Clean container and start all needed containers #
clean_environment
- start_policy_agent
+ start_policy_agent
NOPROXY $SIM_GROUP/$POLICY_AGENT_COMPOSE_DIR/$POLICY_AGENT_CONFIG_FILE
set_agent_trace
set_agent_trace
@@
-69,7
+73,7
@@
for consul_conf in $TESTED_VARIANTS ; do
start_cr
start_cr
- start_control_panel
+ start_control_panel
$SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE
if [ $consul_conf == "CONSUL" ]; then
start_consul_cbs
if [ $consul_conf == "CONSUL" ]; then
start_consul_cbs
@@
-116,7
+120,7
@@
for consul_conf in $TESTED_VARIANTS ; do
fi
check_policy_agent_logs
fi
check_policy_agent_logs
- check_control_panel_logs
+
# Remove one RIC RIC and check
start_ric_simulators ricsim_g2 1 STD_1.1.3
# Remove one RIC RIC and check
start_ric_simulators ricsim_g2 1 STD_1.1.3
@@
-142,7
+146,7
@@
for consul_conf in $TESTED_VARIANTS ; do
fi
check_policy_agent_logs
fi
check_policy_agent_logs
- check_
control_panel
_logs
+ check_
sdnc
_logs
store_logs END_$consul_conf
done
store_logs END_$consul_conf
done