X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC850.sh;h=0b08417b5a1cc3024d4ab6e36ab97be91c6e0542;hb=refs%2Fchanges%2F88%2F12388%2F5;hp=0a9f0b87947cbcf4d1cca9f0e0fc3cc4fc3922a6;hpb=23d69b4a0fac41be58676c006867332c9fac6071;p=nonrtric.git diff --git a/test/auto-test/FTC850.sh b/test/auto-test/FTC850.sh index 0a9f0b87..0b08417b 100755 --- a/test/auto-test/FTC850.sh +++ b/test/auto-test/FTC850.sh @@ -1,7 +1,8 @@ #!/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. @@ -20,20 +21,20 @@ TC_ONELINE_DESCR="Create/delete policies in parallel over a number of rics using a number of child process" #App names to include in the test when running docker, space separated list -DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR A1PMS RICSIM SDNC NGW KUBEPROXY" +DOCKER_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM SDNC NGW KUBEPROXY" #App names to include in the test when running kubernetes, space separated list KUBE_INCLUDED_IMAGES="CP CR MR 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 -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 ORAN-H-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" @@ -55,13 +56,9 @@ TESTED_PROTOCOLS="HTTP HTTPS" NUM_RICS=20 NUM_POLICIES_PER_RIC=500 -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 @@ -75,15 +72,28 @@ for __httpx in $TESTED_PROTOCOLS ; do if [ $__httpx == "HTTPS" ]; then use_cr_https use_simulator_https - use_mr_https + if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then + : + else + use_mr_https + fi 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 use_cr_http use_simulator_http - use_mr_http + if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then + : + else + use_mr_http + fi if [[ $interface = *"SDNC"* ]]; then use_sdnc_http fi @@ -107,38 +117,31 @@ for __httpx in $TESTED_PROTOCOLS ; do 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 - 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 - prepare_consul_config NOSDNC ".consul_config.json" $__CONFIG_HEADER + prepare_a1pms_config NOSDNC ".a1pms_config.json" fi 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 - start_consul_cbs - consul_config_app ".consul_config.json" - fi + a1pms_api_put_configuration 200 ".a1pms_config.json" fi - start_mr # Not used, but removes error messages from the a1pms log + if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then + : + else + start_mr #Just to prevent errors in the a1pms log... + fi start_cr 1 - sleep_wait 120 "Let A1PMS cofiguration take effect" + sleep_wait 120 "Let A1PMS configuration take effect" a1pms_api_get_status 200 @@ -153,22 +156,14 @@ for __httpx in $TESTED_PROTOCOLS ; do sim_put_policy_type 201 ricsim_g1_$i 1 testdata/OSC/sim_1.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" 600 "$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