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 "Added JWT handling to a1pms"
[nonrtric.git]
/
test
/
auto-test
/
FTC900.sh
diff --git
a/test/auto-test/FTC900.sh
b/test/auto-test/FTC900.sh
index
d2656c4
..
db21152
100755
(executable)
--- a/
test/auto-test/FTC900.sh
+++ b/
test/auto-test/FTC900.sh
@@
-20,30
+20,33
@@
TC_ONELINE_DESCR="Preparation for test of the Control Panel and the Health Check app - populating a number of ric simulators with types and instances"
#App names to include in the test when running docker, space separated list
TC_ONELINE_DESCR="Preparation for test of the Control Panel and the Health Check app - populating a number of ric simulators with types and instances"
#App names to include in the test when running docker, space separated list
-DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR
PA RICSIM
"
+DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR
A1PMS RICSIM 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
"
+KUBE_INCLUDED_IMAGES="CP CR MR
A1PMS RICSIM 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="CBS CONSUL NGW"
+
#Supported test environment profiles
#Supported test environment profiles
-SUPPORTED_PROFILES="ONAP-GUILIN ONAP-HONOLULU
ORAN-CHERRY ORAN-DAWN
"
+SUPPORTED_PROFILES="ONAP-GUILIN ONAP-HONOLULU
ONAP-ISTANBUL ONAP-JAKARTA ORAN-CHERRY ORAN-D-RELEASE ORAN-E-RELEASE ORAN-F-RELEASE
"
#Supported run modes
SUPPORTED_RUNMODES="DOCKER KUBE"
. ../common/testcase_common.sh $@
#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/consul_cbs_functions.sh
+
+setup_testenvironment
#### TEST BEGIN ####
clean_environment
#### TEST BEGIN ####
clean_environment
+start_kube_proxy
+
OSC_NUM_RICS=6
STD_NUM_RICS=5
OSC_NUM_RICS=6
STD_NUM_RICS=5
@@
-51,31
+54,36
@@
start_ric_simulators $RIC_SIM_PREFIX"_g1" $OSC_NUM_RICS OSC_2.1.0
start_ric_simulators $RIC_SIM_PREFIX"_g2" $STD_NUM_RICS STD_1.1.3
start_ric_simulators $RIC_SIM_PREFIX"_g2" $STD_NUM_RICS STD_1.1.3
-if [ "$PMS_VERSION" == "V2" ]; then
+if [ "$
A1
PMS_VERSION" == "V2" ]; then
start_ric_simulators $RIC_SIM_PREFIX"_g3" $STD_NUM_RICS STD_2.0.0
fi
start_ric_simulators $RIC_SIM_PREFIX"_g3" $STD_NUM_RICS STD_2.0.0
fi
-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/
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
-use_agent_rest_http
+start_a1pms NORPOXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE
-if [ $RUNMODE == "DOCKER" ]; then
- start_consul_cbs
-fi
+use_a1pms_rest_http
prepare_consul_config NOSDNC ".consul_config.json"
if [ $RUNMODE == "KUBE" ]; then
prepare_consul_config NOSDNC ".consul_config.json"
if [ $RUNMODE == "KUBE" ]; then
- a
gent
_load_config ".consul_config.json"
+ a
1pms
_load_config ".consul_config.json"
else
else
- consul_config_app ".consul_config.json"
+ 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
fi
fi
-api_get_status 200
+a
1pms_a
pi_get_status 200
# Print the A1 version for OSC
for ((i=1; i<=$OSC_NUM_RICS; i++))
# Print the A1 version for OSC
for ((i=1; i<=$OSC_NUM_RICS; i++))
@@
-90,7
+98,7
@@
do
sim_print $RIC_SIM_PREFIX"_g2_"$i interface
done
sim_print $RIC_SIM_PREFIX"_g2_"$i interface
done
-if [ "$PMS_VERSION" == "V2" ]; then
+if [ "$
A1
PMS_VERSION" == "V2" ]; then
# Print the A1 version for STD 2.X
for ((i=1; i<=$STD_NUM_RICS; i++))
do
# Print the A1 version for STD 2.X
for ((i=1; i<=$STD_NUM_RICS; i++))
do
@@
-108,39
+116,39
@@
done
#Check the number of schemas and the individual schemas in OSC
#Check the number of schemas and the individual schemas in OSC
-if [ "$PMS_VERSION" == "V2" ]; then
- a
pi
_equal json:policy-types 4 300
+if [ "$
A1
PMS_VERSION" == "V2" ]; then
+ a
1pms
_equal json:policy-types 4 300
for ((i=1; i<=$OSC_NUM_RICS; i++))
do
for ((i=1; i<=$OSC_NUM_RICS; i++))
do
- a
pi
_equal json:policy-types?ric_id=$RIC_SIM_PREFIX"_g1_"$i 3 120
+ a
1pms
_equal json:policy-types?ric_id=$RIC_SIM_PREFIX"_g1_"$i 3 120
done
# Check the schemas in OSC
for ((i=1; i<=$OSC_NUM_RICS; i++))
do
done
# Check the schemas in OSC
for ((i=1; i<=$OSC_NUM_RICS; i++))
do
- a
pi_get_policy_type 200 2 testdata/OSC/hw-agent
-modified.json
- a
pi_get_policy_type 200 100 testdata/OSC/qos-agent
-modified.json
- a
pi_get_policy_type 200 20008 testdata/OSC/tsa-agent
-modified.json
+ a
1pms_api_get_policy_type 200 2 testdata/OSC/hw-a1pms
-modified.json
+ a
1pms_api_get_policy_type 200 100 testdata/OSC/qos-a1pms
-modified.json
+ a
1pms_api_get_policy_type 200 20008 testdata/OSC/tsa-a1pms
-modified.json
done
else
done
else
- a
pi
_equal json:policy_types 4 300
+ a
1pms
_equal json:policy_types 4 300
for ((i=1; i<=$OSC_NUM_RICS; i++))
do
for ((i=1; i<=$OSC_NUM_RICS; i++))
do
- a
pi
_equal json:policy_types?ric=$RIC_SIM_PREFIX"_g1_"$i 3 120
+ a
1pms
_equal json:policy_types?ric=$RIC_SIM_PREFIX"_g1_"$i 3 120
done
# Check the schemas in OSC
for ((i=1; i<=$OSC_NUM_RICS; i++))
do
done
# Check the schemas in OSC
for ((i=1; i<=$OSC_NUM_RICS; i++))
do
- a
pi_get_policy_schema 200 2 testdata/OSC/hw-agent
-modified.json
- a
pi_get_policy_schema 200 100 testdata/OSC/qos-agent
-modified.json
- a
pi_get_policy_schema 200 20008 testdata/OSC/tsa-agent
-modified.json
+ a
1pms_api_get_policy_schema 200 2 testdata/OSC/hw-a1pms
-modified.json
+ a
1pms_api_get_policy_schema 200 100 testdata/OSC/qos-a1pms
-modified.json
+ a
1pms_api_get_policy_schema 200 20008 testdata/OSC/tsa-a1pms
-modified.json
done
fi
done
fi
-if [ "$PMS_VERSION" == "V2" ]; then
+if [ "$
A1
PMS_VERSION" == "V2" ]; then
# Load the polictypes in std
for ((i=1; i<=$STD_NUM_RICS; i++))
# Load the polictypes in std
for ((i=1; i<=$STD_NUM_RICS; i++))
@@
-150,28
+158,28
@@
if [ "$PMS_VERSION" == "V2" ]; then
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 6 120
+ a
1pms
_equal json:policy-types 6 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
fi
# Create policies
done
fi
# Create policies
-use_a
gent
_rest_http
+use_a
1pms
_rest_http
-a
pi_put_service 201 "Emergency-response-app" 0 "$CR_SERVICE_PATH
/1"
+a
1pms_api_put_service 201 "Emergency-response-app" 0 "$CR_SERVICE_APP_PATH_0
/1"
-if [ "$PMS_VERSION" == "V2" ]; then
- notificationurl=$CR_SERVICE_
PATH
"/test"
+if [ "$
A1
PMS_VERSION" == "V2" ]; then
+ notificationurl=$CR_SERVICE_
APP_PATH_0
"/test"
else
notificationurl=""
fi
else
notificationurl=""
fi
@@
-179,12
+187,12
@@
fi
# Create policies in OSC
for ((i=1; i<=$OSC_NUM_RICS; i++))
do
# Create policies in OSC
for ((i=1; i<=$OSC_NUM_RICS; i++))
do
- generate_uuid
- api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 2 $((2000+$i)) NOTRANSIENT $notificationurl testdata/OSC/pihw_template.json 1
- generate_uuid
- api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 100 $((3000+$i)) NOTRANSIENT $notificationurl testdata/OSC/piqos_template.json 1
- generate_uuid
- api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 20008 $((4000+$i)) NOTRANSIENT $notificationurl testdata/OSC/pitsa_template.json 1
+ generate_
policy_
uuid
+ a
1pms_a
pi_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 2 $((2000+$i)) NOTRANSIENT $notificationurl testdata/OSC/pihw_template.json 1
+ generate_
policy_
uuid
+ a
1pms_a
pi_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 100 $((3000+$i)) NOTRANSIENT $notificationurl testdata/OSC/piqos_template.json 1
+ generate_
policy_
uuid
+ a
1pms_a
pi_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 20008 $((4000+$i)) NOTRANSIENT $notificationurl testdata/OSC/pitsa_template.json 1
done
done
@@
-198,13
+206,13
@@
done
# Create policies in STD
for ((i=1; i<=$STD_NUM_RICS; i++))
do
# Create policies in STD
for ((i=1; i<=$STD_NUM_RICS; i++))
do
- generate_uuid
- api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g2_"$i NOTYPE $((2100+$i)) NOTRANSIENT $notificationurl testdata/STD/pi1_template.json 1
- if [ "$PMS_VERSION" == "V2" ]; then
- generate_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
- generate_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
+ generate_
policy_
uuid
+ a
1pms_a
pi_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g2_"$i NOTYPE $((2100+$i)) NOTRANSIENT $notificationurl testdata/STD/pi1_template.json 1
+ if [ "$
A1
PMS_VERSION" == "V2" ]; then
+ generate_
policy_
uuid
+ 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
+ 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
fi
done
fi
done
@@
-213,15
+221,17
@@
done
for ((i=1; i<=$STD_NUM_RICS; i++))
do
sim_equal $RIC_SIM_PREFIX"_g2_"$i num_instances 1
for ((i=1; i<=$STD_NUM_RICS; i++))
do
sim_equal $RIC_SIM_PREFIX"_g2_"$i num_instances 1
- if [ "$PMS_VERSION" == "V2" ]; then
+ if [ "$
A1
PMS_VERSION" == "V2" ]; then
sim_equal $RIC_SIM_PREFIX"_g3_"$i num_instances 2
fi
done
sim_equal $RIC_SIM_PREFIX"_g3_"$i num_instances 2
fi
done
-check_
policy_agent
_logs
+check_
a1pms
_logs
#### TEST COMPLETE ####
store_logs END
#### TEST COMPLETE ####
store_logs END
-print_result
\ No newline at end of file
+print_result
+
+auto_clean_environment
\ No newline at end of file