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

diff --git a/test/auto-test/FTC310.sh b/test/auto-test/FTC310.sh
index eec45420..dd79b33f 100755
--- a/test/auto-test/FTC310.sh
+++ b/test/auto-test/FTC310.sh
@@ -20,16 +20,21 @@
 
 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"
 
-#SUPPORTED TEST ENV FILE
-SUPPORTED_PROFILES="ONAP-MASTER ONAP-GUILIN ORAN-CHERRY"
+#Supported test environment profiles
+SUPPORTED_PROFILES="ONAP-GUILIN ONAP-HONOLULU  ORAN-CHERRY ORAN-DAWN"
+#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
 
 #### TEST BEGIN ####
 
@@ -43,7 +48,7 @@ for consul_conf in $TESTED_VARIANTS ; do
     generate_uuid
 
     # Clean container and start all needed containers #
-    clean_containers
+    clean_environment
 
     start_policy_agent
 
@@ -51,7 +56,7 @@ for consul_conf in $TESTED_VARIANTS ; do
 
     # 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_PATH/ric-registration"
 
     # Start one RIC of each type
     start_ric_simulators ricsim_g1 1  OSC_2.1.0
@@ -80,13 +85,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
@@ -148,4 +153,4 @@ done
 
 print_result
 
-auto_clean_containers
+auto_clean_environment