X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC900.sh;h=f76d21e46b98cf4c0b57af31a0d8d566d7d8b175;hb=8fbb226ef10720895adb98e6ca7ac1cae39f0103;hp=a1ae6e43a9b569927bbee14b6d84c72c02e40a58;hpb=4dd321bda70fab4987c1ea7aa0dffc5e1eb74252;p=nonrtric.git diff --git a/test/auto-test/FTC900.sh b/test/auto-test/FTC900.sh index a1ae6e43..f76d21e4 100755 --- a/test/auto-test/FTC900.sh +++ b/test/auto-test/FTC900.sh @@ -30,7 +30,7 @@ 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 ONAP-JAKARTA ORAN-CHERRY ORAN-D-RELEASE ORAN-E-RELEASE ORAN-F-RELEASE" @@ -70,16 +70,17 @@ start_policy_agent NORPOXY $SIM_GROUP/$POLICY_AGENT_COMPOSE_DIR/$POLICY_AGENT_CO use_agent_rest_http -if [ $RUNMODE == "DOCKER" ]; then - start_consul_cbs -fi - 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 api_get_status 200