X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC10.sh;h=32b6b1cd609d76febb6a89f7261887cdc50762ea;hb=f83c362e67d25a464b80faf6d8363ccacacc5ebb;hp=136781f99f37e8b59f2de4f8ac1466f15eaa7adf;hpb=a27463f3bb2fbe454586a871bba9b08367e9ad77;p=nonrtric.git diff --git a/test/auto-test/FTC10.sh b/test/auto-test/FTC10.sh index 136781f9..32b6b1cd 100755 --- a/test/auto-test/FTC10.sh +++ b/test/auto-test/FTC10.sh @@ -20,7 +20,7 @@ TC_ONELINE_DESCR="Basic use case, register service, create/update policy, delete policy, de-register service using both STD and OSC interface while mixing REST and Dmaap" #App names to include in the test when running docker, space separated list -DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR A1PMS RICSIM NGW KUBEPROXY" +DOCKER_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM NGW KUBEPROXY" #App names to include in the test when running kubernetes, space separated list KUBE_INCLUDED_IMAGES=" MR CR A1PMS RICSIM CP KUBEPROXY NGW" @@ -30,10 +30,10 @@ 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_PROFILES="ONAP-GUILIN ONAP-HONOLULU ONAP-ISTANBUL ONAP-JAKARTA ONAP-KOHN ONAP-LONDON ORAN-CHERRY ORAN-D-RELEASE ORAN-E-RELEASE ORAN-F-RELEASE ORAN-G-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" @@ -58,19 +58,12 @@ start_ric_simulators ricsim_g1 3 OSC_2.1.0 start_ric_simulators ricsim_g2 5 STD_1.1.3 -if [ "$A1PMS_VERSION" == "V2" ]; then - start_ric_simulators ricsim_g3 1 STD_2.0.0 -fi +start_ric_simulators ricsim_g3 1 STD_2.0.0 start_mr start_cr 1 -if [ $RUNMODE == "DOCKER" ]; then - if [[ "$A1PMS_FEATURE_LEVEL" != *"NOCONSUL"* ]]; then - start_consul_cbs - fi -fi start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE @@ -84,24 +77,13 @@ set_a1pms_debug use_a1pms_rest_http -__CONFIG_HEADER="NOHEADER" -if [ $RUNMODE == "KUBE" ]; then - __CONFIG_HEADER="HEADER" -else - if [[ "$A1PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then - __CONFIG_HEADER="HEADER" - fi -fi -prepare_consul_config NOSDNC ".consul_config.json" $__CONFIG_HEADER + +prepare_a1pms_config NOSDNC ".a1pms_config.json" if [ $RUNMODE == "KUBE" ]; then - a1pms_load_config ".consul_config.json" + a1pms_load_config ".a1pms_config.json" else - if [[ "$A1PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then - a1pms_api_put_configuration 200 ".consul_config.json" - else - consul_config_app ".consul_config.json" - fi + a1pms_api_put_configuration 200 ".a1pms_config.json" fi sleep_wait 120 "Let A1PMS cofiguration take effect" @@ -112,26 +94,16 @@ sim_print ricsim_g1_1 interface sim_print ricsim_g2_1 interface -if [ "$A1PMS_VERSION" == "V2" ]; then - sim_print ricsim_g3_1 interface -fi +sim_print ricsim_g3_1 interface sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json -if [ "$A1PMS_VERSION" == "V2" ]; then - sim_put_policy_type 201 ricsim_g3_1 STD_QOS_0_2_0 testdata/STD2/sim_qos.json - a1pms_equal json:policy-types 3 300 -else - a1pms_equal json:policy_types 2 300 -fi +sim_put_policy_type 201 ricsim_g3_1 STD_QOS_0_2_0 testdata/STD2/sim_qos.json +a1pms_equal json:policy-types 3 300 # Create policies -if [ "$A1PMS_VERSION" == "V2" ]; then - notificationurl=$CR_SERVICE_APP_PATH_0"/test" -else - notificationurl="" -fi +notificationurl=$CR_SERVICE_APP_PATH_0"/test" use_a1pms_rest_http @@ -162,20 +134,17 @@ a1pms_api_put_policy 201 "service1" ricsim_g2_1 NOTYPE 3100 NOTRANSIENT $notific sim_equal ricsim_g2_1 num_instances 2 -if [ "$A1PMS_VERSION" == "V2" ]; then - use_a1pms_rest_http +use_a1pms_rest_http - a1pms_api_put_policy 201 "service1" ricsim_g3_1 STD_QOS_0_2_0 2200 true $notificationurl testdata/STD2/pi_qos_template.json 1 +a1pms_api_put_policy 201 "service1" ricsim_g3_1 STD_QOS_0_2_0 2200 true $notificationurl testdata/STD2/pi_qos_template.json 1 - sim_equal ricsim_g3_1 num_instances 1 +sim_equal ricsim_g3_1 num_instances 1 - use_a1pms_dmaap_http +use_a1pms_dmaap_http - a1pms_api_put_policy 201 "service1" ricsim_g3_1 STD_QOS_0_2_0 3200 NOTRANSIENT $notificationurl testdata/STD2/pi_qos_template.json 1 +a1pms_api_put_policy 201 "service1" ricsim_g3_1 STD_QOS_0_2_0 3200 NOTRANSIENT $notificationurl testdata/STD2/pi_qos_template.json 1 - sim_equal ricsim_g3_1 num_instances 2 - -fi +sim_equal ricsim_g3_1 num_instances 2 #Update policies use_a1pms_rest_http @@ -208,42 +177,31 @@ a1pms_api_put_policy 200 "service1" ricsim_g2_1 NOTYPE 3100 NOTRANSIENT $notific sim_equal ricsim_g2_1 num_instances 2 -if [ "$A1PMS_VERSION" == "V2" ]; then - use_a1pms_rest_http +use_a1pms_rest_http - a1pms_api_put_policy 200 "service1" ricsim_g3_1 STD_QOS_0_2_0 2200 true $notificationurl testdata/STD2/pi_qos_template.json 1 +a1pms_api_put_policy 200 "service1" ricsim_g3_1 STD_QOS_0_2_0 2200 true $notificationurl testdata/STD2/pi_qos_template.json 1 - sim_equal ricsim_g3_1 num_instances 2 +sim_equal ricsim_g3_1 num_instances 2 - use_a1pms_dmaap_http +use_a1pms_dmaap_http - a1pms_api_put_policy 200 "service1" ricsim_g3_1 STD_QOS_0_2_0 3200 true $notificationurl testdata/STD2/pi_qos_template.json 1 +a1pms_api_put_policy 200 "service1" ricsim_g3_1 STD_QOS_0_2_0 3200 true $notificationurl testdata/STD2/pi_qos_template.json 1 - sim_equal ricsim_g3_1 num_instances 2 -fi +sim_equal ricsim_g3_1 num_instances 2 # Check policies -if [ "$A1PMS_VERSION" == "V2" ]; then - a1pms_api_get_policy 200 2000 testdata/OSC/pi1_template.json "service1" ricsim_g1_1 1 false $notificationurl - a1pms_api_get_policy 200 3000 testdata/OSC/pi1_template.json "service1" ricsim_g1_1 1 false $notificationurl - a1pms_api_get_policy 200 2100 testdata/STD/pi1_template.json "service1" ricsim_g2_1 NOTYPE false $notificationurl - a1pms_api_get_policy 200 3100 testdata/STD/pi1_template.json "service1" ricsim_g2_1 NOTYPE false $notificationurl - a1pms_api_get_policy 200 2200 testdata/STD2/pi_qos_template.json "service1" ricsim_g3_1 STD_QOS_0_2_0 true $notificationurl - a1pms_api_get_policy 200 3200 testdata/STD2/pi_qos_template.json "service1" ricsim_g3_1 STD_QOS_0_2_0 true $notificationurl -else - a1pms_api_get_policy 200 2000 testdata/OSC/pi1_template.json - a1pms_api_get_policy 200 3000 testdata/OSC/pi1_template.json - a1pms_api_get_policy 200 2100 testdata/STD/pi1_template.json - a1pms_api_get_policy 200 3100 testdata/STD/pi1_template.json -fi +a1pms_api_get_policy 200 2000 testdata/OSC/pi1_template.json "service1" ricsim_g1_1 1 false $notificationurl +a1pms_api_get_policy 200 3000 testdata/OSC/pi1_template.json "service1" ricsim_g1_1 1 false $notificationurl +a1pms_api_get_policy 200 2100 testdata/STD/pi1_template.json "service1" ricsim_g2_1 NOTYPE false $notificationurl +a1pms_api_get_policy 200 3100 testdata/STD/pi1_template.json "service1" ricsim_g2_1 NOTYPE false $notificationurl +a1pms_api_get_policy 200 2200 testdata/STD2/pi_qos_template.json "service1" ricsim_g3_1 STD_QOS_0_2_0 true $notificationurl +a1pms_api_get_policy 200 3200 testdata/STD2/pi_qos_template.json "service1" ricsim_g3_1 STD_QOS_0_2_0 true $notificationurl sim_equal ricsim_g1_1 num_instances 2 sim_equal ricsim_g2_1 num_instances 2 -if [ "$A1PMS_VERSION" == "V2" ]; then - sim_equal ricsim_g3_1 num_instances 2 -fi +sim_equal ricsim_g3_1 num_instances 2 # Remove policies @@ -255,27 +213,21 @@ use_a1pms_dmaap_http a1pms_api_delete_policy 204 2100 use_a1pms_rest_http a1pms_api_delete_policy 204 3100 -if [ "$A1PMS_VERSION" == "V2" ]; then - use_a1pms_dmaap_http - a1pms_api_delete_policy 204 2200 - use_a1pms_rest_http - a1pms_api_delete_policy 204 3200 -fi +use_a1pms_dmaap_http +a1pms_api_delete_policy 204 2200 +use_a1pms_rest_http +a1pms_api_delete_policy 204 3200 sim_equal ricsim_g1_1 num_instances 0 sim_equal ricsim_g2_1 num_instances 0 -if [ "$A1PMS_VERSION" == "V2" ]; then - sim_equal ricsim_g3_1 num_instances 0 -fi +sim_equal ricsim_g3_1 num_instances 0 # Check remote host access to simulator sim_contains_str ricsim_g1_1 remote_hosts $A1PMS_APP_NAME sim_contains_str ricsim_g2_1 remote_hosts $A1PMS_APP_NAME -if [ "$A1PMS_VERSION" == "V2" ]; then - sim_contains_str ricsim_g3_1 remote_hosts $A1PMS_APP_NAME -fi +sim_contains_str ricsim_g3_1 remote_hosts $A1PMS_APP_NAME # Check policy removal use_a1pms_rest_http @@ -284,10 +236,8 @@ a1pms_api_get_policy 404 3000 a1pms_api_get_policy 404 2100 a1pms_api_get_policy 404 3100 -if [ "$A1PMS_VERSION" == "V2" ]; then - a1pms_api_get_policy 404 2200 - a1pms_api_get_policy 404 3200 -fi +a1pms_api_get_policy 404 2200 +a1pms_api_get_policy 404 3200 # Remove the service use_a1pms_dmaap_http