Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Doc update with j-release links (master branch)
[nonrtric.git]
/
test
/
auto-test
/
FTC310.sh
diff --git
a/test/auto-test/FTC310.sh
b/test/auto-test/FTC310.sh
index
3edb022
..
c0205f7
100755
(executable)
--- a/
test/auto-test/FTC310.sh
+++ b/
test/auto-test/FTC310.sh
@@
-1,7
+1,8
@@
#!/bin/bash
# ============LICENSE_START===============================================
#!/bin/bash
# ============LICENSE_START===============================================
-# Copyright (C) 2020 Nordix Foundation. All rights reserved.
+# Copyright (C) 2020-2023 Nordix Foundation. All rights reserved.
+# Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved.
# ========================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# ========================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@
-18,102
+19,106
@@
#
#
-TC_ONELINE_DESCR="Resync of RIC via changes in the
consul
config"
+TC_ONELINE_DESCR="Resync of RIC via changes in the
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="CP CR MR A1PMS RICSIM KUBEPROXY
"
-#SUPPORTED TEST ENV FILE
-SUPPORTED_PROFILES="ONAP-MASTER ONAP-GUILIN"
+#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=""
-. ../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-KOHN ONAP-LONDON ONAP-MONTREAL ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE"
+#Supported run modes
+SUPPORTED_RUNMODES="DOCKER"
+
+. ../common/testcase_common.sh $@
+
+setup_testenvironment
#### TEST BEGIN ####
#### TEST BEGIN ####
-
generate
_uuid
+
sim_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
- start_ric_simulators ricsim_g3 1 STD_2.0.0
+start_ric_simulators ricsim_g3 1 STD_2.0.0
+
+if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+ :
+else
+ start_mr
fi
fi
-start_
mr
+start_
cr 1
-start_c
r
+start_c
ontrol_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE
-start_consul_cbs
-start_control_panel
-prepare_consul_config NOSDNC ".consul_config.json"
-
consul_config_app ".consul
_config.json"
+
prepare_a1pms_config NOSDNC ".a1pms
_config.json"
-if [ "$PMS_VERSION" == "V2" ]; then
- api_equal json:rics 3 120
+a1pms_api_put_configuration 200 ".a1pms_config.json"
+a1pms_api_get_configuration 200 ".a1pms_config.json"
-
cr_equal received_callbacks 3 12
0
+
a1pms_equal json:rics 3 30
0
- 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
+cr_equal 0 received_callbacks 3 120
+
+cr_api_check_all_sync_events 200 0 ric-registration ricsim_g1_1 ricsim_g2_1 ricsim_g3_1
# Add an STD RIC and check
# Add an STD RIC and check
+
start_ric_simulators ricsim_g2 2 STD_1.1.3
start_ric_simulators ricsim_g2 2 STD_1.1.3
-prepare_consul_config NOSDNC ".consul_config.json"
+prepare_a1pms_config NOSDNC ".a1pms_config.json"
+a1pms_api_put_configuration 200 ".a1pms_config.json"
+a1pms_api_get_configuration 200 ".a1pms_config.json"
-consul_config_app ".consul_config.json"
+a1pms_equal json:rics 4 120
-if [ "$PMS_VERSION" == "V2" ]; then
- api_equal json:rics 4 120
+cr_equal 0 received_callbacks 4 120
- cr_equal received_callbacks 4 120
+cr_api_check_all_sync_events 200 0 ric-registration ricsim_g2_2
- cr_api_check_all_sync_events 200 ric-registration ricsim_g2_2
-else
- api_equal json:rics 3 120
-fi
+check_a1pms_logs
-check_policy_agent_logs
-check_control_panel_logs
-
-# Remove one RIC RIC and check
+# Remove one RIC and check
start_ric_simulators ricsim_g2 1 STD_1.1.3
start_ric_simulators ricsim_g2 1 STD_1.1.3
-prepare_consul_config NOSDNC ".consul_config.json"
+prepare_a1pms_config NOSDNC ".a1pms_config.json"
+a1pms_api_put_configuration 200 ".a1pms_config.json"
+a1pms_api_get_configuration 200 ".a1pms_config.json"
-consul_config_app ".consul_config.json"
+a1pms_equal json:rics 3 120
-if [ "$PMS_VERSION" == "V2" ]; then
- api_equal json:rics 3 120
+cr_equal 0 received_callbacks 4 120
- cr_equal received_callbacks 4 120
-else
- api_equal json:rics 2 120
+if [ "$A1PMS_VERSION" == "V2" ]; then
+ a1pms_api_get_configuration 200 ".a1pms_config.json"
fi
fi
-check_policy_agent_logs
-check_control_panel_logs
+check_a1pms_logs
+
+store_logs END_$consul_conf
-store_logs END
#### TEST COMPLETE ####
#### TEST COMPLETE ####
@@
-121,4
+126,4
@@
store_logs END
print_result
print_result
-auto_clean_
containers
+auto_clean_
environment