Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Removal of older test profiles
[nonrtric.git]
/
test
/
auto-test
/
FTC850.sh
diff --git
a/test/auto-test/FTC850.sh
b/test/auto-test/FTC850.sh
index
82e50f1
..
4b795c0
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="C
BS CONSUL CP CR MR PA RICSIM SDNC
"
+DOCKER_INCLUDED_IMAGES="C
P CR MR A1PMS 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
A1PMS 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="NGW"
+
#Supported test environment profiles
#Supported test environment profiles
-SUPPORTED_PROFILES="ONAP-
GUILIN ONAP-HONOLULU ORAN-CHERRY ORAN-DAWN
"
+SUPPORTED_PROFILES="ONAP-
JAKARTA ONAP-KOHN ONAP-LONDON ORAN-F-RELEASE ORAN-G-RELEASE ORAN-H-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 ####
@@
-47,26
+49,22
@@
SUPPORTED_RUNMODES="DOCKER KUBE"
# Tested variants of REST/DMAAP/SDNC config
TESTED_VARIANTS="REST REST+SDNC"
# Tested variants of REST/DMAAP/SDNC config
TESTED_VARIANTS="REST REST+SDNC"
-#Test a
gent
and simulator protocol versions (others are http only)
+#Test a
1pms
and simulator protocol versions (others are http only)
TESTED_PROTOCOLS="HTTP HTTPS"
NUM_RICS=20
NUM_POLICIES_PER_RIC=500
TESTED_PROTOCOLS="HTTP HTTPS"
NUM_RICS=20
NUM_POLICIES_PER_RIC=500
-generate_uuid
+generate_
policy_
uuid
-if [ "$PMS_VERSION" == "V2" ]; then
- notificationurl=$CR_SERVICE_PATH"/test"
-else
- notificationurl=""
-fi
+notificationurl=$CR_SERVICE_APP_PATH_0"/test"
for __httpx in $TESTED_PROTOCOLS ; do
for interface in $TESTED_VARIANTS ; do
echo "#####################################################################"
echo "#####################################################################"
for __httpx in $TESTED_PROTOCOLS ; do
for interface in $TESTED_VARIANTS ; do
echo "#####################################################################"
echo "#####################################################################"
- echo "### Testing a
gent
: "$interface" and "$__httpx
+ echo "### Testing a
1pms
: "$interface" and "$__httpx
echo "#####################################################################"
echo "#####################################################################"
echo "#####################################################################"
echo "#####################################################################"
@@
-77,7
+75,7
@@
for __httpx in $TESTED_PROTOCOLS ; do
if [[ $interface = *"SDNC"* ]]; then
use_sdnc_https
fi
if [[ $interface = *"SDNC"* ]]; then
use_sdnc_https
fi
- use_a
gent
_rest_https
+ use_a
1pms
_rest_https
else
use_cr_http
use_simulator_http
else
use_cr_http
use_simulator_http
@@
-85,42
+83,48
@@
for __httpx in $TESTED_PROTOCOLS ; do
if [[ $interface = *"SDNC"* ]]; then
use_sdnc_http
fi
if [[ $interface = *"SDNC"* ]]; then
use_sdnc_http
fi
- use_a
gent
_rest_http
+ use_a
1pms
_rest_http
fi
# Clean container and start all needed containers #
clean_environment
fi
# 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
+
+ start_a1pms NORPOXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE
+
+ set_a1pms_debug
- set_agent_debug
- if [ $RUNMODE == "DOCKER" ]; then
- start_consul_cbs
- fi
if [[ $interface = *"SDNC"* ]]; then
start_sdnc
if [[ $interface = *"SDNC"* ]]; then
start_sdnc
- prepare_
consul_config SDNC ".consul
_config.json"
+ prepare_
a1pms_config SDNC ".a1pms
_config.json"
else
else
- prepare_
consul_config NOSDNC ".consul
_config.json"
+ prepare_
a1pms_config NOSDNC ".a1pms
_config.json"
fi
if [ $RUNMODE == "KUBE" ]; then
fi
if [ $RUNMODE == "KUBE" ]; then
- a
gent_load_config ".consul
_config.json"
+ a
1pms_load_config ".a1pms
_config.json"
else
else
-
consul_config_app ".consul
_config.json"
+
a1pms_api_put_configuration 200 ".a1pms
_config.json"
fi
fi
- start_mr # Not used, but removes error messages from the agent log
+ start_mr # Not used, but removes error messages from the a1pms log
+
+ start_cr 1
- s
tart_cr
+ s
leep_wait 120 "Let A1PMS cofiguration take effect"
- api_get_status 200
+ a
1pms_a
pi_get_status 200
for ((i=1; i<=$NUM_RICS; i++))
do
for ((i=1; i<=$NUM_RICS; i++))
do
@@
-133,34
+137,26
@@
for __httpx in $TESTED_PROTOCOLS ; do
sim_put_policy_type 201 ricsim_g1_$i 1 testdata/OSC/sim_1.json
done
sim_put_policy_type 201 ricsim_g1_$i 1 testdata/OSC/sim_1.json
done
- if [ "$PMS_VERSION" == "V2" ]; then
- api_equal json:policy-types 1 300 #Wait for the agent to refresh types from the simulator
- else
- api_equal json:policy_types 1 300 #Wait for the agent to refresh types from the simulator
- fi
+ a1pms_equal json:policy-types 1 300 #Wait for the a1pms to refresh types from the simulator
- a
pi_put_service 201 "serv1" 600 "$CR_SERVICE_PATH
/1"
+ a
1pms_api_put_service 201 "serv1" 600 "$CR_SERVICE_APP_PATH_0
/1"
- echo "Check the number of types in the a
gent
for each ric is 1"
+ echo "Check the number of types in the a
1pms
for each ric is 1"
for ((i=1; i<=$NUM_RICS; i++))
do
for ((i=1; i<=$NUM_RICS; i++))
do
- if [ "$PMS_VERSION" == "V2" ]; then
- api_equal json:policy-types?ric_id=ricsim_g1_$i 1 120
- else
- api_equal json:policy_types?ric=ricsim_g1_$i 1 120
- fi
+ a1pms_equal json:policy-types?ric_id=ricsim_g1_$i 1 120
done
START_ID=2000
start_timer "Create $((NUM_POLICIES_PER_RIC*$NUM_RICS)) polices over $interface using "$__httpx
done
START_ID=2000
start_timer "Create $((NUM_POLICIES_PER_RIC*$NUM_RICS)) polices over $interface using "$__httpx
- api_put_policy_parallel 201 "serv1" ricsim_g1_ $NUM_RICS 1 $START_ID NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json $NUM_POLICIES_PER_RIC 7
+ a
1pms_a
pi_put_policy_parallel 201 "serv1" ricsim_g1_ $NUM_RICS 1 $START_ID NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json $NUM_POLICIES_PER_RIC 7
print_timer "Create $((NUM_POLICIES_PER_RIC*$NUM_RICS)) polices over $interface using "$__httpx
INSTANCES=$(($NUM_RICS*$NUM_POLICIES_PER_RIC))
print_timer "Create $((NUM_POLICIES_PER_RIC*$NUM_RICS)) polices over $interface using "$__httpx
INSTANCES=$(($NUM_RICS*$NUM_POLICIES_PER_RIC))
- a
pi
_equal json:policies $INSTANCES
+ a
1pms
_equal json:policies $INSTANCES
for ((i=1; i<=$NUM_RICS; i++))
do
for ((i=1; i<=$NUM_RICS; i++))
do
@@
-169,11
+165,11
@@
for __httpx in $TESTED_PROTOCOLS ; do
start_timer "Delete $((NUM_POLICIES_PER_RIC*$NUM_RICS)) polices over $interface using "$__httpx
start_timer "Delete $((NUM_POLICIES_PER_RIC*$NUM_RICS)) polices over $interface using "$__httpx
- api_delete_policy_parallel 204 $NUM_RICS $START_ID $NUM_POLICIES_PER_RIC 7
+ a
1pms_a
pi_delete_policy_parallel 204 $NUM_RICS $START_ID $NUM_POLICIES_PER_RIC 7
print_timer "Delete $((NUM_POLICIES_PER_RIC*$NUM_RICS)) polices over $interface using "$__httpx
print_timer "Delete $((NUM_POLICIES_PER_RIC*$NUM_RICS)) polices over $interface using "$__httpx
- a
pi
_equal json:policies 0
+ a
1pms
_equal json:policies 0
for ((i=1; i<=$NUM_RICS; i++))
do
for ((i=1; i<=$NUM_RICS; i++))
do
@@
-185,11
+181,11
@@
for __httpx in $TESTED_PROTOCOLS ; do
if [ $interface == "REST+SDNC" ]; then
sim_contains_str ricsim_g1_$i remote_hosts $SDNC_APP_NAME
else
if [ $interface == "REST+SDNC" ]; then
sim_contains_str ricsim_g1_$i remote_hosts $SDNC_APP_NAME
else
- sim_contains_str ricsim_g1_$i remote_hosts $
POLICY_AGENT
_APP_NAME
+ sim_contains_str ricsim_g1_$i remote_hosts $
A1PMS
_APP_NAME
fi
done
fi
done
- check_
policy_agent
_logs
+ check_
a1pms
_logs
if [[ $interface = *"SDNC"* ]]; then
check_sdnc_logs
fi
if [[ $interface = *"SDNC"* ]]; then
check_sdnc_logs
fi