X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC100.sh;h=ac6f8d514fc24df248cac9468f4ed95369d867d6;hb=6f48adb69090799c74c29204dd2cd1737cc9d6ac;hp=3b9dcd740cb8aedb02ae14fa71ed2366b57fa412;hpb=e0b665e3ff544bb78411bdc7f6b3ba2818fdeed4;p=nonrtric.git diff --git a/test/auto-test/FTC100.sh b/test/auto-test/FTC100.sh index 3b9dcd74..ac6f8d51 100755 --- a/test/auto-test/FTC100.sh +++ b/test/auto-test/FTC100.sh @@ -21,15 +21,20 @@ TC_ONELINE_DESCR="Full agent API walkthrough using agent REST/DMAAP and with/without SDNC A1 Controller" #App names to include in the test when running docker, space separated list -DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM SDNC" +DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM SDNC NGW KUBEPROXY" #App names to include in the test when running kubernetes, space separated list -KUBE_INCLUDED_IMAGES="CP CR MR PA RICSIM SDNC" +KUBE_INCLUDED_IMAGES="CP CR MR PA RICSIM SDNC KUBEPROXY NGW" #Prestarted 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="NGW" + #Supported test environment profiles -SUPPORTED_PROFILES="ONAP-GUILIN ONAP-HONOLULU ORAN-CHERRY ORAN-DAWN" +SUPPORTED_PROFILES="ONAP-GUILIN ONAP-HONOLULU ONAP-ISTANBUL ORAN-CHERRY ORAN-D-RELEASE ORAN-E-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" @@ -41,11 +46,14 @@ SUPPORTED_RUNMODES="DOCKER KUBE" . ../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 +setup_testenvironment #### TEST BEGIN #### -generate_uuid +generate_policy_uuid # Tested variants of REST/DMAAP/SDNC config TESTED_VARIANTS="REST DMAAP REST+SDNC DMAAP+SDNC" @@ -65,6 +73,8 @@ for __httpx in $TESTED_PROTOCOLS ; do # Clean container and start all needed containers # clean_environment + start_kube_proxy + if [ $__httpx == "HTTPS" ]; then use_cr_https use_agent_rest_https @@ -73,13 +83,13 @@ for __httpx in $TESTED_PROTOCOLS ; do use_cr_http fi - start_policy_agent NORPOXY $SIM_GROUP/$POLICY_AGENT_COMPOSE_DIR/application.yaml + start_policy_agent NORPOXY $SIM_GROUP/$POLICY_AGENT_COMPOSE_DIR/$POLICY_AGENT_CONFIG_FILE set_agent_debug # 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_PATH/ric-registration" + api_put_service 201 "ric-registration" 0 "$CR_SERVICE_APP_PATH/ric-registration" if [ $__httpx == "HTTPS" ]; then @@ -116,7 +126,11 @@ for __httpx in $TESTED_PROTOCOLS ; do start_cr - start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/application.properties + start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE + + if [ ! -z "$NRT_GATEWAY_APP_NAME" ]; then + start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE + fi if [ $RUNMODE == "DOCKER" ]; then start_consul_cbs @@ -180,14 +194,14 @@ for __httpx in $TESTED_PROTOCOLS ; do api_get_services 404 "service1" - api_put_service 201 "service1" 1000 "$CR_SERVICE_PATH/1" + api_put_service 201 "service1" 1000 "$CR_SERVICE_APP_PATH/1" - api_put_service 200 "service1" 2000 "$CR_SERVICE_PATH/1" + api_put_service 200 "service1" 2000 "$CR_SERVICE_APP_PATH/1" - api_put_service 400 "service2" -1 "$CR_SERVICE_PATH/2" + api_put_service 400 "service2" -1 "$CR_SERVICE_APP_PATH/2" - api_put_service 400 "service2" "wrong" "$CR_SERVICE_PATH/2" + api_put_service 400 "service2" "wrong" "$CR_SERVICE_APP_PATH/2" api_put_service 400 "service2" 100 "/test" @@ -195,20 +209,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_PATH/1" + api_get_services 200 "service1" "service1" 2000 "$CR_SERVICE_APP_PATH/1" api_get_service_ids 200 "service1" "service2" "ric-registration" - api_put_service 201 "service3" 5000 "$CR_SERVICE_PATH/3" + api_put_service 201 "service3" 5000 "$CR_SERVICE_APP_PATH/3" api_get_service_ids 200 "service1" "service2" "service3" "ric-registration" - api_get_services 200 "service1" "service1" 2000 "$CR_SERVICE_PATH/1" + api_get_services 200 "service1" "service1" 2000 "$CR_SERVICE_APP_PATH/1" - api_get_services 200 NOSERVICE "service1" 2000 "$CR_SERVICE_PATH/1" "service2" 300 "ftp://localhost:80/test" "service3" 5000 "$CR_SERVICE_PATH/3" "ric-registration" 0 "$CR_SERVICE_PATH/ric-registration" + 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 @@ -237,7 +251,7 @@ for __httpx in $TESTED_PROTOCOLS ; do api_get_service_ids 200 "service2" "service3" "ric-registration" - api_put_service 201 "service1" 50 "$CR_SERVICE_PATH/1" + api_put_service 201 "service1" 50 "$CR_SERVICE_APP_PATH/1" api_get_service_ids 200 "service1" "service2" "service3" "ric-registration" @@ -372,10 +386,10 @@ for __httpx in $TESTED_PROTOCOLS ; do - api_put_service 201 "service10" 3600 "$CR_SERVICE_PATH/1" + api_put_service 201 "service10" 3600 "$CR_SERVICE_APP_PATH/1" if [ "$PMS_VERSION" == "V2" ]; then - notificationurl=$CR_SERVICE_PATH"/test" + notificationurl=$CR_SERVICE_APP_PATH"/test" else notificationurl="" fi @@ -560,7 +574,6 @@ for __httpx in $TESTED_PROTOCOLS ; do fi check_policy_agent_logs - check_control_panel_logs if [[ $interface = *"SDNC"* ]]; then check_sdnc_logs