X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC100.sh;h=1fafa7115333841b60924df676aa0da939e6ec6a;hb=542d2dbfd8df1fcb011fea3d69d539c5c5fe3667;hp=ac6f8d514fc24df248cac9468f4ed95369d867d6;hpb=968b89731a192c2ee3f3393d00519879ad89ce56;p=nonrtric.git diff --git a/test/auto-test/FTC100.sh b/test/auto-test/FTC100.sh index ac6f8d51..1fafa711 100755 --- a/test/auto-test/FTC100.sh +++ b/test/auto-test/FTC100.sh @@ -31,23 +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/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 @@ -89,7 +80,7 @@ for __httpx in $TESTED_PROTOCOLS ; do # Create service to be able to receive events when rics becomes available # Must use rest towards the agent since dmaap is not configured yet - api_put_service 201 "ric-registration" 0 "$CR_SERVICE_APP_PATH/ric-registration" + api_put_service 201 "ric-registration" 0 "$CR_SERVICE_APP_PATH_0/ric-registration" if [ $__httpx == "HTTPS" ]; then @@ -118,13 +109,19 @@ for __httpx in $TESTED_PROTOCOLS ; do start_ric_simulators ricsim_g1 1 OSC_2.1.0 start_ric_simulators ricsim_g2 1 STD_1.1.3 + + sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json + sim_put_policy_type 201 ricsim_g1_1 2 testdata/OSC/sim_2.json + if [ "$PMS_VERSION" == "V2" ]; then start_ric_simulators ricsim_g3 1 STD_2.0.0 + sim_put_policy_type 201 ricsim_g3_1 STD_QOS_0_2_0 testdata/STD2/sim_qos.json + sim_put_policy_type 201 ricsim_g3_1 STD_QOS2_0.1.0 testdata/STD2/sim_qos2.json fi start_mr - start_cr + start_cr 1 start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE @@ -132,10 +129,6 @@ for __httpx in $TESTED_PROTOCOLS ; do start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE fi - if [ $RUNMODE == "DOCKER" ]; then - start_consul_cbs - fi - if [[ $interface = *"SDNC"* ]]; then start_sdnc prepare_consul_config SDNC ".consul_config.json" @@ -146,16 +139,42 @@ for __httpx in $TESTED_PROTOCOLS ; do if [ $RUNMODE == "KUBE" ]; then agent_load_config ".consul_config.json" else - consul_config_app ".consul_config.json" - fi + 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 + + if [[ $interface != *"DMAAP"* ]]; then + echo "{}" > ".consul_config_incorrect.json" + api_put_configuration 400 ".consul_config_incorrect.json" + fi + + api_put_configuration 200 ".consul_config.json" + api_get_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 - sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json - sim_put_policy_type 201 ricsim_g1_1 2 testdata/OSC/sim_2.json + else + start_consul_cbs + consul_config_app ".consul_config.json" + fi + fi if [ "$PMS_VERSION" == "V2" ]; then - sim_put_policy_type 201 ricsim_g3_1 STD_QOS_0_2_0 testdata/STD2/sim_qos.json - sim_put_policy_type 201 ricsim_g3_1 STD_QOS2_0.1.0 testdata/STD2/sim_qos2.json - api_equal json:rics 3 300 api_equal json:policy-types 5 120 @@ -176,8 +195,8 @@ for __httpx in $TESTED_PROTOCOLS ; do fi if [ "$PMS_VERSION" == "V2" ]; then - cr_equal received_callbacks 3 120 - cr_api_check_all_sync_events 200 ric-registration ricsim_g1_1 ricsim_g2_1 ricsim_g3_1 + cr_equal 0 received_callbacks 3 120 + cr_api_check_all_sync_events 200 0 ric-registration ricsim_g1_1 ricsim_g2_1 ricsim_g3_1 fi mr_equal requests_submitted 0 @@ -188,20 +207,22 @@ for __httpx in $TESTED_PROTOCOLS ; do api_get_status 200 + api_get_status_root 200 + echo "############################################" echo "##### Service registry and supervision #####" echo "############################################" api_get_services 404 "service1" - api_put_service 201 "service1" 1000 "$CR_SERVICE_APP_PATH/1" + api_put_service 201 "service1" 1000 "$CR_SERVICE_APP_PATH_0/1" - api_put_service 200 "service1" 2000 "$CR_SERVICE_APP_PATH/1" + api_put_service 200 "service1" 2000 "$CR_SERVICE_APP_PATH_0/1" - api_put_service 400 "service2" -1 "$CR_SERVICE_APP_PATH/2" + api_put_service 400 "service2" -1 "$CR_SERVICE_APP_PATH_0/2" - api_put_service 400 "service2" "wrong" "$CR_SERVICE_APP_PATH/2" + api_put_service 400 "service2" "wrong" "$CR_SERVICE_APP_PATH_0/2" api_put_service 400 "service2" 100 "/test" @@ -209,20 +230,20 @@ for __httpx in $TESTED_PROTOCOLS ; do api_put_service 201 "service2" 300 "ftp://localhost:80/test" - api_get_services 200 "service1" "service1" 2000 "$CR_SERVICE_APP_PATH/1" + api_get_services 200 "service1" "service1" 2000 "$CR_SERVICE_APP_PATH_0/1" api_get_service_ids 200 "service1" "service2" "ric-registration" - api_put_service 201 "service3" 5000 "$CR_SERVICE_APP_PATH/3" + api_put_service 201 "service3" 5000 "$CR_SERVICE_APP_PATH_0/3" api_get_service_ids 200 "service1" "service2" "service3" "ric-registration" - api_get_services 200 "service1" "service1" 2000 "$CR_SERVICE_APP_PATH/1" + api_get_services 200 "service1" "service1" 2000 "$CR_SERVICE_APP_PATH_0/1" - api_get_services 200 NOSERVICE "service1" 2000 "$CR_SERVICE_APP_PATH/1" "service2" 300 "ftp://localhost:80/test" "service3" 5000 "$CR_SERVICE_APP_PATH/3" "ric-registration" 0 "$CR_SERVICE_APP_PATH/ric-registration" + api_get_services 200 NOSERVICE "service1" 2000 "$CR_SERVICE_APP_PATH_0/1" "service2" 300 "ftp://localhost:80/test" "service3" 5000 "$CR_SERVICE_APP_PATH_0/3" "ric-registration" 0 "$CR_SERVICE_APP_PATH_0/ric-registration" api_get_services 200 @@ -251,7 +272,7 @@ for __httpx in $TESTED_PROTOCOLS ; do api_get_service_ids 200 "service2" "service3" "ric-registration" - api_put_service 201 "service1" 50 "$CR_SERVICE_APP_PATH/1" + api_put_service 201 "service1" 50 "$CR_SERVICE_APP_PATH_0/1" api_get_service_ids 200 "service1" "service2" "service3" "ric-registration" @@ -386,13 +407,17 @@ for __httpx in $TESTED_PROTOCOLS ; do - api_put_service 201 "service10" 3600 "$CR_SERVICE_APP_PATH/1" + api_put_service 201 "service10" 3600 "$CR_SERVICE_APP_PATH_0/1" if [ "$PMS_VERSION" == "V2" ]; then - notificationurl=$CR_SERVICE_APP_PATH"/test" + notificationurl=$CR_SERVICE_APP_PATH_0"/test" else notificationurl="" fi + if [[ $interface != *"DMAAP"* ]]; then + # Badly formatted json is not possible to send via dmaap + api_put_policy 400 "unregistered-service" ricsim_g1_1 1 2000 NOTRANSIENT $notificationurl testdata/OSC/pi_bad_template.json + fi deviation "TR10 - agent allows policy creation on unregistered service (orig problem) - test combo $interface and $__httpx" #Kept until decison #api_put_policy 400 "unregistered-service" ricsim_g1_1 1 2000 NOTRANSIENT testdata/OSC/pi1_template.json @@ -419,6 +444,8 @@ for __httpx in $TESTED_PROTOCOLS ; do api_put_policy 200 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5200 false $notificationurl testdata/STD2/pi_qos2_template.json fi + api_get_policy_status 404 1 + api_get_policy_status 404 2 VAL='NOT IN EFFECT' api_get_policy_status 200 5000 OSC "$VAL" "false" api_get_policy_status 200 5100 STD "UNDEFINED" @@ -544,7 +571,7 @@ for __httpx in $TESTED_PROTOCOLS ; do fi if [ "$PMS_VERSION" == "V2" ]; then - cr_equal received_callbacks 3 + cr_equal 0 received_callbacks 3 fi if [[ $interface = *"DMAAP"* ]]; then