Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Uplift PMS
[nonrtric.git]
/
test
/
auto-test
/
FTC2002.sh
diff --git
a/test/auto-test/FTC2002.sh
b/test/auto-test/FTC2002.sh
index
753cc79
..
07a7a68
100755
(executable)
--- a/
test/auto-test/FTC2002.sh
+++ b/
test/auto-test/FTC2002.sh
@@
-20,22
+20,23
@@
TC_ONELINE_DESCR="Testing southbound proxy for SDNC - docker only"
#App names to include in the test when running docker, space separated list
TC_ONELINE_DESCR="Testing southbound proxy for SDNC - docker only"
#App names to include in the test when running docker, space separated list
-DOCKER_INCLUDED_IMAGES="RICSIM SDNC HTTPPROXY"
+DOCKER_INCLUDED_IMAGES="RICSIM SDNC HTTPPROXY
KUBEPROXY
"
#App names to include in the test when running kubernetes, space separated list
KUBE_INCLUDED_IMAGES=""
#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list
KUBE_PRESTARTED_IMAGES=" "
#App names to include in the test when running kubernetes, space separated list
KUBE_INCLUDED_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=""
+
#Supported test environment profiles
#Supported test environment profiles
-SUPPORTED_PROFILES="ONAP-ISTANBUL"
+SUPPORTED_PROFILES="ONAP-ISTANBUL
ONAP-JAKARTA
"
#Supported run modes
SUPPORTED_RUNMODES="DOCKER"
#Supported run modes
SUPPORTED_RUNMODES="DOCKER"
-. ../common/testcase_common.sh $@
-. ../common/controller_api_functions.sh
-. ../common/ricsimulator_api_functions.sh
-. ../common/kube_proxy_api_functions.sh
-. ../common/http_proxy_api_functions.sh
+. ../common/testcase_common.sh $@
setup_testenvironment
setup_testenvironment
@@
-43,7
+44,7
@@
setup_testenvironment
generate_policy_uuid
generate_policy_uuid
-#Test a
gent
and simulator protocol versions (others are http only)
+#Test a
1pms
and simulator protocol versions (others are http only)
NB_TESTED_PROTOCOLS="HTTP HTTPS"
SB_TESTED_PROTOCOLS="HTTP HTTPS"
NB_TESTED_PROTOCOLS="HTTP HTTPS"
SB_TESTED_PROTOCOLS="HTTP HTTPS"
@@
-65,11
+66,13
@@
for __nb_httpx in $NB_TESTED_PROTOCOLS ; do
# Clean container and start all needed containers #
clean_environment
# Clean container and start all needed containers #
clean_environment
+ start_kube_proxy
+
start_http_proxy
start_ric_simulators ricsim_g1 1 OSC_2.1.0
start_ric_simulators ricsim_g2 1 STD_1.1.3
start_http_proxy
start_ric_simulators ricsim_g1 1 OSC_2.1.0
start_ric_simulators ricsim_g2 1 STD_1.1.3
- if [ "$PMS_VERSION" == "V2" ]; then
+ if [ "$
A1
PMS_VERSION" == "V2" ]; then
start_ric_simulators ricsim_g3 1 STD_2.0.0
fi
start_ric_simulators ricsim_g3 1 STD_2.0.0
fi