Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Image version updates for test
[nonrtric.git]
/
test
/
auto-test
/
FTC805.sh
diff --git
a/test/auto-test/FTC805.sh
b/test/auto-test/FTC805.sh
index
a9268a2
..
c4981a1
100755
(executable)
--- a/
test/auto-test/FTC805.sh
+++ b/
test/auto-test/FTC805.sh
@@
-17,13
+17,13
@@
# ============LICENSE_END=================================================
#
# ============LICENSE_END=================================================
#
-TC_ONELINE_DESCR="PMS Create 10000 policies and restart, test polices persistency"
+TC_ONELINE_DESCR="
A1
PMS Create 10000 policies and restart, test polices persistency"
#App names to include in the test when running docker, space separated list
#App names to include in the test when running docker, space separated list
-DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR
PA
RICSIM SDNC NGW KUBEPROXY"
+DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR
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
PA
RICSIM SDNC KUBEPROXY NGW"
+KUBE_INCLUDED_IMAGES="CP CR
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=""
@@
-33,7
+33,7
@@
KUBE_PRESTARTED_IMAGES=""
CONDITIONALLY_IGNORED_IMAGES="CBS CONSUL NGW"
#Supported test environment profiles
CONDITIONALLY_IGNORED_IMAGES="CBS CONSUL NGW"
#Supported test environment profiles
-SUPPORTED_PROFILES="ONAP-ISTANBUL ONAP-JAKARTA O
RAN-D-RELEASE ORAN-E-RELEASE ORAN-F
-RELEASE"
+SUPPORTED_PROFILES="ONAP-ISTANBUL ONAP-JAKARTA O
NAP-KOHN ONAP-LONDON ORAN-D-RELEASE ORAN-E-RELEASE ORAN-F-RELEASE ORAN-G
-RELEASE"
#Supported run modes
SUPPORTED_RUNMODES="DOCKER KUBE"
#Supported run modes
SUPPORTED_RUNMODES="DOCKER KUBE"
@@
-49,7
+49,7
@@
setup_testenvironment
# Tested variants of REST/DMAAP/SDNC config
TESTED_VARIANTS="REST"
# Tested variants of REST/DMAAP/SDNC config
TESTED_VARIANTS="REST"
-#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"
NUM_RICS=5
TESTED_PROTOCOLS="HTTP"
NUM_RICS=5
@@
-58,7
+58,7
@@
NUM_POLICIES_PER_RIC=2000
generate_policy_uuid
generate_policy_uuid
-if [ "$PMS_VERSION" == "V2" ]; then
+if [ "$
A1
PMS_VERSION" == "V2" ]; then
notificationurl=$CR_SERVICE_APP_PATH_0"/test"
else
notificationurl=""
notificationurl=$CR_SERVICE_APP_PATH_0"/test"
else
notificationurl=""
@@
-69,7
+69,7
@@
for __httpx in $TESTED_PROTOCOLS ; do
echo "#####################################################################"
echo "#####################################################################"
echo "#####################################################################"
echo "#####################################################################"
- echo "### Testing a
gent
: "$interface" and "$__httpx
+ echo "### Testing a
1pms
: "$interface" and "$__httpx
echo "#####################################################################"
echo "#####################################################################"
echo "#####################################################################"
echo "#####################################################################"
@@
-79,14
+79,14
@@
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
if [[ $interface = *"SDNC"* ]]; then
use_sdnc_http
fi
else
use_cr_http
use_simulator_http
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 #
fi
# Clean container and start all needed containers #
@@
-102,22
+102,31
@@
for __httpx in $TESTED_PROTOCOLS ; do
start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE
fi
start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE
fi
- start_
policy_agent NORPOXY $SIM_GROUP/$POLICY_AGENT_COMPOSE_DIR/$POLICY_AGENT
_CONFIG_FILE
+ start_
a1pms NORPOXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS
_CONFIG_FILE
- set_agent_debug
+ set_a1pms_debug
+
+ __CONFIG_HEADER="NOHEADER"
+ if [ $RUNMODE == "KUBE" ]; then
+ __CONFIG_HEADER="HEADER"
+ else
+ if [[ "$A1PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then
+ __CONFIG_HEADER="HEADER"
+ fi
+ fi
if [[ $interface = *"SDNC"* ]]; then
start_sdnc
if [[ $interface = *"SDNC"* ]]; then
start_sdnc
- prepare_consul_config SDNC ".consul_config.json"
+ prepare_consul_config SDNC ".consul_config.json"
$__CONFIG_HEADER
else
else
- prepare_consul_config NOSDNC ".consul_config.json"
+ prepare_consul_config NOSDNC ".consul_config.json"
$__CONFIG_HEADER
fi
if [ $RUNMODE == "KUBE" ]; then
fi
if [ $RUNMODE == "KUBE" ]; then
- a
gent
_load_config ".consul_config.json"
+ a
1pms
_load_config ".consul_config.json"
else
else
- if [[ "$PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then
- api_put_configuration 200 ".consul_config.json"
+ if [[ "$
A1
PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then
+ a
1pms_a
pi_put_configuration 200 ".consul_config.json"
else
start_consul_cbs
consul_config_app ".consul_config.json"
else
start_consul_cbs
consul_config_app ".consul_config.json"
@@
-126,7
+135,9
@@
for __httpx in $TESTED_PROTOCOLS ; do
start_cr 1
start_cr 1
- api_get_status 200
+ sleep_wait 120 "Let A1PMS cofiguration take effect"
+
+ a1pms_api_get_status 200
for ((i=1; i<=$NUM_RICS; i++))
do
for ((i=1; i<=$NUM_RICS; i++))
do
@@
-139,21
+150,21
@@
for __httpx in $TESTED_PROTOCOLS ; do
sim_put_policy_type 201 ricsim_g1_$i STD_QOS_0_2_0 testdata/STD2/sim_qos.json
done
sim_put_policy_type 201 ricsim_g1_$i STD_QOS_0_2_0 testdata/STD2/sim_qos.json
done
- if [ "$PMS_VERSION" == "V2" ]; then
- a
pi_equal json:policy-types 1 300 #Wait for the agent
to refresh types from the simulator
+ if [ "$
A1
PMS_VERSION" == "V2" ]; then
+ a
1pms_equal json:policy-types 1 300 #Wait for the a1pms
to refresh types from the simulator
else
else
- a
pi_equal json:policy_types 1 300 #Wait for the agent
to refresh types from the simulator
+ a
1pms_equal json:policy_types 1 300 #Wait for the a1pms
to refresh types from the simulator
fi
fi
- api_put_service 201 "serv1" 0 "$CR_SERVICE_APP_PATH_0/1"
+ a
1pms_a
pi_put_service 201 "serv1" 0 "$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
- a
pi
_equal json:policy-types?ric_id=ricsim_g1_$i 1 120
+ if [ "$
A1
PMS_VERSION" == "V2" ]; then
+ a
1pms
_equal json:policy-types?ric_id=ricsim_g1_$i 1 120
else
else
- a
pi
_equal json:policy_types?ric=ricsim_g1_$i 1 120
+ a
1pms
_equal json:policy_types?ric=ricsim_g1_$i 1 120
fi
done
fi
done
@@
-161,29
+172,29
@@
for __httpx in $TESTED_PROTOCOLS ; do
start_timer "Create $((NUM_POLICIES_PER_RIC*$NUM_RICS)) polices over $interface using "$__httpx
start_timer "Create $((NUM_POLICIES_PER_RIC*$NUM_RICS)) polices over $interface using "$__httpx
- api_put_policy_parallel 201 "serv1" ricsim_g1_ $NUM_RICS STD_QOS_0_2_0 $START_ID NOTRANSIENT $notificationurl testdata/STD/pi1_template.json $NUM_POLICIES_PER_RIC 7
+ a
1pms_a
pi_put_policy_parallel 201 "serv1" ricsim_g1_ $NUM_RICS STD_QOS_0_2_0 $START_ID NOTRANSIENT $notificationurl testdata/STD/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
sim_equal ricsim_g1_$i num_instances $NUM_POLICIES_PER_RIC
done
for ((i=1; i<=$NUM_RICS; i++))
do
sim_equal ricsim_g1_$i num_instances $NUM_POLICIES_PER_RIC
done
- api_get_services 200 "serv1" "serv1" 0 "$CR_SERVICE_APP_PATH_0/1"
+ a
1pms_a
pi_get_services 200 "serv1" "serv1" 0 "$CR_SERVICE_APP_PATH_0/1"
- stop_
policy_agent
+ stop_
a1pms
- start_stopped_
policy_agent
+ start_stopped_
a1pms
- set_a
gent
_debug
+ set_a
1pms
_debug
- a
pi
_equal json:policies $INSTANCES 500
+ a
1pms
_equal json:policies $INSTANCES 500
- stop_
policy_agent
+ stop_
a1pms
for ((i=1; i<=$NUM_RICS; i++))
do
for ((i=1; i<=$NUM_RICS; i++))
do
@@
-195,13
+206,13
@@
for __httpx in $TESTED_PROTOCOLS ; do
sim_equal ricsim_g1_$i num_instances 0
done
sim_equal ricsim_g1_$i num_instances 0
done
- start_stopped_
policy_agent
+ start_stopped_
a1pms
- set_a
gent
_debug
+ set_a
1pms
_debug
start_timer "Restore $((NUM_POLICIES_PER_RIC*$NUM_RICS)) polices after restart over $interface using "$__httpx
start_timer "Restore $((NUM_POLICIES_PER_RIC*$NUM_RICS)) polices after restart over $interface using "$__httpx
- a
pi
_equal json:policies $INSTANCES 500
+ a
1pms
_equal json:policies $INSTANCES 500
for ((i=1; i<=$NUM_RICS; i++))
do
for ((i=1; i<=$NUM_RICS; i++))
do
@@
-210,28
+221,28
@@
for __httpx in $TESTED_PROTOCOLS ; do
print_timer "Restore $((NUM_POLICIES_PER_RIC*$NUM_RICS)) polices after restart over $interface using "$__httpx
print_timer "Restore $((NUM_POLICIES_PER_RIC*$NUM_RICS)) polices after restart over $interface using "$__httpx
- api_get_services 200 "serv1" "serv1" 0 "$CR_SERVICE_APP_PATH_0/1"
+ a
1pms_a
pi_get_services 200 "serv1" "serv1" 0 "$CR_SERVICE_APP_PATH_0/1"
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
sim_equal ricsim_g1_$i num_instances 0
done
for ((i=1; i<=$NUM_RICS; i++))
do
sim_equal ricsim_g1_$i num_instances 0
done
- stop_
policy_agent
+ stop_
a1pms
- start_stopped_
policy_agent
+ start_stopped_
a1pms
- set_a
gent
_debug
+ set_a
1pms
_debug
- 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
@@
-240,9
+251,9
@@
for __httpx in $TESTED_PROTOCOLS ; do
sleep_wait 200
sleep_wait 200
- api_get_services 200 "serv1" "serv1" 0 "$CR_SERVICE_APP_PATH_0/1"
+ a
1pms_a
pi_get_services 200 "serv1" "serv1" 0 "$CR_SERVICE_APP_PATH_0/1"
- 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
@@
-254,11
+265,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