X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC1.sh;h=50c1870344c82f8373714ebf15c19e97f7227cf7;hb=refs%2Fchanges%2F33%2F9733%2F1;hp=adb2f227fe3e8f30513e2632dfb448e829fbb5a4;hpb=d2aeca8843fe3ffca2e73dec5b64daeef0dda938;p=nonrtric.git diff --git a/test/auto-test/FTC1.sh b/test/auto-test/FTC1.sh index adb2f227..50c18703 100755 --- a/test/auto-test/FTC1.sh +++ b/test/auto-test/FTC1.sh @@ -34,7 +34,7 @@ KUBE_PRESTARTED_IMAGES="" CONDITIONALLY_IGNORED_IMAGES="NGW CBS CONSUL" #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" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" @@ -120,11 +120,19 @@ for __httpx in $TESTED_PROTOCOLS ; do start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE fi + __CONFIG_HEADER="NOHEADER" + if [ $RUNMODE == "KUBE" ]; then + __CONFIG_HEADER="HEADER" + else + if [[ "$A1PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then + __CONFIG_HEADER="HEADER" + fi + fi if [[ $interface = *"SDNC"* ]]; then start_sdnc - prepare_consul_config SDNC ".consul_config.json" + prepare_consul_config SDNC ".consul_config.json" $__CONFIG_HEADER else - prepare_consul_config NOSDNC ".consul_config.json" + prepare_consul_config NOSDNC ".consul_config.json" $__CONFIG_HEADER fi if [ $RUNMODE == "KUBE" ]; then @@ -193,6 +201,8 @@ for __httpx in $TESTED_PROTOCOLS ; do echo "############## Health check ################" echo "############################################" + sleep_wait 120 "Let A1PMS cofiguration take effect" + a1pms_api_get_status 200 echo "############################################"