X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC310.sh;h=e017643aacdf6252bfde10235cae47c804c825e4;hb=6fc58fd020514c2afce1fc240828bf23f53d8fb6;hp=674df8c54baea0f6db1fa20ed04c00e2ba662aa7;hpb=89b64ab194785ec389c8353e4b90e3e7edd08662;p=nonrtric.git

diff --git a/test/auto-test/FTC310.sh b/test/auto-test/FTC310.sh
index 674df8c5..e017643a 100755
--- a/test/auto-test/FTC310.sh
+++ b/test/auto-test/FTC310.sh
@@ -20,16 +20,25 @@
 
 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"
+#App names to include in the test when running docker, space separated list
+DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM NGW KUBEPROXY"
 
-#SUPPORTED TEST ENV FILE
-SUPPORTED_PROFILES="ONAP-GUILIN ONAP-HONOLULU  ORAN-CHERRY ORAN-DAWN"
+#Supported test environment profiles
+SUPPORTED_PROFILES="ONAP-GUILIN ONAP-HONOLULU ONAP-ISTANBUL ORAN-CHERRY ORAN-D-RELEASE ORAN-E-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/consul_cbs_functions.sh
+. ../common/gateway_api_functions.sh
+
+setup_testenvironment
 
 #### TEST BEGIN ####
 
@@ -40,18 +49,20 @@ else
 fi
 
 for consul_conf in $TESTED_VARIANTS ; do
-    generate_uuid
+    generate_policy_uuid
 
     # Clean container and start all needed containers #
-    clean_containers
+    clean_environment
+
+    start_kube_proxy
 
-    start_policy_agent
+    start_policy_agent NOPROXY $SIM_GROUP/$POLICY_AGENT_COMPOSE_DIR/$POLICY_AGENT_CONFIG_FILE
 
     set_agent_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"
+    api_put_service 201 "ric-registration" 0 "$CR_SERVICE_APP_PATH/ric-registration"
 
     # Start one RIC of each type
     start_ric_simulators ricsim_g1 1  OSC_2.1.0
@@ -64,7 +75,7 @@ for consul_conf in $TESTED_VARIANTS ; do
 
     start_cr
 
-    start_control_panel
+    start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE
 
     if [ $consul_conf == "CONSUL" ]; then
         start_consul_cbs
@@ -80,13 +91,13 @@ for consul_conf in $TESTED_VARIANTS ; do
     fi
 
     if [ "$PMS_VERSION" == "V2" ]; then
-        api_equal json:rics 3 120
+        api_equal json:rics 3 300
 
         cr_equal received_callbacks 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
+        api_equal json:rics 2 300
     fi
 
     # Add an STD RIC and check
@@ -111,7 +122,7 @@ for consul_conf in $TESTED_VARIANTS ; do
     fi
 
     check_policy_agent_logs
-    check_control_panel_logs
+
 
     # Remove one RIC RIC and check
     start_ric_simulators ricsim_g2 1  STD_1.1.3
@@ -137,7 +148,7 @@ for consul_conf in $TESTED_VARIANTS ; do
     fi
 
     check_policy_agent_logs
-    check_control_panel_logs
+    check_sdnc_logs
 
     store_logs          END_$consul_conf
 done
@@ -148,4 +159,4 @@ done
 
 print_result
 
-auto_clean_containers
+auto_clean_environment