Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix a typo in autotest log output
[nonrtric.git]
/
test
/
auto-test
/
FTC805.sh
diff --git
a/test/auto-test/FTC805.sh
b/test/auto-test/FTC805.sh
index
c4981a1
..
544d65f
100755
(executable)
--- a/
test/auto-test/FTC805.sh
+++ b/
test/auto-test/FTC805.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.
@@
-20,20
+21,20
@@
TC_ONELINE_DESCR="A1PMS Create 10000 policies and restart, test polices persistency"
#App names to include in the test when running docker, space separated list
TC_ONELINE_DESCR="A1PMS Create 10000 policies and restart, test polices persistency"
#App names to include in the test when running docker, space separated list
-DOCKER_INCLUDED_IMAGES="C
BS CONSUL C
P CR A1PMS RICSIM SDNC NGW KUBEPROXY"
+DOCKER_INCLUDED_IMAGES="CP CR A1PMS RICSIM SDNC NGW KUBEPROXY"
#App names to include in the test when running kubernetes, space separated list
KUBE_INCLUDED_IMAGES="CP CR A1PMS RICSIM SDNC KUBEPROXY NGW"
#App names to include in the test when running kubernetes, space separated list
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
+#Pre
-
started 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
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"
+CONDITIONALLY_IGNORED_IMAGES="NGW"
#Supported test environment profiles
#Supported test environment profiles
-SUPPORTED_PROFILES="ONAP-
ISTANBUL ONAP-JAKARTA ONAP-KOHN ONAP-LONDON ORAN-D-RELEASE ORAN-E-RELEASE ORAN-F-RELEASE ORAN-G
-RELEASE"
+SUPPORTED_PROFILES="ONAP-
KOHN ONAP-LONDON ONAP-MONTREAL ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I
-RELEASE"
#Supported run modes
SUPPORTED_RUNMODES="DOCKER KUBE"
#Supported run modes
SUPPORTED_RUNMODES="DOCKER KUBE"
@@
-56,13
+57,9
@@
NUM_RICS=5
NUM_POLICIES_PER_RIC=2000
NUM_POLICIES_PER_RIC=2000
-generate_policy_uuid
+
sim_
generate_policy_uuid
-if [ "$A1PMS_VERSION" == "V2" ]; then
- notificationurl=$CR_SERVICE_APP_PATH_0"/test"
-else
- notificationurl=""
-fi
+notificationurl=$CR_SERVICE_APP_PATH_0"/test"
for __httpx in $TESTED_PROTOCOLS ; do
for interface in $TESTED_VARIANTS ; do
for __httpx in $TESTED_PROTOCOLS ; do
for interface in $TESTED_VARIANTS ; do
@@
-77,7
+74,12
@@
for __httpx in $TESTED_PROTOCOLS ; do
use_cr_https
use_simulator_https
if [[ $interface = *"SDNC"* ]]; then
use_cr_https
use_simulator_https
if [[ $interface = *"SDNC"* ]]; then
- use_sdnc_https
+ if [[ "$SDNC_FEATURE_LEVEL" == *"NO_NB_HTTPS"* ]]; then
+ deviation "SDNC does not support NB https"
+ use_sdnc_http
+ else
+ use_sdnc_https
+ fi
fi
use_a1pms_rest_https
else
fi
use_a1pms_rest_https
else
@@
-106,36
+108,25
@@
for __httpx in $TESTED_PROTOCOLS ; do
set_a1pms_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" $__CONFIG_HEADER
+ controller_api_wait_for_status_ok 200 ricsim_g1_1
+ prepare_a1pms_config SDNC ".a1pms_config.json"
else
else
- prepare_
consul_config NOSDNC ".consul_config.json" $__CONFIG_HEADER
+ prepare_
a1pms_config NOSDNC ".a1pms_config.json"
fi
if [ $RUNMODE == "KUBE" ]; then
fi
if [ $RUNMODE == "KUBE" ]; then
- a1pms_load_config ".
consul
_config.json"
+ a1pms_load_config ".
a1pms
_config.json"
else
else
- if [[ "$A1PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then
- a1pms_api_put_configuration 200 ".consul_config.json"
- else
- start_consul_cbs
- consul_config_app ".consul_config.json"
- fi
+ a1pms_api_put_configuration 200 ".a1pms_config.json"
fi
start_cr 1
fi
start_cr 1
- sleep_wait 120 "Let A1PMS cofiguration take effect"
+ sleep_wait 120 "Let A1PMS co
n
figuration take effect"
a1pms_api_get_status 200
a1pms_api_get_status 200
@@
-150,22
+141,14
@@
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 [ "$A1PMS_VERSION" == "V2" ]; then
- a1pms_equal json:policy-types 1 300 #Wait for the a1pms to refresh types from the simulator
- else
- a1pms_equal json:policy_types 1 300 #Wait for the a1pms to refresh types from the simulator
- fi
+ a1pms_equal json:policy-types 1 300 #Wait for the a1pms to refresh types from the simulator
a1pms_api_put_service 201 "serv1" 0 "$CR_SERVICE_APP_PATH_0/1"
echo "Check the number of types in the a1pms for each ric is 1"
for ((i=1; i<=$NUM_RICS; i++))
do
a1pms_api_put_service 201 "serv1" 0 "$CR_SERVICE_APP_PATH_0/1"
echo "Check the number of types in the a1pms for each ric is 1"
for ((i=1; i<=$NUM_RICS; i++))
do
- if [ "$A1PMS_VERSION" == "V2" ]; then
- a1pms_equal json:policy-types?ric_id=ricsim_g1_$i 1 120
- else
- a1pms_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
done
START_ID=2000
@@
-188,6
+171,8
@@
for __httpx in $TESTED_PROTOCOLS ; do
stop_a1pms
stop_a1pms
+ sleep_wait 60
+
start_stopped_a1pms
set_a1pms_debug
start_stopped_a1pms
set_a1pms_debug
@@
-196,6
+181,8
@@
for __httpx in $TESTED_PROTOCOLS ; do
stop_a1pms
stop_a1pms
+ sleep_wait 60
+
for ((i=1; i<=$NUM_RICS; i++))
do
sim_post_delete_instances 200 ricsim_g1_$i
for ((i=1; i<=$NUM_RICS; i++))
do
sim_post_delete_instances 200 ricsim_g1_$i
@@
-238,6
+225,8
@@
for __httpx in $TESTED_PROTOCOLS ; do
stop_a1pms
stop_a1pms
+ sleep_wait 60
+
start_stopped_a1pms
set_a1pms_debug
start_stopped_a1pms
set_a1pms_debug