Image version updates for test

[nonrtric.git] / test / auto-test / FTC2001.sh

diff --git a/test/auto-test/FTC2001.sh b/test/auto-test/FTC2001.sh
index 6c9c27b..d11ccc1 100755 (executable)
--- a/test/auto-test/FTC2001.sh
+++ b/test/auto-test/FTC2001.sh
@@ -33,7 +33,7 @@ KUBE_PRESTARTED_IMAGES=""
 CONDITIONALLY_IGNORED_IMAGES="CBS CONSUL NGW"
 
 #Supported test environment profiles
-SUPPORTED_PROFILES="ONAP-HONOLULU ONAP-ISTANBUL ONAP-JAKARTA ORAN-CHERRY ORAN-D-RELEASE ORAN-E-RELEASE ORAN-F-RELEASE"
+SUPPORTED_PROFILES="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"
 
@@ -79,7 +79,16 @@ fi
 
 start_a1pms PROXY $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"
@@ -102,6 +111,8 @@ set_a1pms_trace
 
 set_ics_debug
 
+sleep_wait 120 "Let A1PMS cofiguration take effect"
+
 a1pms_api_get_status 200
 
 # Print the A1 version for STD 2.X