X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC110.sh;h=46a44d037f1ea8a78c3841ee3c228d99fd99a2c4;hb=8fbb226ef10720895adb98e6ca7ac1cae39f0103;hp=e3b96a5e98624cf100c8925d6b887323aa59c4b6;hpb=d0c7f9207203ce9a502fc15c09f9938eebfd44f7;p=nonrtric.git diff --git a/test/auto-test/FTC110.sh b/test/auto-test/FTC110.sh index e3b96a5e..46a44d03 100755 --- a/test/auto-test/FTC110.sh +++ b/test/auto-test/FTC110.sh @@ -31,22 +31,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/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 @@ -71,11 +63,7 @@ fi 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 @@ -90,7 +78,12 @@ prepare_consul_config NOSDNC ".consul_config.json" if [ $RUNMODE == "KUBE" ]; then agent_load_config ".consul_config.json" else - consul_config_app ".consul_config.json" + if [[ "$PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then + api_put_configuration 200 ".consul_config.json" + else + start_consul_cbs + consul_config_app ".consul_config.json" + fi fi set_agent_debug @@ -107,60 +100,60 @@ if [ "$PMS_VERSION" == "V2" ]; then sim_print ricsim_g3_1 interface fi -api_put_service 201 "service1" 15 "$CR_SERVICE_APP_PATH/service1" +api_put_service 201 "service1" 15 "$CR_SERVICE_APP_PATH_0/service1" -api_get_services 200 "service1" "service1" 15 "$CR_SERVICE_APP_PATH/service1" +api_get_services 200 "service1" "service1" 15 "$CR_SERVICE_APP_PATH_0/service1" -api_put_service 201 "service2" 120 "$CR_SERVICE_APP_PATH/service2" +api_put_service 201 "service2" 120 "$CR_SERVICE_APP_PATH_0/service2" -api_get_services 200 "service2" "service2" 120 "$CR_SERVICE_APP_PATH/service2" +api_get_services 200 "service2" "service2" 120 "$CR_SERVICE_APP_PATH_0/service2" -api_put_service 200 "service1" 50 "$CR_SERVICE_APP_PATH/service1" -api_put_service 200 "service2" 180 "$CR_SERVICE_APP_PATH/service2" +api_put_service 200 "service1" 50 "$CR_SERVICE_APP_PATH_0/service1" +api_put_service 200 "service2" 180 "$CR_SERVICE_APP_PATH_0/service2" -api_get_services 200 "service1" "service1" 50 "$CR_SERVICE_APP_PATH/service1" -api_get_services 200 "service2" "service2" 180 "$CR_SERVICE_APP_PATH/service2" +api_get_services 200 "service1" "service1" 50 "$CR_SERVICE_APP_PATH_0/service1" +api_get_services 200 "service2" "service2" 180 "$CR_SERVICE_APP_PATH_0/service2" api_get_service_ids 200 "service1" "service2" sleep_wait 30 "Waiting for keep alive timeout" -api_get_services 200 "service1" "service1" 50 "$CR_SERVICE_APP_PATH/service1" -api_get_services 200 "service2" "service2" 180 "$CR_SERVICE_APP_PATH/service2" +api_get_services 200 "service1" "service1" 50 "$CR_SERVICE_APP_PATH_0/service1" +api_get_services 200 "service2" "service2" 180 "$CR_SERVICE_APP_PATH_0/service2" sleep_wait 100 "Waiting for keep alive timeout" api_get_services 404 "service1" -api_get_services 200 "service2" "service2" 180 "$CR_SERVICE_APP_PATH/service2" +api_get_services 200 "service2" "service2" 180 "$CR_SERVICE_APP_PATH_0/service2" api_delete_services 204 "service2" api_get_services 404 "service1" api_get_services 404 "service2" -api_put_service 201 "service3" 60 "$CR_SERVICE_APP_PATH/service3" +api_put_service 201 "service3" 60 "$CR_SERVICE_APP_PATH_0/service3" -api_get_services 200 "service3" "service3" 60 "$CR_SERVICE_APP_PATH/service3" +api_get_services 200 "service3" "service3" 60 "$CR_SERVICE_APP_PATH_0/service3" sleep_wait 30 "Waiting for keep alive timeout" -api_put_service 200 "service3" 60 "$CR_SERVICE_APP_PATH/service3" +api_put_service 200 "service3" 60 "$CR_SERVICE_APP_PATH_0/service3" sleep_wait 100 "Waiting for keep alive timeout" api_get_services 404 "service3" -api_put_service 201 "service4" 120 "$CR_SERVICE_APP_PATH/service4" +api_put_service 201 "service4" 120 "$CR_SERVICE_APP_PATH_0/service4" sleep_wait 60 "Waiting for keep alive timeout" -api_get_services 200 "service4" "service4" 120 "$CR_SERVICE_APP_PATH/service4" +api_get_services 200 "service4" "service4" 120 "$CR_SERVICE_APP_PATH_0/service4" api_put_services_keepalive 200 "service4" sleep_wait 90 "Waiting for keep alive timeout" -api_get_services 200 "service4" "service4" 120 "$CR_SERVICE_APP_PATH/service4" +api_get_services 200 "service4" "service4" 120 "$CR_SERVICE_APP_PATH_0/service4" api_delete_services 204 "service4" @@ -183,7 +176,7 @@ api_put_services_keepalive 404 "service3" api_put_services_keepalive 404 "service4" # Policy delete after timeout -api_put_service 201 "service10" 600 "$CR_SERVICE_APP_PATH/service10" +api_put_service 201 "service10" 600 "$CR_SERVICE_APP_PATH_0/service10" sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json @@ -209,7 +202,7 @@ else fi if [ "$PMS_VERSION" == "V2" ]; then - notificationurl=$CR_SERVICE_APP_PATH"/test" + notificationurl=$CR_SERVICE_APP_PATH_0"/test" else notificationurl="" fi @@ -263,7 +256,7 @@ if [ "$PMS_VERSION" == "V2" ]; then sim_equal ricsim_g3_1 num_instances 1 fi -api_put_service 200 "service10" 10 "$CR_SERVICE_APP_PATH/service10" +api_put_service 200 "service10" 10 "$CR_SERVICE_APP_PATH_0/service10" #Wait for service expiry api_equal json:policies 0 120