X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC310.sh;h=eec4542059c622f0927935f9f37d94c2b82f4de5;hb=de4d0f86a327469fb64645c2bcd3aeea7832ad25;hp=3edb0220563b615173afaaefb60f7f44ed7558f0;hpb=49f0e5ab01b51aee8713a17aed86cd6d229b40cc;p=nonrtric.git

diff --git a/test/auto-test/FTC310.sh b/test/auto-test/FTC310.sh
index 3edb0220..eec45420 100755
--- a/test/auto-test/FTC310.sh
+++ b/test/auto-test/FTC310.sh
@@ -18,13 +18,13 @@
 #
 
 
-TC_ONELINE_DESCR="Resync of RIC via changes in the consul config"
+TC_ONELINE_DESCR="Resync of RIC via changes in the consul config or pushed config"
 
 #App names to include in the test, space separated list
 INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM"
 
 #SUPPORTED TEST ENV FILE
-SUPPORTED_PROFILES="ONAP-MASTER ONAP-GUILIN"
+SUPPORTED_PROFILES="ONAP-MASTER ONAP-GUILIN ORAN-CHERRY"
 
 . ../common/testcase_common.sh  $@
 . ../common/agent_api_functions.sh
@@ -33,87 +33,114 @@ SUPPORTED_PROFILES="ONAP-MASTER ONAP-GUILIN"
 
 #### TEST BEGIN ####
 
-generate_uuid
+if [ "$PMS_VERSION" == "V2" ]; then
+    TESTED_VARIANTS="CONSUL NOCONSUL"
+else
+    TESTED_VARIANTS="CONSUL"
+fi
 
-# Clean container and start all needed containers #
-clean_containers
+for consul_conf in $TESTED_VARIANTS ; do
+    generate_uuid
 
-start_policy_agent
+    # Clean container and start all needed containers #
+    clean_containers
 
-set_agent_trace
+    start_policy_agent
 
-# Create service to be able to receive events when rics becomes available
-# Must use rest towards the agent since dmaap is not configured yet
-api_put_service 201 "ric-registration" 0 "$CR_PATH/ric-registration"
+    set_agent_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
-if [ "$PMS_VERSION" == "V2" ]; then
-    start_ric_simulators ricsim_g3 1  STD_2.0.0
-fi
+    # Create service to be able to receive events when rics becomes available
+    # Must use rest towards the agent since dmaap is not configured yet
+    api_put_service 201 "ric-registration" 0 "$CR_PATH/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 [ "$PMS_VERSION" == "V2" ]; then
+        start_ric_simulators ricsim_g3 1  STD_2.0.0
+    fi
 
-start_cr
+    start_mr
 
-start_consul_cbs
+    start_cr
 
-start_control_panel
+    start_control_panel
 
-prepare_consul_config      NOSDNC  ".consul_config.json"
+    if [ $consul_conf == "CONSUL" ]; then
+        start_consul_cbs
+    fi
 
-consul_config_app                  ".consul_config.json"
+    prepare_consul_config      NOSDNC  ".consul_config.json"
 
-if [ "$PMS_VERSION" == "V2" ]; then
-    api_equal json:rics 3 120
+    if [ "$PMS_VERSION" == "V2" ] && [ $consul_conf == "NOCONSUL" ]; then
+        api_put_configuration 200 ".consul_config.json"
+        api_get_configuration 200 ".consul_config.json"
+    else
+        consul_config_app                  ".consul_config.json"
+    fi
 
-    cr_equal received_callbacks 3 120
+    if [ "$PMS_VERSION" == "V2" ]; then
+        api_equal json:rics 3 120
 
-    cr_api_check_all_sync_events 200 ric-registration ricsim_g1_1 ricsim_g2_1 ricsim_g3_1
-else
-    api_equal json:rics 2 120
-fi
+        cr_equal received_callbacks 3 120
 
-# Add an STD RIC and check
-start_ric_simulators ricsim_g2 2  STD_1.1.3
+        cr_api_check_all_sync_events 200 ric-registration ricsim_g1_1 ricsim_g2_1 ricsim_g3_1
+    else
+        api_equal json:rics 2 120
+    fi
 
-prepare_consul_config      NOSDNC  ".consul_config.json"
+    # Add an STD RIC and check
+    start_ric_simulators ricsim_g2 2  STD_1.1.3
 
-consul_config_app                  ".consul_config.json"
+    prepare_consul_config      NOSDNC  ".consul_config.json"
+    if [ "$PMS_VERSION" == "V2" ] && [ $consul_conf == "NOCONSUL" ]; then
+        api_put_configuration 200 ".consul_config.json"
+        api_get_configuration 200 ".consul_config.json"
+    else
+        consul_config_app                  ".consul_config.json"
+    fi
 
-if [ "$PMS_VERSION" == "V2" ]; then
-    api_equal json:rics 4 120
+    if [ "$PMS_VERSION" == "V2" ]; then
+        api_equal json:rics 4 120
 
-    cr_equal received_callbacks 4 120
+        cr_equal received_callbacks 4 120
 
-    cr_api_check_all_sync_events 200 ric-registration ricsim_g2_2
-else
-    api_equal json:rics 3 120
-fi
+        cr_api_check_all_sync_events 200 ric-registration ricsim_g2_2
+    else
+        api_equal json:rics 3 120
+    fi
 
-check_policy_agent_logs
-check_control_panel_logs
+    check_policy_agent_logs
+    check_control_panel_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"
+    prepare_consul_config      NOSDNC  ".consul_config.json"
+    if [ "$PMS_VERSION" == "V2" ] && [ $consul_conf == "NOCONSUL" ]; then
+        api_put_configuration 200 ".consul_config.json"
+        api_get_configuration 200 ".consul_config.json"
+    else
+        consul_config_app                  ".consul_config.json"
+    fi
 
-consul_config_app                  ".consul_config.json"
+    if [ "$PMS_VERSION" == "V2" ]; then
+        api_equal json:rics 3 120
 
-if [ "$PMS_VERSION" == "V2" ]; then
-    api_equal json:rics 3 120
+        cr_equal received_callbacks 4 120
+    else
+        api_equal json:rics 2 120
+    fi
 
-    cr_equal received_callbacks 4 120
-else
-    api_equal json:rics 2 120
-fi
+    if [ "$PMS_VERSION" == "V2" ] && [ $consul_conf == "NOCONSUL" ]; then
+        api_get_configuration 200 ".consul_config.json"
+    fi
 
-check_policy_agent_logs
-check_control_panel_logs
+    check_policy_agent_logs
+    check_control_panel_logs
 
-store_logs          END
+    store_logs          END_$consul_conf
+done
 
 
 #### TEST COMPLETE ####