X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC350.sh;h=4b2e3cb21f22f2ce691b852da1df2497ad67f6ef;hb=045a1503113be9e0ff6e0747c94d23e06ddb263f;hp=0fe253f5a40e419edf973c270cf4b0d4d493218c;hpb=a26055e5007e75a5aa9551305ea4da211e80df14;p=nonrtric.git

diff --git a/test/auto-test/FTC350.sh b/test/auto-test/FTC350.sh
index 0fe253f5..4b2e3cb2 100755
--- a/test/auto-test/FTC350.sh
+++ b/test/auto-test/FTC350.sh
@@ -19,8 +19,8 @@
 
 TC_ONELINE_DESCR="Change supported policy types and reconfigure rics"
 
-#App names to exclude checking pulling images for, space separated list
-EXCLUDED_IMAGES="SDNC_ONAP"
+#App names to include in the test, space separated list
+INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM SDNC"
 
 . ../common/testcase_common.sh  $@
 . ../common/agent_api_functions.sh
@@ -28,10 +28,13 @@ EXCLUDED_IMAGES="SDNC_ONAP"
 
 #### TEST BEGIN ####
 
+generate_uuid
+
 #Local vars in test script
 ##########################
 # Path to callback receiver
 CR_PATH="http://$CR_APP_NAME:$CR_EXTERNAL_PORT/callbacks"
+use_cr_http
 
 NUM_RICS=10
 NUM_RICS_2=$(($NUM_RICS-2))
@@ -75,7 +78,6 @@ for interface in $TESTED_VARIANTS ; do
     start_ric_simulators ricsim_g1 $NUM_RICS OSC_2.1.0
 
     if [[ $interface = *"SDNC"* ]]; then
-        start_sdnc
         prepare_consul_config      SDNC  ".consul_config_all.json"
     else
         prepare_consul_config      NOSDNC  ".consul_config_all.json"
@@ -84,6 +86,7 @@ for interface in $TESTED_VARIANTS ; do
     start_policy_agent
 
     set_agent_debug
+    set_agent_trace
 
     api_get_status 200
 
@@ -223,13 +226,13 @@ for interface in $TESTED_VARIANTS ; do
                              ricsim_g1_7:me1_ricsim_g1_7,me2_ricsim_g1_7:3,4,5:???? \
                              ricsim_g1_8:me1_ricsim_g1_8,me2_ricsim_g1_8:4,5:???? "
 
-    sleep 120
+    sleep_wait 120
 
     api_equal json:policy_ids 0
 
     api_get_policy_types 404 ricsim_g1_9
 
-    sim_equal ricsim_g1_9 num_instances 1
+    sim_equal ricsim_g1_9 num_instances 0
 
     api_delete_policy 404 2000
 
@@ -261,7 +264,7 @@ for interface in $TESTED_VARIANTS ; do
                              ricsim_g1_9:me1_ricsim_g1_9,me2_ricsim_g1_9:5:???? \
                              ricsim_g1_10:me1_ricsim_g1_10,me2_ricsim_g1_10:NOTYPE:???? "
 
-    sleep 120
+    sleep_wait 120
 
     api_equal json:policy_ids 0
 
@@ -273,7 +276,7 @@ for interface in $TESTED_VARIANTS ; do
     sim_delete_policy_type 204 ricsim_g1_6 4
     sim_delete_policy_type 204 ricsim_g1_7 4
 
-    sleep 120
+    sleep_wait 120
 
     api_equal json:policy_types?ric=ricsim_g1_1 1 120
     api_equal json:policy_types?ric=ricsim_g1_2 2 120
@@ -316,6 +319,7 @@ for interface in $TESTED_VARIANTS ; do
 
     check_policy_agent_logs
     store_logs          ${interface}
+
 done