Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Use retry when calling DMaaP and ECS
[nonrtric.git]
/
test
/
auto-test
/
FTC310.sh
diff --git
a/test/auto-test/FTC310.sh
b/test/auto-test/FTC310.sh
index
994d0ca
..
33e4966
100755
(executable)
--- a/
test/auto-test/FTC310.sh
+++ b/
test/auto-test/FTC310.sh
@@
-20,16
+20,25
@@
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 PA RICSIM NGW
"
-#SUPPORTED TEST ENV FILE
-SUPPORTED_PROFILES="ONAP-MASTER ONAP-GUILIN ORAN-MASTER"
+#Supported test environment profiles
+SUPPORTED_PROFILES="ONAP-GUILIN ONAP-HONOLULU ONAP-ISTANBUL ORAN-CHERRY ORAN-D-RELEASE ORAN-E-RELEASE"
+#Supported run modes
+SUPPORTED_RUNMODES="DOCKER"
. ../common/testcase_common.sh $@
. ../common/agent_api_functions.sh
. ../common/ricsimulator_api_functions.sh
. ../common/cr_api_functions.sh
. ../common/testcase_common.sh $@
. ../common/agent_api_functions.sh
. ../common/ricsimulator_api_functions.sh
. ../common/cr_api_functions.sh
+. ../common/mr_api_functions.sh
+. ../common/control_panel_api_functions.sh
+. ../common/controller_api_functions.sh
+. ../common/consul_cbs_functions.sh
+. ../common/gateway_api_functions.sh
+
+setup_testenvironment
#### TEST BEGIN ####
#### TEST BEGIN ####
@@
-40,18
+49,18
@@
else
fi
for consul_conf in $TESTED_VARIANTS ; do
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_policy_agent
NOPROXY $SIM_GROUP/$POLICY_AGENT_COMPOSE_DIR/$POLICY_AGENT_CONFIG_FILE
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
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"
+ api_put_service 201 "ric-registration" 0 "$CR_
SERVICE_
PATH/ric-registration"
# Start one RIC of each type
start_ric_simulators ricsim_g1 1 OSC_2.1.0
# Start one RIC of each type
start_ric_simulators ricsim_g1 1 OSC_2.1.0
@@
-64,7
+73,7
@@
for consul_conf in $TESTED_VARIANTS ; do
start_cr
start_cr
- 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
@@
-80,13
+89,13
@@
for consul_conf in $TESTED_VARIANTS ; do
fi
if [ "$PMS_VERSION" == "V2" ]; then
fi
if [ "$PMS_VERSION" == "V2" ]; then
- api_equal json:rics 3
12
0
+ api_equal json:rics 3
30
0
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
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
12
0
+ api_equal json:rics 2
30
0
fi
# Add an STD RIC and check
fi
# Add an STD RIC and check
@@
-111,7
+120,7
@@
for consul_conf in $TESTED_VARIANTS ; do
fi
check_policy_agent_logs
fi
check_policy_agent_logs
- check_control_panel_logs
+
# Remove one RIC RIC and check
start_ric_simulators ricsim_g2 1 STD_1.1.3
# Remove one RIC RIC and check
start_ric_simulators ricsim_g2 1 STD_1.1.3
@@
-137,7
+146,7
@@
for consul_conf in $TESTED_VARIANTS ; do
fi
check_policy_agent_logs
fi
check_policy_agent_logs
- check_
control_panel
_logs
+ check_
sdnc
_logs
store_logs END_$consul_conf
done
store_logs END_$consul_conf
done
@@
-148,4
+157,4
@@
done
print_result
print_result
-auto_clean_
containers
+auto_clean_
environment