X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC310.sh;h=c0205f77dd4d0fb6d6a41dea558159f4485de41d;hb=refs%2Fchanges%2F88%2F12388%2F5;hp=18d681633f740e6c8d9663fc764c3b7e719bd723;hpb=6116e98837066075013c5ee22b39a2df4ff604ea;p=nonrtric.git

diff --git a/test/auto-test/FTC310.sh b/test/auto-test/FTC310.sh
index 18d68163..c0205f77 100755
--- a/test/auto-test/FTC310.sh
+++ b/test/auto-test/FTC310.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 
 #  ============LICENSE_START===============================================
-#  Copyright (C) 2020 Nordix Foundation. All rights reserved.
+#  Copyright (C) 2020-2023 Nordix Foundation. All rights reserved.
+#  Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved.
 #  ========================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -18,68 +19,106 @@
 #
 
 
-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 exclude checking pulling images for, space separated list
-EXCLUDED_IMAGES="SDNC_ONAP"
+#App names to include in the test when running docker, space separated list
+DOCKER_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM KUBEPROXY"
 
-. ../common/testcase_common.sh  $@
-. ../common/agent_api_functions.sh
-. ../common/ricsimulator_api_functions.sh
-. ../common/controller_api_functions.sh
+#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=""
+
+#Supported test environment profiles
+SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL  ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE"
+#Supported run modes
+SUPPORTED_RUNMODES="DOCKER"
+
+. ../common/testcase_common.sh $@
+
+setup_testenvironment
 
 #### TEST BEGIN ####
 
+sim_generate_policy_uuid
 
 # Clean container and start all needed containers #
-clean_containers
+clean_environment
+
+start_kube_proxy
+
+start_a1pms NOPROXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE
+
+set_a1pms_trace
+
+# 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 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
 
-start_mr
+if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+    :
+else
+    start_mr
+fi
 
-start_cr
+start_cr 1
 
-start_consul_cbs
+start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE
 
-prepare_consul_config      NOSDNC  ".consul_config.json"
 
-consul_config_app                  ".consul_config.json"
 
-start_control_panel
 
-start_policy_agent
+prepare_a1pms_config      NOSDNC  ".a1pms_config.json"
 
-api_equal json:rics 2 120
+a1pms_api_put_configuration 200 ".a1pms_config.json"
+a1pms_api_get_configuration 200 ".a1pms_config.json"
 
+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
 
-# Add an OSC 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
 
-api_equal json:rics 3 120
+cr_equal 0 received_callbacks 4 120
 
-check_policy_agent_logs
-check_control_panel_logs
+cr_api_check_all_sync_events 200 0 ric-registration ricsim_g2_2
 
-# Remove one OSC RIC and check
+check_a1pms_logs
+
+# Remove one 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"
+
+a1pms_equal json:rics 3 120
+
+cr_equal 0 received_callbacks 4 120
 
-consul_config_app                  ".consul_config.json"
+if [ "$A1PMS_VERSION" == "V2" ]; then
+    a1pms_api_get_configuration 200 ".a1pms_config.json"
+fi
 
-api_equal json:rics 2 120
+check_a1pms_logs
 
-check_policy_agent_logs
-check_control_panel_logs
+store_logs          END_$consul_conf
 
-store_logs          END
 
 
 #### TEST COMPLETE ####
@@ -87,4 +126,4 @@ store_logs          END
 
 print_result
 
-auto_clean_containers
+auto_clean_environment