Image version updates for test

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

diff --git a/test/auto-test/FTC805.sh b/test/auto-test/FTC805.sh
index 00aa525..c4981a1 100755 (executable)
--- a/test/auto-test/FTC805.sh
+++ b/test/auto-test/FTC805.sh
@@ -33,7 +33,7 @@ KUBE_PRESTARTED_IMAGES=""
 CONDITIONALLY_IGNORED_IMAGES="CBS CONSUL NGW"
 
 #Supported test environment profiles
-SUPPORTED_PROFILES="ONAP-ISTANBUL ONAP-JAKARTA ORAN-D-RELEASE ORAN-E-RELEASE ORAN-F-RELEASE"
+SUPPORTED_PROFILES="ONAP-ISTANBUL ONAP-JAKARTA ONAP-KOHN ONAP-LONDON  ORAN-D-RELEASE ORAN-E-RELEASE ORAN-F-RELEASE ORAN-G-RELEASE"
 #Supported run modes
 SUPPORTED_RUNMODES="DOCKER KUBE"
 
@@ -106,11 +106,20 @@ for __httpx in $TESTED_PROTOCOLS ; do
 
         set_a1pms_debug
 
+        __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
@@ -126,6 +135,8 @@ for __httpx in $TESTED_PROTOCOLS ; do
 
         start_cr 1
 
+        sleep_wait 120 "Let A1PMS cofiguration take effect"
+
         a1pms_api_get_status 200
 
         for ((i=1; i<=$NUM_RICS; i++))