Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Storage of PM Data"
[nonrtric.git]
/
test
/
auto-test
/
FTC2001.sh
diff --git
a/test/auto-test/FTC2001.sh
b/test/auto-test/FTC2001.sh
index
7c1202c
..
3b53e8e
100755
(executable)
--- a/
test/auto-test/FTC2001.sh
+++ b/
test/auto-test/FTC2001.sh
@@
-17,13
+17,13
@@
# ============LICENSE_END=================================================
#
# ============LICENSE_END=================================================
#
-TC_ONELINE_DESCR="Testing southbound proxy for PMS and ICS"
+TC_ONELINE_DESCR="Testing southbound proxy for
A1
PMS and ICS"
#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="C
BS CONSUL CP CR MR PA
RICSIM ICS PRODSTUB HTTPPROXY NGW KUBEPROXY"
+DOCKER_INCLUDED_IMAGES="C
P CR MR A1PMS
RICSIM ICS PRODSTUB HTTPPROXY 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=" MR CR
PA
PRODSTUB RICSIM CP ICS HTTPPROXY KUBEPROXY NGW"
+KUBE_INCLUDED_IMAGES=" MR CR
A1PMS
PRODSTUB RICSIM CP ICS HTTPPROXY 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="NGW"
#Supported test environment profiles
CONDITIONALLY_IGNORED_IMAGES="NGW"
#Supported test environment profiles
-SUPPORTED_PROFILES="ONAP-
HONOLULU ONAP-ISTANBUL ONAP-JAKARTA ORAN-CHERRY ORAN-D-RELEASE ORAN-E-RELEASE ORAN-F
-RELEASE"
+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"
@@
-47,17
+47,12
@@
setup_testenvironment
##########################
use_cr_https
##########################
use_cr_https
-use_a
gent
_rest_https
+use_a
1pms
_rest_https
use_simulator_https
use_ics_rest_https
use_prod_stub_https
use_simulator_https
use_ics_rest_https
use_prod_stub_https
-if [ "$PMS_VERSION" == "V2" ]; then
- notificationurl=$CR_SERVICE_APP_PATH_0"/test"
-else
- echo "PMS VERSION 2 (V2) is required"
- exit 1
-fi
+notificationurl=$CR_SERVICE_APP_PATH_0"/test"
clean_environment
clean_environment
@@
-69,7
+64,7
@@
start_http_proxy
start_ric_simulators $RIC_SIM_PREFIX"_g3" $STD_NUM_RICS STD_2.0.0
start_ric_simulators $RIC_SIM_PREFIX"_g3" $STD_NUM_RICS STD_2.0.0
-start_mr #Just to prevent errors in the a
gent
log...
+start_mr #Just to prevent errors in the a
1pms
log...
start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE
start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE
@@
-77,18
+72,16
@@
if [ ! -z "$NRT_GATEWAY_APP_NAME" ]; then
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 PROXY $SIM_GROUP/$POLICY_AGENT_COMPOSE_DIR/$POLICY_AGENT
_CONFIG_FILE
+start_
a1pms PROXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS
_CONFIG_FILE
-if [ $RUNMODE == "DOCKER" ]; then
- start_consul_cbs
-fi
-prepare_consul_config NOSDNC ".consul_config.json"
+
+prepare_a1pms_config NOSDNC ".a1pms_config.json"
if [ $RUNMODE == "KUBE" ]; then
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
start_cr 1
fi
start_cr 1
@@
-97,11
+90,13
@@
start_prod_stub
start_ics PROXY $SIM_GROUP/$ICS_COMPOSE_DIR/$ICS_CONFIG_FILE
start_ics PROXY $SIM_GROUP/$ICS_COMPOSE_DIR/$ICS_CONFIG_FILE
-set_a
gent
_trace
+set_a
1pms
_trace
set_ics_debug
set_ics_debug
-api_get_status 200
+sleep_wait 120 "Let A1PMS cofiguration take effect"
+
+a1pms_api_get_status 200
# Print the A1 version for STD 2.X
for ((i=1; i<=$STD_NUM_RICS; i++))
# Print the A1 version for STD 2.X
for ((i=1; i<=$STD_NUM_RICS; i++))
@@
-116,32
+111,32
@@
do
done
#Check the number of schemas and the individual schemas in STD
done
#Check the number of schemas and the individual schemas in STD
-a
pi
_equal json:policy-types 2 120
+a
1pms
_equal json:policy-types 2 120
for ((i=1; i<=$STD_NUM_RICS; i++))
do
for ((i=1; i<=$STD_NUM_RICS; i++))
do
- a
pi
_equal json:policy-types?ric_id=$RIC_SIM_PREFIX"_g3_"$i 2 120
+ a
1pms
_equal json:policy-types?ric_id=$RIC_SIM_PREFIX"_g3_"$i 2 120
done
# Check the schemas in STD
for ((i=1; i<=$STD_NUM_RICS; i++))
do
done
# Check the schemas in STD
for ((i=1; i<=$STD_NUM_RICS; i++))
do
- a
pi_get_policy_type 200 STD_QOS_0_2_0 demo-testdata/STD2/qos-agent
-modified.json
- a
pi_get_policy_type 200 'STD_QOS2_0.1.0' demo-testdata/STD2/qos2-agent
-modified.json
+ a
1pms_api_get_policy_type 200 STD_QOS_0_2_0 demo-testdata/STD2/qos-a1pms
-modified.json
+ a
1pms_api_get_policy_type 200 'STD_QOS2_0.1.0' demo-testdata/STD2/qos2-a1pms
-modified.json
done
#Check the number of types
done
#Check the number of types
-a
pi
_equal json:policy-types 2 300
+a
1pms
_equal json:policy-types 2 300
-api_put_service 201 "Emergency-response-app" 0 "$CR_SERVICE_APP_PATH_0/1"
+a
1pms_a
pi_put_service 201 "Emergency-response-app" 0 "$CR_SERVICE_APP_PATH_0/1"
# Create policies in STD
for ((i=1; i<=$STD_NUM_RICS; i++))
do
generate_policy_uuid
# Create policies in STD
for ((i=1; i<=$STD_NUM_RICS; i++))
do
generate_policy_uuid
- api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g3_"$i STD_QOS_0_2_0 $((2300+$i)) NOTRANSIENT $notificationurl demo-testdata/STD2/pi1_template.json 1
+ a
1pms_a
pi_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g3_"$i STD_QOS_0_2_0 $((2300+$i)) NOTRANSIENT $notificationurl demo-testdata/STD2/pi1_template.json 1
generate_policy_uuid
generate_policy_uuid
- api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g3_"$i 'STD_QOS2_0.1.0' $((2400+$i)) NOTRANSIENT $notificationurl demo-testdata/STD2/pi1_template.json 1
+ a
1pms_a
pi_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g3_"$i 'STD_QOS2_0.1.0' $((2400+$i)) NOTRANSIENT $notificationurl demo-testdata/STD2/pi1_template.json 1
done
done
@@
-271,7
+266,7
@@
fi
cr_contains_str 0 remote_hosts $HTTP_PROXY_APP_NAME
cr_contains_str 0 remote_hosts $HTTP_PROXY_APP_NAME
-check_
policy_agent
_logs
+check_
a1pms
_logs
check_ics_logs
#### TEST COMPLETE ####
check_ics_logs
#### TEST COMPLETE ####