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 file for ECS"
[nonrtric.git]
/
test
/
auto-test
/
FTC310.sh
diff --git
a/test/auto-test/FTC310.sh
b/test/auto-test/FTC310.sh
index
18d6816
..
3edb022
100755
(executable)
--- a/
test/auto-test/FTC310.sh
+++ b/
test/auto-test/FTC310.sh
@@
-20,23
+20,38
@@
TC_ONELINE_DESCR="Resync of RIC via changes in the consul config"
TC_ONELINE_DESCR="Resync of RIC via changes in the consul config"
-#App names to exclude checking pulling images for, space separated list
-EXCLUDED_IMAGES="SDNC_ONAP"
+#App names to include in the test, space separated list
+INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM"
+
+#SUPPORTED TEST ENV FILE
+SUPPORTED_PROFILES="ONAP-MASTER ONAP-GUILIN"
. ../common/testcase_common.sh $@
. ../common/agent_api_functions.sh
. ../common/ricsimulator_api_functions.sh
. ../common/testcase_common.sh $@
. ../common/agent_api_functions.sh
. ../common/ricsimulator_api_functions.sh
-. ../common/c
ontrolle
r_api_functions.sh
+. ../common/cr_api_functions.sh
#### TEST BEGIN ####
#### TEST BEGIN ####
+generate_uuid
# Clean container and start all needed containers #
clean_containers
# Clean container and start all needed containers #
clean_containers
+start_policy_agent
+
+set_agent_trace
+
+# Create service to be able to receive events when rics becomes available
+# Must use rest towards the agent since dmaap is not configured yet
+api_put_service 201 "ric-registration" 0 "$CR_PATH/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
+ start_ric_simulators ricsim_g3 1 STD_2.0.0
+fi
start_mr
start_mr
@@
-44,37
+59,56
@@
start_cr
start_consul_cbs
start_consul_cbs
+start_control_panel
+
prepare_consul_config NOSDNC ".consul_config.json"
consul_config_app ".consul_config.json"
prepare_consul_config NOSDNC ".consul_config.json"
consul_config_app ".consul_config.json"
-start_control_panel
-
-start_policy_agent
+if [ "$PMS_VERSION" == "V2" ]; then
+ api_equal json:rics 3 120
-
api_equal json:rics 2
120
+
cr_equal received_callbacks 3
120
+ cr_api_check_all_sync_events 200 ric-registration ricsim_g1_1 ricsim_g2_1 ricsim_g3_1
+else
+ api_equal json:rics 2 120
+fi
-# Add an
OSC
RIC and check
+# Add an
STD
RIC and check
start_ric_simulators ricsim_g2 2 STD_1.1.3
prepare_consul_config NOSDNC ".consul_config.json"
consul_config_app ".consul_config.json"
start_ric_simulators ricsim_g2 2 STD_1.1.3
prepare_consul_config NOSDNC ".consul_config.json"
consul_config_app ".consul_config.json"
-api_equal json:rics 3 120
+if [ "$PMS_VERSION" == "V2" ]; then
+ api_equal json:rics 4 120
+
+ cr_equal received_callbacks 4 120
+
+ cr_api_check_all_sync_events 200 ric-registration ricsim_g2_2
+else
+ api_equal json:rics 3 120
+fi
check_policy_agent_logs
check_control_panel_logs
check_policy_agent_logs
check_control_panel_logs
-# Remove one
OS
C RIC and check
+# Remove one
RI
C RIC and check
start_ric_simulators ricsim_g2 1 STD_1.1.3
prepare_consul_config NOSDNC ".consul_config.json"
consul_config_app ".consul_config.json"
start_ric_simulators ricsim_g2 1 STD_1.1.3
prepare_consul_config NOSDNC ".consul_config.json"
consul_config_app ".consul_config.json"
-api_equal json:rics 2 120
+if [ "$PMS_VERSION" == "V2" ]; then
+ api_equal json:rics 3 120
+
+ cr_equal received_callbacks 4 120
+else
+ api_equal json:rics 2 120
+fi
check_policy_agent_logs
check_control_panel_logs
check_policy_agent_logs
check_control_panel_logs