Merge "Improve developer guide"

[nonrtric.git] / test / auto-test / FTC300.sh

diff --git a/test/auto-test/FTC300.sh b/test/auto-test/FTC300.sh
index e3181bd..d9bca7d 100755 (executable)
--- a/test/auto-test/FTC300.sh
+++ b/test/auto-test/FTC300.sh
@@ -19,12 +19,17 @@
 
 TC_ONELINE_DESCR="Resync 10000 policies using OSC interface over REST"
 
+#App names to exclude checking pulling images for, space separated list
+EXCLUDED_IMAGES="SDNC_ONAP"
+
 . ../common/testcase_common.sh  $@
 . ../common/agent_api_functions.sh
 . ../common/ricsimulator_api_functions.sh
 
 #### TEST BEGIN ####
 
+generate_uuid
+
 #Local vars in test script
 ##########################
 # Path to callback receiver
@@ -48,9 +53,13 @@ for __httpx in $TESTED_PROTOCOLS ; do
         clean_containers
 
         if [ $__httpx == "HTTPS" ]; then
+            #echo "Using secure ports between agent and MR"
+            use_mr_https
             echo "Using secure ports towards simulators"
             use_simulator_https
         else
+            #"Using non-secure ports between agent and MR"
+            use_mr_http
             echo "Using non-secure ports towards simulators"
             use_simulator_http
         fi
@@ -102,15 +111,15 @@ for __httpx in $TESTED_PROTOCOLS ; do
 
         api_equal json:policy_types 2 120  #Wait for the agent to refresh types from the simulator
 
-        api_put_service 201 "rapp1" 3600 "$CR_PATH/callbacks/1"
+        api_put_service 201 "serv1" 3600 "$CR_PATH/1"
 
         START_ID=2000
         NUM_POLICIES=10000
 
         if [[ $interface == *"BATCH"* ]]; then
-            api_put_policy_batch 201 "rapp1" ricsim_g1_1 1 $START_ID testdata/OSC/pi1_template.json $NUM_POLICIES
+            api_put_policy_batch 201 "serv1" ricsim_g1_1 1 $START_ID NOTRANSIENT testdata/OSC/pi1_template.json $NUM_POLICIES
         else
-            api_put_policy 201 "rapp1" ricsim_g1_1 1 $START_ID testdata/OSC/pi1_template.json $NUM_POLICIES
+            api_put_policy 201 "serv1" ricsim_g1_1 1 $START_ID NOTRANSIENT testdata/OSC/pi1_template.json $NUM_POLICIES
         fi
 
         sim_equal ricsim_g1_1 num_instances 10000
@@ -124,9 +133,9 @@ for __httpx in $TESTED_PROTOCOLS ; do
         START_ID=$(($START_ID+$NUM_POLICIES))
 
         if [[ $interface == *"BATCH"* ]]; then
-            api_put_policy_batch 201 "rapp1" ricsim_g2_1 NOTYPE $START_ID testdata/STD/pi1_template.json $NUM_POLICIES
+            api_put_policy_batch 201 "serv1" ricsim_g2_1 NOTYPE $START_ID NOTRANSIENT testdata/STD/pi1_template.json $NUM_POLICIES
         else
-            api_put_policy 201 "rapp1" ricsim_g2_1 NOTYPE $START_ID testdata/STD/pi1_template.json $NUM_POLICIES
+            api_put_policy 201 "serv1" ricsim_g2_1 NOTYPE $START_ID NOTRANSIENT testdata/STD/pi1_template.json $NUM_POLICIES
         fi
         sim_equal ricsim_g2_1 num_instances 10000
 
@@ -158,16 +167,17 @@ for __httpx in $TESTED_PROTOCOLS ; do
 
         api_equal json:policies 19995
 
+        check_policy_agent_logs
+
+        store_logs          "${__httpx}__${interface}"
+
     done
 
 done
 
 
-check_policy_agent_logs
-
 #### TEST COMPLETE ####
 
-store_logs          END
 
 print_result