X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC100.sh;h=670ea5e773599ca95165a5d340ac0306b42087d8;hb=5b26de71a0aae08360a38477150551651a7ef734;hp=fd6b9a4cc52bd6557a8c46a08b266e999e777aa3;hpb=edea18a8fda2e2201cb3ede7f7af13f610bf4acc;p=nonrtric.git diff --git a/test/auto-test/FTC100.sh b/test/auto-test/FTC100.sh index fd6b9a4c..670ea5e7 100755 --- a/test/auto-test/FTC100.sh +++ b/test/auto-test/FTC100.sh @@ -21,10 +21,10 @@ 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 NGW" +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 KUBEPROXY NGw" +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="" @@ -34,20 +34,11 @@ KUBE_PRESTARTED_IMAGES="" 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 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 @@ -73,9 +64,7 @@ for __httpx in $TESTED_PROTOCOLS ; do # Clean container and start all needed containers # clean_environment - if [ $RUNMODE == "KUBE" ]; then - start_kube_proxy - fi + start_kube_proxy if [ $__httpx == "HTTPS" ]; then use_cr_https @@ -91,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_PATH/ric-registration" + api_put_service 201 "ric-registration" 0 "$CR_SERVICE_APP_PATH_0/ric-registration" if [ $__httpx == "HTTPS" ]; then @@ -126,7 +115,7 @@ for __httpx in $TESTED_PROTOCOLS ; do start_mr - start_cr + start_cr 1 start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE @@ -178,8 +167,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 @@ -196,14 +185,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_0/1" - api_put_service 200 "service1" 2000 "$CR_SERVICE_PATH/1" + api_put_service 200 "service1" 2000 "$CR_SERVICE_APP_PATH_0/1" - api_put_service 400 "service2" -1 "$CR_SERVICE_PATH/2" + api_put_service 400 "service2" -1 "$CR_SERVICE_APP_PATH_0/2" - api_put_service 400 "service2" "wrong" "$CR_SERVICE_PATH/2" + api_put_service 400 "service2" "wrong" "$CR_SERVICE_APP_PATH_0/2" api_put_service 400 "service2" 100 "/test" @@ -211,20 +200,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_0/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_0/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_0/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_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 @@ -253,7 +242,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_0/1" api_get_service_ids 200 "service1" "service2" "service3" "ric-registration" @@ -388,10 +377,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_0/1" if [ "$PMS_VERSION" == "V2" ]; then - notificationurl=$CR_SERVICE_PATH"/test" + notificationurl=$CR_SERVICE_APP_PATH_0"/test" else notificationurl="" fi @@ -546,7 +535,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