Image version updates for test

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

diff --git a/test/auto-test/FTC350.sh b/test/auto-test/FTC350.sh
index 8cee8e5..a30b228 100755 (executable)
--- a/test/auto-test/FTC350.sh
+++ b/test/auto-test/FTC350.sh
@@ -33,7 +33,7 @@ KUBE_PRESTARTED_IMAGES=""
 CONDITIONALLY_IGNORED_IMAGES="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"
 
@@ -81,21 +81,30 @@ for interface in $TESTED_VARIANTS ; do
         fi
     fi
 
+    __CONFIG_HEADER="NOHEADER"
+    if [ $RUNMODE == "KUBE" ]; then
+        __CONFIG_HEADER="HEADER"
+    else
+        if [[ "$A1PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then
+        __CONFIG_HEADER="HEADER"
+        fi
+    fi
+
     # Create first config
     if [[ $interface = *"SDNC"* ]]; then
         start_sdnc
-        prepare_consul_config      SDNC  ".consul_config_initial.json"
+        prepare_consul_config      SDNC  ".consul_config_initial.json"  $__CONFIG_HEADER
     else
-        prepare_consul_config      NOSDNC  ".consul_config_initial.json"
+        prepare_consul_config      NOSDNC  ".consul_config_initial.json" $__CONFIG_HEADER
     fi
 
     # Create 2nd config and save for later
     start_ric_simulators ricsim_g1 $NUM_RICS OSC_2.1.0
 
     if [[ $interface = *"SDNC"* ]]; then
-        prepare_consul_config      SDNC  ".consul_config_all.json"
+        prepare_consul_config      SDNC  ".consul_config_all.json" $__CONFIG_HEADER
     else
-        prepare_consul_config      NOSDNC  ".consul_config_all.json"
+        prepare_consul_config      NOSDNC  ".consul_config_all.json" $__CONFIG_HEADER
     fi
 
     if [ $RUNMODE == "KUBE" ] && [[ "$A1PMS_FEATURE_LEVEL" == *"INITIALCONFIGMAP"* ]]; then
@@ -106,6 +115,8 @@ for interface in $TESTED_VARIANTS ; do
 
     set_a1pms_trace
 
+    sleep_wait 120 "Let A1PMS cofiguration take effect"
+
     a1pms_api_get_status 200
 
     # Create service to be able to receive events when rics becomes available