Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Integrated gateway and updated kube support
[nonrtric.git]
/
test
/
auto-test
/
FTC350.sh
diff --git
a/test/auto-test/FTC350.sh
b/test/auto-test/FTC350.sh
index
d30b314
..
9d47caa
100755
(executable)
--- a/
test/auto-test/FTC350.sh
+++ b/
test/auto-test/FTC350.sh
@@
-20,10
+20,10
@@
TC_ONELINE_DESCR="Change supported policy types and reconfigure rics"
#App names to include in the test when running docker, space separated list
TC_ONELINE_DESCR="Change supported policy types and reconfigure rics"
#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=""
@@
-40,10
+40,13
@@
SUPPORTED_RUNMODES="DOCKER KUBE"
. ../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/kube_proxy_api_functions.sh
+
+setup_testenvironment
#### TEST BEGIN ####
#### TEST BEGIN ####
-generate_uuid
+generate_
policy_
uuid
use_cr_http
use_cr_http
@@
-65,6
+68,10
@@
for interface in $TESTED_VARIANTS ; 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
+
#Start simulators and prepare two configs
start_ric_simulators ricsim_g1 $NUM_RICS_2 OSC_2.1.0
#Start simulators and prepare two configs
start_ric_simulators ricsim_g1 $NUM_RICS_2 OSC_2.1.0
@@
-94,7
+101,7
@@
for interface in $TESTED_VARIANTS ; do
prepare_consul_config NOSDNC ".consul_config_all.json"
fi
prepare_consul_config NOSDNC ".consul_config_all.json"
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_trace
set_agent_trace