X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC110.sh;h=23f68c7e43bc2c269ba045f90416198615fc8130;hb=1d1c7b4153dd9c0be14c7188c63496ff71c3e1c2;hp=b4fc8851b4133cb7820f31a8907faacf5caf3a88;hpb=70e878f1b5a558baaaa5ab5885a039ed96c9f8d5;p=nonrtric.git

diff --git a/test/auto-test/FTC110.sh b/test/auto-test/FTC110.sh
index b4fc8851..23f68c7e 100755
--- a/test/auto-test/FTC110.sh
+++ b/test/auto-test/FTC110.sh
@@ -20,22 +20,35 @@
 
 TC_ONELINE_DESCR="Testing of service registration timeouts and keepalive"
 
+#App names to include in the test, space separated list
+INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM"
+
 . ../common/testcase_common.sh  $@
 . ../common/agent_api_functions.sh
 . ../common/ricsimulator_api_functions.sh
 
+generate_uuid
 
 #Local vars in test script
 ##########################
 # Path to callback receiver
 CR_PATH="http://$CR_APP_NAME:$CR_EXTERNAL_PORT/callbacks"
 
+use_cr_http
+use_simulator_http
+use_mr_http
+use_agent_rest_http
+
 
 #### TEST BEGIN ####
 
 clean_containers
 
 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
+    start_ric_simulators ricsim_g3 1  STD_2.0.0
+fi
 
 start_mr
 
@@ -52,8 +65,6 @@ start_policy_agent
 
 set_agent_debug
 
-use_agent_rest_http
-
 #Verify no callbacks or dmaap messages has been sent
 cr_equal received_callbacks 0
 mr_equal requests_submitted 0
@@ -63,6 +74,10 @@ api_get_status 200
 
 #Print simulator interface version
 sim_print ricsim_g1_1 interface
+sim_print ricsim_g2_1 interface
+if [ "$PMS_VERSION" == "V2" ]; then
+    sim_print ricsim_g3_1 interface
+fi
 
 api_put_service 201 "service1" 15 "$CR_PATH/service1"
 
@@ -139,10 +154,73 @@ api_put_services_keepalive 404 "service2"
 api_put_services_keepalive 404 "service3"
 api_put_services_keepalive 404 "service4"
 
+# Policy delete after timeout
+api_put_service 201 "service10" 600 "$CR_PATH/service10"
+
+sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json
+
+if [ "$PMS_VERSION" == "V2" ]; then
+    api_equal json:rics 3 60
+
+    #api_equal json:policy_schemas 2 120
+
+    api_equal json:policy-types 2 120
+
+    api_equal json:policies 0
+else
+    api_equal json:rics 2 60
+
+    api_equal json:policy_schemas 2 120
+
+    api_equal json:policy_types 2
+
+    api_equal json:policies 0
+fi
+
+if [ "$PMS_VERSION" == "V2" ]; then
+    notificationurl="http://localhost:80"
+else
+    notificationurl=""
+fi
+
+api_put_policy 201 "service10" ricsim_g1_1 1 5000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json
+api_put_policy 201 "service10" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json
+
+api_equal json:policies 2
+
+sim_equal ricsim_g1_1 num_instances 1
+sim_equal ricsim_g2_1 num_instances 1
+
+api_put_policy 201 "service10" ricsim_g1_1 1 5001 true $notificationurl testdata/OSC/pi1_template.json
+api_put_policy 201 "service10" ricsim_g2_1 NOTYPE 5101 true $notificationurl testdata/STD/pi1_template.json
+
+api_equal json:policies 4
+
+sim_equal ricsim_g1_1 num_instances 2
+sim_equal ricsim_g2_1 num_instances 2
+
+sim_post_delete_instances 200 ricsim_g1_1
+sim_post_delete_instances 200 ricsim_g2_1
+
+#Wait for recreate of non transient policy
+api_equal json:policies 2 180
+
+sim_equal ricsim_g1_1 num_instances 1
+sim_equal ricsim_g2_1 num_instances 1
+
+api_put_service 200 "service10" 10 "$CR_PATH/service10"
+
+#Wait for service expiry
+api_equal json:policies 0 120
+
+sim_equal ricsim_g1_1 num_instances 0
+sim_equal ricsim_g2_1 num_instances 0
+
 api_get_service_ids 200
 
 deviation "TR18 Agents sends callback with empty body"
-cr_equal received_callbacks 0
+deviation "TR18 Unclear when callbacks are sent...."
+#cr_equal received_callbacks 8
 mr_equal requests_submitted 0
 
 check_policy_agent_logs