X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC300.sh;h=6e00c9d976fda11ffe549bc014f20818f412d47e;hb=647744d8ab625d28ea0ecda3e6741e23ba9b0bc7;hp=9907dd67a393a5417eeb0fd4e6eb836440d030a7;hpb=5d97a401dc1e26f64ad57daab90f924da9c12c64;p=nonrtric.git

diff --git a/test/auto-test/FTC300.sh b/test/auto-test/FTC300.sh
index 9907dd67..6e00c9d9 100755
--- a/test/auto-test/FTC300.sh
+++ b/test/auto-test/FTC300.sh
@@ -17,10 +17,10 @@
 #  ============LICENSE_END=================================================
 #
 
-TC_ONELINE_DESCR="Resync 10000 policies using OSC interface over REST"
+TC_ONELINE_DESCR="Resync 10000 policies using OSC and STD interface"
 
-#App names to exclude checking pulling images for, space separated list
-EXCLUDED_IMAGES="ECS"
+#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
@@ -78,6 +78,10 @@ for __httpx in $TESTED_PROTOCOLS ; do
 
         start_ric_simulators ricsim_g2 4 STD_1.1.3
 
+        if [ "$PMS_VERSION" == "V2" ]; then
+            start_ric_simulators ricsim_g3 4  STD_2.0.0
+        fi
+
         start_mr
 
         start_cr
@@ -105,65 +109,79 @@ for __httpx in $TESTED_PROTOCOLS ; do
 
         sim_print ricsim_g2_1 interface
 
+        if [ "$PMS_VERSION" == "V2" ]; then
+            sim_print ricsim_g3_1 interface
+        fi
+
         sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json
 
-        api_equal json:policy_types 2 120  #Wait for the agent to refresh types from the simulator
+        if [ "$PMS_VERSION" == "V2" ]; then
+            api_equal json:policy-types 2 120  #Wait for the agent to refresh types from the simulator
+        else
+            api_equal json:policy_types 2 120  #Wait for the agent to refresh types from the simulator
+        fi
 
         api_put_service 201 "serv1" 3600 "$CR_PATH/1"
 
         START_ID=2000
         NUM_POLICIES=10000
 
+        if [ "$PMS_VERSION" == "V2" ]; then
+            notificationurl="http://localhost:80"
+        else
+            notificationurl=""
+        fi
+
         if [[ $interface == *"BATCH"* ]]; then
-            api_put_policy_batch 201 "serv1" ricsim_g1_1 1 $START_ID NOTRANSIENT testdata/OSC/pi1_template.json $NUM_POLICIES
+            api_put_policy_batch 201 "serv1" ricsim_g1_1 1 $START_ID NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json $NUM_POLICIES
         else
-            api_put_policy 201 "serv1" ricsim_g1_1 1 $START_ID NOTRANSIENT testdata/OSC/pi1_template.json $NUM_POLICIES
+            api_put_policy 201 "serv1" ricsim_g1_1 1 $START_ID NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json $NUM_POLICIES
         fi
 
-        sim_equal ricsim_g1_1 num_instances 10000
+        sim_equal ricsim_g1_1 num_instances $NUM_POLICIES
 
         sim_post_delete_instances 200 ricsim_g1_1
 
         sim_equal ricsim_g1_1 num_instances 0
 
-        sim_equal ricsim_g1_1 num_instances 10000 300
+        sim_equal ricsim_g1_1 num_instances $NUM_POLICIES 300
 
-        START_ID=$(($START_ID+$NUM_POLICIES))
+        START_ID2=$(($START_ID+$NUM_POLICIES))
 
         if [[ $interface == *"BATCH"* ]]; then
-            api_put_policy_batch 201 "serv1" ricsim_g2_1 NOTYPE $START_ID NOTRANSIENT testdata/STD/pi1_template.json $NUM_POLICIES
+            api_put_policy_batch 201 "serv1" ricsim_g2_1 NOTYPE $START_ID2 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json $NUM_POLICIES
         else
-            api_put_policy 201 "serv1" ricsim_g2_1 NOTYPE $START_ID NOTRANSIENT testdata/STD/pi1_template.json $NUM_POLICIES
+            api_put_policy 201 "serv1" ricsim_g2_1 NOTYPE $START_ID2 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json $NUM_POLICIES
         fi
-        sim_equal ricsim_g2_1 num_instances 10000
+        sim_equal ricsim_g2_1 num_instances $NUM_POLICIES
 
         sim_post_delete_instances 200 ricsim_g2_1
 
         sim_equal ricsim_g2_1 num_instances 0
 
-        sim_equal ricsim_g2_1 num_instances 10000 300
+        sim_equal ricsim_g2_1 num_instances $NUM_POLICIES 300
 
-        api_delete_policy 204 2435
+        api_delete_policy 204 $(($START_ID+47))
 
-        api_delete_policy 204 8693
+        api_delete_policy 204 $(($START_ID+$NUM_POLICIES-39))
 
         sim_post_delete_instances 200 ricsim_g1_1
 
-        sim_equal ricsim_g1_1 num_instances 9998 300
+        sim_equal ricsim_g1_1 num_instances $(($NUM_POLICIES-2)) 300
 
-        api_delete_policy 204 12435
+        api_delete_policy 204 $(($START_ID2+37))
 
-        api_delete_policy 204 18693
+        api_delete_policy 204 $(($START_ID2+$NUM_POLICIES-93))
 
-        api_delete_policy 204 18697
+        api_delete_policy 204 $(($START_ID2+$NUM_POLICIES-91))
 
         sim_post_delete_instances 200 ricsim_g2_1
 
-        sim_equal ricsim_g1_1 num_instances 9998 300
+        sim_equal ricsim_g1_1 num_instances $(($NUM_POLICIES-2)) 300
 
-        sim_equal ricsim_g2_1 num_instances 9997 300
+        sim_equal ricsim_g2_1 num_instances $(($NUM_POLICIES-3)) 300
 
-        api_equal json:policies 19995
+        api_equal json:policies $(($NUM_POLICIES-2+$NUM_POLICIES-3))
 
         check_policy_agent_logs