X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC900.sh;h=e698f621ad98a925afbb0c8cc8bfb59686c35ee0;hb=6fc58fd020514c2afce1fc240828bf23f53d8fb6;hp=7f5ca202c8cdd5f6632fc8896847e011504a5207;hpb=be9a07faf8fbc1030404bbc71f409eb5e19736ba;p=nonrtric.git diff --git a/test/auto-test/FTC900.sh b/test/auto-test/FTC900.sh index 7f5ca202..e698f621 100755 --- a/test/auto-test/FTC900.sh +++ b/test/auto-test/FTC900.sh @@ -20,7 +20,7 @@ TC_ONELINE_DESCR="Preparation for test of the Control Panel and the Health Check app - populating a number of ric simulators with types and instances" #App names to include in the test when running docker, space separated list -DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM NGW" +DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM NGW KUBEPROXY" #App names to include in the test when running kubernetes, space separated list KUBE_INCLUDED_IMAGES="CP CR MR PA RICSIM KUBEPROXY NGW" @@ -33,7 +33,7 @@ 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 ORAN-CHERRY ORAN-D-RELEASE ORAN-E-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" @@ -46,6 +46,7 @@ SUPPORTED_RUNMODES="DOCKER KUBE" . ../common/consul_cbs_functions.sh . ../common/kube_proxy_api_functions.sh . ../common/gateway_api_functions.sh +. ../common/cr_api_functions.sh setup_testenvironment @@ -53,9 +54,7 @@ setup_testenvironment clean_environment -if [ $RUNMODE == "KUBE" ]; then - start_kube_proxy -fi +start_kube_proxy OSC_NUM_RICS=6 STD_NUM_RICS=5 @@ -185,10 +184,10 @@ fi # Create policies use_agent_rest_http -api_put_service 201 "Emergency-response-app" 0 "$CR_SERVICE_PATH/1" +api_put_service 201 "Emergency-response-app" 0 "$CR_SERVICE_APP_PATH/1" if [ "$PMS_VERSION" == "V2" ]; then - notificationurl=$CR_SERVICE_PATH"/test" + notificationurl=$CR_SERVICE_APP_PATH"/test" else notificationurl="" fi