X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC2001.sh;h=3b53e8ef7a78e0cced0fe32927b93edd5167f84d;hb=f83c362e67d25a464b80faf6d8363ccacacc5ebb;hp=a9db8143296a79b50f6fcee89d2dfd39783d7973;hpb=2c5af88869ce0fa702b011dbc6cb8a272273f70e;p=nonrtric.git

diff --git a/test/auto-test/FTC2001.sh b/test/auto-test/FTC2001.sh
index a9db8143..3b53e8ef 100755
--- a/test/auto-test/FTC2001.sh
+++ b/test/auto-test/FTC2001.sh
@@ -20,7 +20,7 @@
 TC_ONELINE_DESCR="Testing southbound proxy for A1PMS and ICS"
 
 #App names to include in the test when running docker, space separated list
-DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR A1PMS RICSIM ICS PRODSTUB HTTPPROXY NGW KUBEPROXY"
+DOCKER_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM ICS PRODSTUB HTTPPROXY NGW KUBEPROXY"
 
 #App names to include in the test when running kubernetes, space separated list
 KUBE_INCLUDED_IMAGES=" MR CR A1PMS PRODSTUB RICSIM CP ICS HTTPPROXY KUBEPROXY NGW"
@@ -30,10 +30,10 @@ 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="CBS CONSUL NGW"
+CONDITIONALLY_IGNORED_IMAGES="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-JAKARTA ONAP-KOHN ONAP-LONDON  ORAN-F-RELEASE ORAN-G-RELEASE ORAN-H-RELEASE"
 #Supported run modes
 SUPPORTED_RUNMODES="DOCKER KUBE"
 
@@ -52,12 +52,7 @@ use_simulator_https
 use_ics_rest_https
 use_prod_stub_https
 
-if [ "$A1PMS_VERSION" == "V2" ]; then
-    notificationurl=$CR_SERVICE_APP_PATH_0"/test"
-else
-   echo "A1PMS VERSION 2 (V2) is required"
-   exit 1
-fi
+notificationurl=$CR_SERVICE_APP_PATH_0"/test"
 
 clean_environment
 
@@ -79,26 +74,14 @@ fi
 
 start_a1pms PROXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE
 
-__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
+
+prepare_a1pms_config      NOSDNC  ".a1pms_config.json"
 
 if [ $RUNMODE == "KUBE" ]; then
-    a1pms_load_config                       ".consul_config.json"
+    a1pms_load_config                       ".a1pms_config.json"
 else
-    if [[ "$A1PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then
-        a1pms_api_put_configuration 200 ".consul_config.json"
-    else
-        start_consul_cbs
-        consul_config_app                   ".consul_config.json"
-    fi
+    a1pms_api_put_configuration 200 ".a1pms_config.json"
 fi
 
 start_cr 1
@@ -111,6 +94,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