X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC310.sh;h=0f24ce4fd5bd33e4d5312b333e6d92bdf549b9ed;hb=refs%2Fchanges%2F33%2F9733%2F1;hp=dd79b33f0143fe72cc843ee3e0668071b6214fc4;hpb=1e539490bc37fed791895dd1f2f898caa3b0ca5c;p=nonrtric.git

diff --git a/test/auto-test/FTC310.sh b/test/auto-test/FTC310.sh
index dd79b33f..0f24ce4f 100755
--- a/test/auto-test/FTC310.sh
+++ b/test/auto-test/FTC310.sh
@@ -21,128 +21,141 @@
 TC_ONELINE_DESCR="Resync of RIC via changes in the consul config or pushed config"
 
 #App names to include in the test when running docker, space separated list
-DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM"
+DOCKER_INCLUDED_IMAGES="CBS CONSUL 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"
 
 #Supported test environment profiles
-SUPPORTED_PROFILES="ONAP-GUILIN ONAP-HONOLULU  ORAN-CHERRY ORAN-DAWN"
+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 run modes
 SUPPORTED_RUNMODES="DOCKER"
 
-. ../common/testcase_common.sh  $@
-. ../common/agent_api_functions.sh
-. ../common/ricsimulator_api_functions.sh
-. ../common/cr_api_functions.sh
-. ../common/mr_api_functions.sh
-. ../common/control_panel_api_functions.sh
-. ../common/controller_api_functions.sh
+. ../common/testcase_common.sh $@
+
+setup_testenvironment
 
 #### TEST BEGIN ####
 
-if [ "$PMS_VERSION" == "V2" ]; then
+if [ "$A1PMS_VERSION" == "V2" ]; then
     TESTED_VARIANTS="CONSUL NOCONSUL"
+    if [[ "$A1PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then
+        TESTED_VARIANTS="NOCONSUL"
+    fi
 else
     TESTED_VARIANTS="CONSUL"
 fi
 
 for consul_conf in $TESTED_VARIANTS ; do
-    generate_uuid
+    generate_policy_uuid
 
     # Clean container and start all needed containers #
     clean_environment
 
-    start_policy_agent
+    start_kube_proxy
+
+    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_SERVICE_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
+    if [ "$A1PMS_VERSION" == "V2" ]; then
         start_ric_simulators ricsim_g3 1  STD_2.0.0
     fi
 
     start_mr
 
-    start_cr
+    start_cr 1
 
-    start_control_panel
+    start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE
 
     if [ $consul_conf == "CONSUL" ]; then
         start_consul_cbs
     fi
 
-    prepare_consul_config      NOSDNC  ".consul_config.json"
+    __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
 
-    if [ "$PMS_VERSION" == "V2" ] && [ $consul_conf == "NOCONSUL" ]; then
-        api_put_configuration 200 ".consul_config.json"
-        api_get_configuration 200 ".consul_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
 
-    if [ "$PMS_VERSION" == "V2" ]; then
-        api_equal json:rics 3 300
+    if [ "$A1PMS_VERSION" == "V2" ]; then
+        a1pms_equal json:rics 3 300
 
-        cr_equal received_callbacks 3 120
+        cr_equal 0 received_callbacks 3 120
 
-        cr_api_check_all_sync_events 200 ric-registration ricsim_g1_1 ricsim_g2_1 ricsim_g3_1
+        cr_api_check_all_sync_events 200 0 ric-registration ricsim_g1_1 ricsim_g2_1 ricsim_g3_1
     else
-        api_equal json:rics 2 300
+        a1pms_equal json:rics 2 300
     fi
 
     # Add an STD RIC and check
     start_ric_simulators ricsim_g2 2  STD_1.1.3
 
-    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"
+    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
 
-    if [ "$PMS_VERSION" == "V2" ]; then
-        api_equal json:rics 4 120
+    if [ "$A1PMS_VERSION" == "V2" ]; then
+        a1pms_equal json:rics 4 120
 
-        cr_equal received_callbacks 4 120
+        cr_equal 0 received_callbacks 4 120
 
-        cr_api_check_all_sync_events 200 ric-registration ricsim_g2_2
+        cr_api_check_all_sync_events 200 0 ric-registration ricsim_g2_2
     else
-        api_equal json:rics 3 120
+        a1pms_equal json:rics 3 120
     fi
 
-    check_policy_agent_logs
-    check_control_panel_logs
+    check_a1pms_logs
+
 
     # Remove one RIC RIC and check
     start_ric_simulators ricsim_g2 1  STD_1.1.3
 
-    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"
+    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
 
-    if [ "$PMS_VERSION" == "V2" ]; then
-        api_equal json:rics 3 120
+    if [ "$A1PMS_VERSION" == "V2" ]; then
+        a1pms_equal json:rics 3 120
 
-        cr_equal received_callbacks 4 120
+        cr_equal 0 received_callbacks 4 120
     else
-        api_equal json:rics 2 120
+        a1pms_equal json:rics 2 120
     fi
 
-    if [ "$PMS_VERSION" == "V2" ] && [ $consul_conf == "NOCONSUL" ]; then
-        api_get_configuration 200 ".consul_config.json"
+    if [ "$A1PMS_VERSION" == "V2" ] && [ $consul_conf == "NOCONSUL" ]; then
+        a1pms_api_get_configuration 200 ".consul_config.json"
     fi
 
-    check_policy_agent_logs
-    check_control_panel_logs
+    check_a1pms_logs
 
     store_logs          END_$consul_conf
 done