Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Image version updates for test
[nonrtric.git]
/
test
/
auto-test
/
FTC100.sh
diff --git
a/test/auto-test/FTC100.sh
b/test/auto-test/FTC100.sh
index
dfcee33
..
46c90ea
100755
(executable)
--- a/
test/auto-test/FTC100.sh
+++ b/
test/auto-test/FTC100.sh
@@
-20,7
+20,7
@@
TC_ONELINE_DESCR="Full a1pms API walkthrough using a1pms REST/DMAAP and with/without SDNC A1 Controller"
TC_ONELINE_DESCR="Full a1pms API walkthrough using a1pms REST/DMAAP and with/without SDNC A1 Controller"
-USE_ISTIO=
1
+USE_ISTIO=
0
#App names to include in the test when running docker, space separated list
DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR A1PMS RICSIM SDNC NGW KUBEPROXY"
#App names to include in the test when running docker, space separated list
DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR A1PMS RICSIM SDNC NGW KUBEPROXY"
@@
-40,7
+40,7
@@
KUBE_PRESTARTED_IMAGES=""
CONDITIONALLY_IGNORED_IMAGES="CBS CONSUL NGW"
#Supported test environment profiles
CONDITIONALLY_IGNORED_IMAGES="CBS CONSUL NGW"
#Supported test environment profiles
-SUPPORTED_PROFILES="ONAP-GUILIN ONAP-HONOLULU ONAP-ISTANBUL ONAP-JAKARTA O
RAN-CHERRY ORAN-D-RELEASE ORAN-E-RELEASE ORAN-F
-RELEASE"
+SUPPORTED_PROFILES="ONAP-GUILIN ONAP-HONOLULU ONAP-ISTANBUL ONAP-JAKARTA O
NAP-KOHN ONAP-LONDON ORAN-CHERRY ORAN-D-RELEASE ORAN-E-RELEASE ORAN-F-RELEASE ORAN-G
-RELEASE"
#Supported run modes
SUPPORTED_RUNMODES="DOCKER KUBE"
#Supported run modes
SUPPORTED_RUNMODES="DOCKER KUBE"
@@
-221,11
+221,19
@@
for __httpx in $TESTED_PROTOCOLS ; do
start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE
fi
start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE
fi
+ __CONFIG_HEADER="NOHEADER"
+ if [ $RUNMODE == "KUBE" ]; then
+ __CONFIG_HEADER="HEADER"
+ else
+ if [[ "$A1PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then
+ __CONFIG_HEADER="HEADER"
+ fi
+ fi
if [[ $interface = *"SDNC"* ]]; then
start_sdnc
if [[ $interface = *"SDNC"* ]]; then
start_sdnc
- prepare_consul_config SDNC ".consul_config.json"
+ prepare_consul_config SDNC ".consul_config.json"
$__CONFIG_HEADER
else
else
- prepare_consul_config NOSDNC ".consul_config.json"
+ prepare_consul_config NOSDNC ".consul_config.json"
$__CONFIG_HEADER
fi
if [ $RUNMODE == "KUBE" ]; then
fi
if [ $RUNMODE == "KUBE" ]; then
@@
-297,6
+305,8
@@
for __httpx in $TESTED_PROTOCOLS ; do
echo "############## Health check ################"
echo "############################################"
echo "############## Health check ################"
echo "############################################"
+ sleep_wait 120 "Let A1PMS cofiguration take effect"
+
a1pms_api_get_status 200
a1pms_api_get_status_root 200
a1pms_api_get_status 200
a1pms_api_get_status_root 200