Updates for F release

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

diff --git a/test/auto-test/FTC10.sh b/test/auto-test/FTC10.sh
index 50cf98f..481f450 100755 (executable)
--- a/test/auto-test/FTC10.sh
+++ b/test/auto-test/FTC10.sh
@@ -30,7 +30,7 @@ KUBE_PRESTARTED_IMAGES=""
 #Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if
 #the image is not configured in the supplied env_file
 #Used for images not applicable to all supported profile
-CONDITIONALLY_IGNORED_IMAGES="NGW"
+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"
@@ -67,7 +67,9 @@ start_mr
 start_cr 1
 
 if [ $RUNMODE == "DOCKER" ]; then
-    start_consul_cbs
+    if [[ "$PMS_FEATURE_LEVEL" != *"NOCONSUL"* ]]; then
+        start_consul_cbs
+    fi
 fi
 
 start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE
@@ -87,7 +89,11 @@ prepare_consul_config      NOSDNC  ".consul_config.json"
 if [ $RUNMODE == "KUBE" ]; then
     agent_load_config                       ".consul_config.json"
 else
-    consul_config_app                      ".consul_config.json"
+    if [[ "$PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then
+        api_put_configuration 200 ".consul_config.json"
+    else
+        consul_config_app                   ".consul_config.json"
+    fi
 fi
 
 api_get_status 200