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
/
FTC310.sh
diff --git
a/test/auto-test/FTC310.sh
b/test/auto-test/FTC310.sh
index
994d0ca
..
c6f063a
100755
(executable)
--- a/
test/auto-test/FTC310.sh
+++ b/
test/auto-test/FTC310.sh
@@
-20,51
+20,62
@@
TC_ONELINE_DESCR="Resync of RIC via changes in the consul config or pushed config"
TC_ONELINE_DESCR="Resync of RIC via changes in the consul config or pushed config"
-#App names to include in the test, space separated list
-
INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM
"
+#App names to include in the test
when running docker
, space separated list
+
DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR A1PMS RICSIM KUBEPROXY
"
-#SUPPORTED TEST ENV FILE
-SUPPORTED_PROFILES="ONAP-MASTER ONAP-GUILIN ORAN-MASTER"
+#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="CBS CONSUL"
-. ../common/testcase_common.sh $@
-. ../common/agent_api_functions.sh
-. ../common/ricsimulator_api_functions.sh
-. ../common/cr_api_functions.sh
+#Supported test environment profiles
+SUPPORTED_PROFILES="ONAP-GUILIN ONAP-HONOLULU ONAP-ISTANBUL ONAP-JAKARTA ORAN-CHERRY ORAN-D-RELEASE ORAN-E-RELEASE ORAN-F-RELEASE"
+#Supported run modes
+SUPPORTED_RUNMODES="DOCKER"
+
+. ../common/testcase_common.sh $@
+
+setup_testenvironment
#### TEST BEGIN ####
#### TEST BEGIN ####
-if [ "$PMS_VERSION" == "V2" ]; then
+if [ "$
A1
PMS_VERSION" == "V2" ]; then
TESTED_VARIANTS="CONSUL NOCONSUL"
TESTED_VARIANTS="CONSUL NOCONSUL"
+ if [[ "$A1PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then
+ TESTED_VARIANTS="NOCONSUL"
+ fi
else
TESTED_VARIANTS="CONSUL"
fi
for consul_conf in $TESTED_VARIANTS ; do
else
TESTED_VARIANTS="CONSUL"
fi
for consul_conf in $TESTED_VARIANTS ; do
- generate_uuid
+ generate_
policy_
uuid
# Clean container and start all needed containers #
# Clean container and start all needed containers #
- clean_
containers
+ clean_
environment
- start_
policy_agent
+ start_
kube_proxy
- set_agent_trace
+ start_a1pms NOPROXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE
+
+ set_a1pms_trace
# Create service to be able to receive events when rics becomes available
# Create service to be able to receive events when rics becomes available
- # Must use rest towards the a
gent
since dmaap is not configured yet
- a
pi_put_service 201 "ric-registration" 0 "$CR_PATH
/ric-registration"
+ # Must use rest towards the a
1pms
since dmaap is not configured yet
+ a
1pms_api_put_service 201 "ric-registration" 0 "$CR_SERVICE_APP_PATH_0
/ric-registration"
# Start one RIC of each type
start_ric_simulators ricsim_g1 1 OSC_2.1.0
start_ric_simulators ricsim_g2 1 STD_1.1.3
# Start one RIC of each type
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_mr
start_ric_simulators ricsim_g3 1 STD_2.0.0
fi
start_mr
- start_cr
+ start_cr
1
- 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
@@
-72,72
+83,71
@@
for consul_conf in $TESTED_VARIANTS ; do
prepare_consul_config NOSDNC ".consul_config.json"
prepare_consul_config NOSDNC ".consul_config.json"
- if [ "$PMS_VERSION" == "V2" ] && [ $consul_conf == "NOCONSUL" ]; then
- api_put_configuration 200 ".consul_config.json"
- api_get_configuration 200 ".consul_config.json"
+ if [ "$
A1
PMS_VERSION" == "V2" ] && [ $consul_conf == "NOCONSUL" ]; then
+ a
1pms_a
pi_put_configuration 200 ".consul_config.json"
+ a
1pms_a
pi_get_configuration 200 ".consul_config.json"
else
consul_config_app ".consul_config.json"
fi
else
consul_config_app ".consul_config.json"
fi
- if [ "$PMS_VERSION" == "V2" ]; then
- a
pi_equal json:rics 3 12
0
+ if [ "$
A1
PMS_VERSION" == "V2" ]; then
+ a
1pms_equal json:rics 3 30
0
- cr_equal received_callbacks 3 120
+ cr_equal
0
received_callbacks 3 120
- cr_api_check_all_sync_events 200 ric-registration ricsim_g1_1 ricsim_g2_1 ricsim_g3_1
+ cr_api_check_all_sync_events 200
0
ric-registration ricsim_g1_1 ricsim_g2_1 ricsim_g3_1
else
else
- a
pi_equal json:rics 2 12
0
+ a
1pms_equal json:rics 2 30
0
fi
# Add an STD RIC and check
start_ric_simulators ricsim_g2 2 STD_1.1.3
prepare_consul_config NOSDNC ".consul_config.json"
fi
# Add an STD RIC and check
start_ric_simulators ricsim_g2 2 STD_1.1.3
prepare_consul_config NOSDNC ".consul_config.json"
- if [ "$PMS_VERSION" == "V2" ] && [ $consul_conf == "NOCONSUL" ]; then
- api_put_configuration 200 ".consul_config.json"
- api_get_configuration 200 ".consul_config.json"
+ if [ "$
A1
PMS_VERSION" == "V2" ] && [ $consul_conf == "NOCONSUL" ]; then
+ a
1pms_a
pi_put_configuration 200 ".consul_config.json"
+ a
1pms_a
pi_get_configuration 200 ".consul_config.json"
else
consul_config_app ".consul_config.json"
fi
else
consul_config_app ".consul_config.json"
fi
- if [ "$PMS_VERSION" == "V2" ]; then
- a
pi
_equal json:rics 4 120
+ if [ "$
A1
PMS_VERSION" == "V2" ]; then
+ a
1pms
_equal json:rics 4 120
- cr_equal received_callbacks 4 120
+ cr_equal
0
received_callbacks 4 120
- cr_api_check_all_sync_events 200 ric-registration ricsim_g2_2
+ cr_api_check_all_sync_events 200
0
ric-registration ricsim_g2_2
else
else
- a
pi
_equal json:rics 3 120
+ a
1pms
_equal json:rics 3 120
fi
fi
- check_
policy_agent
_logs
- check_control_panel_logs
+ check_
a1pms
_logs
+
# Remove one RIC RIC and check
start_ric_simulators ricsim_g2 1 STD_1.1.3
prepare_consul_config NOSDNC ".consul_config.json"
# Remove one RIC RIC and check
start_ric_simulators ricsim_g2 1 STD_1.1.3
prepare_consul_config NOSDNC ".consul_config.json"
- if [ "$PMS_VERSION" == "V2" ] && [ $consul_conf == "NOCONSUL" ]; then
- api_put_configuration 200 ".consul_config.json"
- api_get_configuration 200 ".consul_config.json"
+ if [ "$
A1
PMS_VERSION" == "V2" ] && [ $consul_conf == "NOCONSUL" ]; then
+ a
1pms_a
pi_put_configuration 200 ".consul_config.json"
+ a
1pms_a
pi_get_configuration 200 ".consul_config.json"
else
consul_config_app ".consul_config.json"
fi
else
consul_config_app ".consul_config.json"
fi
- if [ "$PMS_VERSION" == "V2" ]; then
- a
pi
_equal json:rics 3 120
+ if [ "$
A1
PMS_VERSION" == "V2" ]; then
+ a
1pms
_equal json:rics 3 120
- cr_equal received_callbacks 4 120
+ cr_equal
0
received_callbacks 4 120
else
else
- a
pi
_equal json:rics 2 120
+ a
1pms
_equal json:rics 2 120
fi
fi
- if [ "$PMS_VERSION" == "V2" ] && [ $consul_conf == "NOCONSUL" ]; then
- api_get_configuration 200 ".consul_config.json"
+ if [ "$
A1
PMS_VERSION" == "V2" ] && [ $consul_conf == "NOCONSUL" ]; then
+ a
1pms_a
pi_get_configuration 200 ".consul_config.json"
fi
fi
- check_policy_agent_logs
- check_control_panel_logs
+ check_a1pms_logs
store_logs END_$consul_conf
done
store_logs END_$consul_conf
done
@@
-148,4
+158,4
@@
done
print_result
print_result
-auto_clean_
containers
+auto_clean_
environment