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=3edb0220563b615173afaaefb60f7f44ed7558f0;hpb=803d48989d7824309602393763142320cdbbc0d2;p=nonrtric.git

diff --git a/test/auto-test/FTC310.sh b/test/auto-test/FTC310.sh
index 3edb0220..6d024d70 100755
--- a/test/auto-test/FTC310.sh
+++ b/test/auto-test/FTC310.sh
@@ -18,102 +18,102 @@
 #
 
 
-TC_ONELINE_DESCR="Resync of RIC via changes in the consul config"
+TC_ONELINE_DESCR="Resync of RIC via changes in the pushed config"
 
-#App names to include in the test, space separated list
-INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM"
+#App names to include in the test when running docker, space separated list
+DOCKER_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM KUBEPROXY"
 
-#SUPPORTED TEST ENV FILE
-SUPPORTED_PROFILES="ONAP-MASTER ONAP-GUILIN"
+#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=""
 
-. ../common/testcase_common.sh  $@
-. ../common/agent_api_functions.sh
-. ../common/ricsimulator_api_functions.sh
-. ../common/cr_api_functions.sh
+#Supported test environment profiles
+SUPPORTED_PROFILES="ONAP-JAKARTA ONAP-KOHN ONAP-LONDON  ORAN-F-RELEASE ORAN-G-RELEASE ORAN-H-RELEASE"
+#Supported run modes
+SUPPORTED_RUNMODES="DOCKER"
+
+. ../common/testcase_common.sh $@
+
+setup_testenvironment
 
 #### TEST BEGIN ####
 
-generate_uuid
+generate_policy_uuid
 
 # Clean container and start all needed containers #
-clean_containers
+clean_environment
+
+start_kube_proxy
 
-start_policy_agent
+start_a1pms NOPROXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE
 
-set_agent_trace
+set_a1pms_trace
 
 # 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"
+# 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 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_ric_simulators ricsim_g3 1  STD_2.0.0
 
 start_mr
 
-start_cr
+start_cr 1
 
-start_consul_cbs
+start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE
 
-start_control_panel
 
-prepare_consul_config      NOSDNC  ".consul_config.json"
 
-consul_config_app                  ".consul_config.json"
 
-if [ "$PMS_VERSION" == "V2" ]; then
-    api_equal json:rics 3 120
+prepare_a1pms_config      NOSDNC  ".a1pms_config.json"
 
-    cr_equal received_callbacks 3 120
+a1pms_api_put_configuration 200 ".a1pms_config.json"
+a1pms_api_get_configuration 200 ".a1pms_config.json"
 
-    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
+a1pms_equal json:rics 3 300
+
+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
 
 # Add an STD RIC and check
 start_ric_simulators ricsim_g2 2  STD_1.1.3
 
-prepare_consul_config      NOSDNC  ".consul_config.json"
+prepare_a1pms_config      NOSDNC  ".a1pms_config.json"
+a1pms_api_put_configuration 200 ".a1pms_config.json"
+a1pms_api_get_configuration 200 ".a1pms_config.json"
 
-consul_config_app                  ".consul_config.json"
+a1pms_equal json:rics 4 120
 
-if [ "$PMS_VERSION" == "V2" ]; then
-    api_equal json:rics 4 120
+cr_equal 0 received_callbacks 4 120
 
-    cr_equal received_callbacks 4 120
+cr_api_check_all_sync_events 200 0 ric-registration ricsim_g2_2
 
-    cr_api_check_all_sync_events 200 ric-registration ricsim_g2_2
-else
-    api_equal json:rics 3 120
-fi
+check_a1pms_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
 
-prepare_consul_config      NOSDNC  ".consul_config.json"
+prepare_a1pms_config      NOSDNC  ".a1pms_config.json"
+a1pms_api_put_configuration 200 ".a1pms_config.json"
+a1pms_api_get_configuration 200 ".a1pms_config.json"
 
-consul_config_app                  ".consul_config.json"
+a1pms_equal json:rics 3 120
 
-if [ "$PMS_VERSION" == "V2" ]; then
-    api_equal json:rics 3 120
+cr_equal 0 received_callbacks 4 120
 
-    cr_equal received_callbacks 4 120
-else
-    api_equal json:rics 2 120
+if [ "$A1PMS_VERSION" == "V2" ]; then
+    a1pms_api_get_configuration 200 ".a1pms_config.json"
 fi
 
-check_policy_agent_logs
-check_control_panel_logs
+check_a1pms_logs
+
+store_logs          END_$consul_conf
 
-store_logs          END
 
 
 #### TEST COMPLETE ####
@@ -121,4 +121,4 @@ store_logs          END
 
 print_result
 
-auto_clean_containers
+auto_clean_environment