X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=test%2Fauto-test%2FFTC110.sh;h=b9168cdc737e4e3670f56e7764c691b103da396b;hb=2479d8eeffbf064eaa3e11138c80d2368b386157;hp=c1c744e091f6a5c93b83181420919ecc3826eb06;hpb=d2aeca8843fe3ffca2e73dec5b64daeef0dda938;p=nonrtric.git diff --git a/test/auto-test/FTC110.sh b/test/auto-test/FTC110.sh index c1c744e0..b9168cdc 100755 --- a/test/auto-test/FTC110.sh +++ b/test/auto-test/FTC110.sh @@ -34,7 +34,7 @@ KUBE_PRESTARTED_IMAGES="" 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" +SUPPORTED_PROFILES="ONAP-GUILIN ONAP-HONOLULU ONAP-ISTANBUL ONAP-JAKARTA ONAP-KOHN ONAP-LONDON ORAN-CHERRY ORAN-D-RELEASE ORAN-E-RELEASE ORAN-F-RELEASE ORAN-G-RELEASE ORAN-H-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" @@ -73,7 +73,15 @@ fi start_a1pms NORPOXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE -prepare_consul_config NOSDNC ".consul_config.json" +__CONFIG_HEADER="NOHEADER" +if [ $RUNMODE == "KUBE" ]; then + __CONFIG_HEADER="HEADER" +else + if [[ "$A1PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then + __CONFIG_HEADER="HEADER" + fi +fi +prepare_consul_config NOSDNC ".consul_config.json" $__CONFIG_HEADER if [ $RUNMODE == "KUBE" ]; then a1pms_load_config ".consul_config.json" @@ -90,6 +98,8 @@ set_a1pms_debug mr_equal requests_submitted 0 +sleep_wait 120 "Let A1PMS cofiguration take effect" + #Check a1pms alive a1pms_api_get_status 200