X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC310.sh;h=6d024d70099c4c3052727f7d56b19accd929325f;hb=f83c362e67d25a464b80faf6d8363ccacacc5ebb;hp=c776a78d66e4afe14d3240cbf18b497f977a8e66;hpb=f81090f8f5f1fd1a76bb9feab1f41f03252297c3;p=nonrtric.git

diff --git a/test/auto-test/FTC310.sh b/test/auto-test/FTC310.sh
index c776a78d..6d024d70 100755
--- a/test/auto-test/FTC310.sh
+++ b/test/auto-test/FTC310.sh
@@ -18,18 +18,18 @@
 #
 
 
-TC_ONELINE_DESCR="Resync of RIC via changes in the consul config or pushed config"
+TC_ONELINE_DESCR="Resync of RIC via changes in the pushed config"
 
 #App names to include in the test when running docker, space separated list
-DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR A1PMS RICSIM KUBEPROXY"
+DOCKER_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM KUBEPROXY"
 
 #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"
+CONDITIONALLY_IGNORED_IMAGES=""
 
 #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-JAKARTA ONAP-KOHN ONAP-LONDON  ORAN-F-RELEASE ORAN-G-RELEASE ORAN-H-RELEASE"
 #Supported run modes
 SUPPORTED_RUNMODES="DOCKER"
 
@@ -39,126 +39,81 @@ setup_testenvironment
 
 #### TEST BEGIN ####
 
