X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC300.sh;h=2d9e9f92a33f190130cf02dd223077d12dc2d731;hb=542d2dbfd8df1fcb011fea3d69d539c5c5fe3667;hp=4503c88b426865703af64c3648b9c366371f177b;hpb=d0c7f9207203ce9a502fc15c09f9938eebfd44f7;p=nonrtric.git diff --git a/test/auto-test/FTC300.sh b/test/auto-test/FTC300.sh index 4503c88b..2d9e9f92 100755 --- a/test/auto-test/FTC300.sh +++ b/test/auto-test/FTC300.sh @@ -30,23 +30,14 @@ 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="NGW" +CONDITIONALLY_IGNORED_IMAGES="CBS CONSUL NGW" #Supported test environment profiles -SUPPORTED_PROFILES="ONAP-GUILIN ONAP-HONOLULU ONAP-ISTANBUL ORAN-CHERRY ORAN-D-RELEASE ORAN-E-RELEASE" +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 $@ -. ../common/agent_api_functions.sh -. ../common/consul_cbs_functions.sh -. ../common/control_panel_api_functions.sh -. ../common/controller_api_functions.sh -. ../common/cr_api_functions.sh -. ../common/mr_api_functions.sh -. ../common/ricsimulator_api_functions.sh -. ../common/kube_proxy_api_functions.sh -. ../common/gateway_api_functions.sh +. ../common/testcase_common.sh $@ setup_testenvironment @@ -109,11 +100,7 @@ for __httpx in $TESTED_PROTOCOLS ; do start_mr - start_cr - - if [ $RUNMODE == "DOCKER" ]; then - start_consul_cbs - fi + start_cr 1 start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE @@ -135,7 +122,31 @@ for __httpx in $TESTED_PROTOCOLS ; do if [ $RUNMODE == "KUBE" ]; then agent_load_config ".consul_config.json" else - consul_config_app ".consul_config.json" + if [[ "$PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then + #Temporary switch to http/https if dmaap use. Otherwise it is not possibble to push config + if [ $__httpx == "HTTPS" ]; then + use_agent_rest_https + else + use_agent_rest_http + fi + api_put_configuration 200 ".consul_config.json" + if [ $__httpx == "HTTPS" ]; then + if [[ $interface = *"DMAAP"* ]]; then + use_agent_dmaap_https + else + use_agent_rest_https + fi + else + if [[ $interface = *"DMAAP"* ]]; then + use_agent_dmaap_http + else + use_agent_rest_http + fi + fi + else + start_consul_cbs + consul_config_app ".consul_config.json" + fi fi api_get_status 200 @@ -156,13 +167,13 @@ for __httpx in $TESTED_PROTOCOLS ; do api_equal json:policy_types 2 120 #Wait for the agent to refresh types from the simulator fi - api_put_service 201 "serv1" 3600 "$CR_SERVICE_APP_PATH/1" + api_put_service 201 "serv1" 3600 "$CR_SERVICE_APP_PATH_0/1" START_ID=2000 NUM_POLICIES=10000 # Must be at least 100 if [ "$PMS_VERSION" == "V2" ]; then - notificationurl=$CR_SERVICE_APP_PATH"/test" + notificationurl=$CR_SERVICE_APP_PATH_0"/test" else notificationurl="" fi @@ -179,7 +190,12 @@ for __httpx in $TESTED_PROTOCOLS ; do sim_equal ricsim_g1_1 num_instances 0 - sim_equal ricsim_g1_1 num_instances $NUM_POLICIES 300 + if [[ $interface = *"SDNC"* ]]; then + deviation "Sync over SDNC seem to be slower from Jakarta version..." + sim_equal ricsim_g1_1 num_instances $NUM_POLICIES 2000 + else + sim_equal ricsim_g1_1 num_instances $NUM_POLICIES 300 + fi START_ID2=$(($START_ID+$NUM_POLICIES)) @@ -193,8 +209,12 @@ for __httpx in $TESTED_PROTOCOLS ; do sim_post_delete_instances 200 ricsim_g2_1 sim_equal ricsim_g2_1 num_instances 0 - - sim_equal ricsim_g2_1 num_instances $NUM_POLICIES 300 + if [[ $interface = *"SDNC"* ]]; then + deviation "Sync over SDNC seem to be slower from Jakarta version..." + sim_equal ricsim_g2_1 num_instances $NUM_POLICIES 2000 + else + sim_equal ricsim_g2_1 num_instances $NUM_POLICIES 300 + fi api_delete_policy 204 $(($START_ID+47)) @@ -202,7 +222,12 @@ for __httpx in $TESTED_PROTOCOLS ; do sim_post_delete_instances 200 ricsim_g1_1 - sim_equal ricsim_g1_1 num_instances $(($NUM_POLICIES-2)) 300 + if [[ $interface = *"SDNC"* ]]; then + deviation "Sync over SDNC seem to be slower from Jakarta version..." + sim_equal ricsim_g1_1 num_instances $(($NUM_POLICIES-2)) 2000 + else + sim_equal ricsim_g1_1 num_instances $(($NUM_POLICIES-2)) 300 + fi api_delete_policy 204 $(($START_ID2+37)) @@ -212,9 +237,16 @@ for __httpx in $TESTED_PROTOCOLS ; do sim_post_delete_instances 200 ricsim_g2_1 - sim_equal ricsim_g1_1 num_instances $(($NUM_POLICIES-2)) 300 + if [[ $interface = *"SDNC"* ]]; then + deviation "Sync over SDNC seem to be slower from Jakarta version..." + sim_equal ricsim_g1_1 num_instances $(($NUM_POLICIES-2)) 2000 + + sim_equal ricsim_g2_1 num_instances $(($NUM_POLICIES-3)) 2000 + else + sim_equal ricsim_g1_1 num_instances $(($NUM_POLICIES-2)) 300 - sim_equal ricsim_g2_1 num_instances $(($NUM_POLICIES-3)) 300 + sim_equal ricsim_g2_1 num_instances $(($NUM_POLICIES-3)) 300 + fi api_equal json:policies $(($NUM_POLICIES-2+$NUM_POLICIES-3))