Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Minor bugs fix in ORU-app simulator
[nonrtric.git]
/
test
/
auto-test
/
FTC850.sh
diff --git
a/test/auto-test/FTC850.sh
b/test/auto-test/FTC850.sh
index
82e50f1
..
f9f5be3
100755
(executable)
--- a/
test/auto-test/FTC850.sh
+++ b/
test/auto-test/FTC850.sh
@@
-20,24
+20,26
@@
TC_ONELINE_DESCR="Create/delete policies in parallel over a number of rics using a number of child process"
#App names to include in the test when running docker, space separated list
TC_ONELINE_DESCR="Create/delete policies in parallel over a number of rics using a number of child process"
#App names to include in the test when running docker, space separated list
-DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM SDNC"
+DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM SDNC
NGW KUBEPROXY
"
#App names to include in the test when running kubernetes, space separated list
#App names to include in the test when running kubernetes, space separated list
-KUBE_INCLUDED_IMAGES="CP CR MR PA RICSIM SDNC"
+KUBE_INCLUDED_IMAGES="CP CR MR PA RICSIM SDNC
KUBEPROXY NGW
"
#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list
KUBE_PRESTARTED_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="CBS CONSUL NGW"
+
#Supported test environment profiles
#Supported test environment profiles
-SUPPORTED_PROFILES="ONAP-GUILIN ONAP-HONOLULU
ORAN-CHERRY ORAN-DAWN
"
+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 KUBE"
#Supported run modes
SUPPORTED_RUNMODES="DOCKER KUBE"
-. ../common/testcase_common.sh $@
-. ../common/agent_api_functions.sh
-. ../common/ricsimulator_api_functions.sh
-. ../common/mr_api_functions.sh
-. ../common/control_panel_api_functions.sh
-. ../common/controller_api_functions.sh
+. ../common/testcase_common.sh $@
+
+setup_testenvironment
#### TEST BEGIN ####
#### TEST BEGIN ####
@@
-53,10
+55,10
@@
TESTED_PROTOCOLS="HTTP HTTPS"
NUM_RICS=20
NUM_POLICIES_PER_RIC=500
NUM_RICS=20
NUM_POLICIES_PER_RIC=500
-generate_uuid
+generate_
policy_
uuid
if [ "$PMS_VERSION" == "V2" ]; then
if [ "$PMS_VERSION" == "V2" ]; then
- notificationurl=$CR_SERVICE_
PATH
"/test"
+ notificationurl=$CR_SERVICE_
APP_PATH_0
"/test"
else
notificationurl=""
fi
else
notificationurl=""
fi
@@
-91,17
+93,19
@@
for __httpx in $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_ric_simulators ricsim_g1 $NUM_RICS OSC_2.1.0
start_ric_simulators ricsim_g1 $NUM_RICS OSC_2.1.0
- start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/
application.properties
+ start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/
$CONTROL_PANEL_CONFIG_FILE
- start_policy_agent NORPOXY $SIM_GROUP/$POLICY_AGENT_COMPOSE_DIR/application.yaml
+ if [ ! -z "$NRT_GATEWAY_APP_NAME" ]; then
+ start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE
+ fi
- s
et_agent_debug
+ s
tart_policy_agent NORPOXY $SIM_GROUP/$POLICY_AGENT_COMPOSE_DIR/$POLICY_AGENT_CONFIG_FILE
- if [ $RUNMODE == "DOCKER" ]; then
- start_consul_cbs
- fi
+ set_agent_debug
if [[ $interface = *"SDNC"* ]]; then
start_sdnc
if [[ $interface = *"SDNC"* ]]; then
start_sdnc
@@
-113,12
+117,17
@@
for __httpx in $TESTED_PROTOCOLS ; do
if [ $RUNMODE == "KUBE" ]; then
agent_load_config ".consul_config.json"
else
if [ $RUNMODE == "KUBE" ]; then
agent_load_config ".consul_config.json"
else
- consul_config_app ".consul_config.json"
+ if [[ "$PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then
+ api_put_configuration 200 ".consul_config.json"
+ else
+ start_consul_cbs
+ consul_config_app ".consul_config.json"
+ fi
fi
start_mr # Not used, but removes error messages from the agent log
fi
start_mr # Not used, but removes error messages from the agent log
- start_cr
+ start_cr
1
api_get_status 200
api_get_status 200
@@
-139,7
+148,7
@@
for __httpx in $TESTED_PROTOCOLS ; do
api_equal json:policy_types 1 300 #Wait for the agent to refresh types from the simulator
fi
api_equal json:policy_types 1 300 #Wait for the agent to refresh types from the simulator
fi
- api_put_service 201 "serv1" 600 "$CR_SERVICE_
PATH
/1"
+ api_put_service 201 "serv1" 600 "$CR_SERVICE_
APP_PATH_0
/1"
echo "Check the number of types in the agent for each ric is 1"
for ((i=1; i<=$NUM_RICS; i++))
echo "Check the number of types in the agent for each ric is 1"
for ((i=1; i<=$NUM_RICS; i++))