X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=test%2Fauto-test%2FFTC850.sh;h=4b795c0865feabd191ff64b13bd8a887b15eadb5;hb=f83c362e67d25a464b80faf6d8363ccacacc5ebb;hp=7bdfa8292edd9938e9ef65a9cc070642bf110246;hpb=b8ae6c467edee10ef39f1b43097fd1ec426e86b7;p=nonrtric.git

diff --git a/test/auto-test/FTC850.sh b/test/auto-test/FTC850.sh
index 7bdfa829..4b795c08 100755
--- a/test/auto-test/FTC850.sh
+++ b/test/auto-test/FTC850.sh
@@ -20,7 +20,7 @@
 TC_ONELINE_DESCR="Create/delete policies in parallel over a number of rics using a number of child process"
 
 #App names to include in the test when running docker, space separated list
-DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR A1PMS RICSIM SDNC NGW KUBEPROXY"
+DOCKER_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM SDNC NGW KUBEPROXY"
 
 #App names to include in the test when running kubernetes, space separated list
 KUBE_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM SDNC 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-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_PROFILES="ONAP-JAKARTA ONAP-KOHN ONAP-LONDON  ORAN-F-RELEASE ORAN-G-RELEASE ORAN-H-RELEASE"
 #Supported run modes
 SUPPORTED_RUNMODES="DOCKER KUBE"
 
@@ -57,11 +57,7 @@ NUM_POLICIES_PER_RIC=500
 
 generate_policy_uuid
 
-if [ "$A1PMS_VERSION" == "V2" ]; then
-    notificationurl=$CR_SERVICE_APP_PATH_0"/test"
-else
-    notificationurl=""
-fi
+notificationurl=$CR_SERVICE_APP_PATH_0"/test"
 
 for __httpx in $TESTED_PROTOCOLS ; do
     for interface in $TESTED_VARIANTS ; do
@@ -107,31 +103,19 @@ 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" $__CONFIG_HEADER
+            prepare_a1pms_config      SDNC  ".a1pms_config.json"
         else
-            prepare_consul_config      NOSDNC  ".consul_config.json" $__CONFIG_HEADER
+            prepare_a1pms_config      NOSDNC  ".a1pms_config.json"
         fi
 
         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_mr # Not used, but removes error messages from the a1pms log
@@ -153,22 +137,14 @@ for __httpx in $TESTED_PROTOCOLS ; do
             sim_put_policy_type 201 ricsim_g1_$i 1 testdata/OSC/sim_1.json
         done
 
-        if [ "$A1PMS_VERSION" == "V2" ]; then
-            a1pms_equal json:policy-types 1 300  #Wait for the a1pms to refresh types from the simulator
-        else
-            a1pms_equal json:policy_types 1 300  #Wait for the a1pms to refresh types from the simulator
-        fi
+         a1pms_equal json:policy-types 1 300  #Wait for the a1pms to refresh types from the simulator
 
         a1pms_api_put_service 201 "serv1" 600 "$CR_SERVICE_APP_PATH_0/1"
 
         echo "Check the number of types in the a1pms for each ric is 1"
         for ((i=1; i<=$NUM_RICS; i++))
         do
-            if [ "$A1PMS_VERSION" == "V2" ]; then
-                a1pms_equal json:policy-types?ric_id=ricsim_g1_$i 1 120
-            else
-                a1pms_equal json:policy_types?ric=ricsim_g1_$i 1 120
-            fi
+            a1pms_equal json:policy-types?ric_id=ricsim_g1_$i 1 120
         done
 
         START_ID=2000