-if [ "$A1PMS_VERSION" == "V2" ]; then
-    TESTED_VARIANTS="CONSUL NOCONSUL"
-    if [[ "$A1PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then
-        TESTED_VARIANTS="NOCONSUL"
-    fi
-else
-    TESTED_VARIANTS="CONSUL"
-fi
+generate_policy_uuid
+
+# Clean container and start all needed containers #
+clean_environment
 
-for consul_conf in $TESTED_VARIANTS ; do
-    generate_policy_uuid
+start_kube_proxy
 
-    # Clean container and start all needed containers #
-    clean_environment
+start_a1pms NOPROXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE
 
-    start_kube_proxy
+set_a1pms_trace
 
-    start_a1pms NOPROXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE
+# Create service to be able to receive events when rics becomes available
+# Must use rest towards the a1pms since dmaap is not configured yet
+a1pms_api_put_service 201 "ric-registration" 0 "$CR_SERVICE_APP_PATH_0/ric-registration"
 
-    set_a1pms_trace
+# Start one RIC of each type
+start_ric_simulators ricsim_g1 1  OSC_2.1.0
+start_ric_simulators ricsim_g2 1  STD_1.1.3
+start_ric_simulators ricsim_g3 1  STD_2.0.0
 
-    # Create service to be able to receive events when rics becomes available
-    # Must use rest towards the a1pms since dmaap is not configured yet
-    a1pms_api_put_service 201 "ric-registration" 0 "$CR_SERVICE_APP_PATH_0/ric-registration"
+start_mr
 
-    # Start one RIC of each type
-    start_ric_simulators ricsim_g1 1  OSC_2.1.0
-    start_ric_simulators ricsim_g2 1  STD_1.1.3
-    if [ "$A1PMS_VERSION" == "V2" ]; then
-        start_ric_simulators ricsim_g3 1  STD_2.0.0
-    fi
+start_cr 1
 
-    start_mr
+start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE
 
-    start_cr 1
 
-    start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE
 
-    if [ $consul_conf == "CONSUL" ]; then
-        start_consul_cbs
-    fi
 
-    __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 [ "$A1PMS_VERSION" == "V2" ] && [ $consul_conf == "NOCONSUL" ]; then
-        a1pms_api_put_configuration 200 ".consul_config.json"
-        a1pms_api_get_configuration 200 ".consul_config.json"
-    else
-        consul_config_app                  ".consul_config.json"
-    fi
+a1pms_api_put_configuration 200 ".a1pms_config.json"
+a1pms_api_get_configuration 200 ".a1pms_config.json"
 
-    if [ "$A1PMS_VERSION" == "V2" ]; then
-        a1pms_equal json:rics 3 300
+a1pms_equal json:rics 3 300
 
-        cr_equal 0 received_callbacks 3 120
+cr_equal 0 received_callbacks 3 120
 
-        cr_api_check_all_sync_events 200 0 ric-registration ricsim_g1_1 ricsim_g2_1 ricsim_g3_1
-    else
-        a1pms_equal json:rics 2 300
-    fi
+cr_api_check_all_sync_events 200 0 ric-registration ricsim_g1_1 ricsim_g2_1 ricsim_g3_1
 
-    # Add an STD RIC and check
-    start_ric_simulators ricsim_g2 2  STD_1.1.3
+# Add an STD RIC and check
+start_ric_simulators ricsim_g2 2  STD_1.1.3
 
-    prepare_consul_config      NOSDNC  ".consul_config.json" $__CONFIG_HEADER
-    if [ "$A1PMS_VERSION" == "V2" ] && [ $consul_conf == "NOCONSUL" ]; then
-        a1pms_api_put_configuration 200 ".consul_config.json"
-        a1pms_api_get_configuration 200 ".consul_config.json"
-    else
-        consul_config_app                  ".consul_config.json"
-    fi
+prepare_a1pms_config      NOSDNC  ".a1pms_config.json"
+a1pms_api_put_configuration 200 ".a1pms_config.json"
+a1pms_api_get_configuration 200 ".a1pms_config.json"
 
-    if [ "$A1PMS_VERSION" == "V2" ]; then
-        a1pms_equal json:rics 4 120
+a1pms_equal json:rics 4 120
 
-        cr_equal 0 received_callbacks 4 120
+cr_equal 0 received_callbacks 4 120
 
-        cr_api_check_all_sync_events 200 0 ric-registration ricsim_g2_2
-    else
-        a1pms_equal json:rics 3 120
-    fi
+cr_api_check_all_sync_events 200 0 ric-registration ricsim_g2_2
 
-    check_a1pms_logs
+check_a1pms_logs
 
 
-    # Remove one RIC RIC and check
-    start_ric_simulators ricsim_g2 1  STD_1.1.3
+# Remove one RIC RIC and check
+start_ric_simulators ricsim_g2 1  STD_1.1.3
 
-    prepare_consul_config      NOSDNC  ".consul_config.json" $__CONFIG_HEADER
-    if [ "$A1PMS_VERSION" == "V2" ] && [ $consul_conf == "NOCONSUL" ]; then
-        a1pms_api_put_configuration 200 ".consul_config.json"
-        a1pms_api_get_configuration 200 ".consul_config.json"
-    else
-        consul_config_app                  ".consul_config.json"
-    fi
+prepare_a1pms_config      NOSDNC  ".a1pms_config.json"
+a1pms_api_put_configuration 200 ".a1pms_config.json"
+a1pms_api_get_configuration 200 ".a1pms_config.json"
 
-    if [ "$A1PMS_VERSION" == "V2" ]; then
-        a1pms_equal json:rics 3 120
+a1pms_equal json:rics 3 120
 
-        cr_equal 0 received_callbacks 4 120
-    else
-        a1pms_equal json:rics 2 120
-    fi
+cr_equal 0 received_callbacks 4 120
+
+if [ "$A1PMS_VERSION" == "V2" ]; then
+    a1pms_api_get_configuration 200 ".a1pms_config.json"
+fi
 
-    if [ "$A1PMS_VERSION" == "V2" ] && [ $consul_conf == "NOCONSUL" ]; then
-        a1pms_api_get_configuration 200 ".consul_config.json"
-    fi
+check_a1pms_logs
 
-    check_a1pms_logs
+store_logs          END_$consul_conf
 
-    store_logs          END_$consul_conf
-done
 
 
 #### TEST COMPLETE ####