X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC800.sh;h=92af3966e30350322b6fa23a8c7cf7444a2aff73;hb=5d97a401dc1e26f64ad57daab90f924da9c12c64;hp=1bb6578f4a5895c080cc9f520467844cd72347d4;hpb=5a7560b9906f08ba2a47daace7da78484188aed7;p=nonrtric.git

diff --git a/test/auto-test/FTC800.sh b/test/auto-test/FTC800.sh
index 1bb6578f..92af3966 100755
--- a/test/auto-test/FTC800.sh
+++ b/test/auto-test/FTC800.sh
@@ -20,7 +20,7 @@
 TC_ONELINE_DESCR="Create 10000 policies in sequence using http/https and Agent REST/DMAAP with/without SDNC controller"
 
 #App names to exclude checking pulling images for, space separated list
-EXCLUDED_IMAGES="SDNC_ONAP"
+EXCLUDED_IMAGES="ECS"
 
 . ../common/testcase_common.sh  $@
 . ../common/agent_api_functions.sh
@@ -32,8 +32,6 @@ generate_uuid
 
 #Local vars in test script
 ##########################
-# Path to callback receiver
-CR_PATH="http://$CR_APP_NAME:$CR_EXTERNAL_PORT/callbacks"
 # Number of policies in each sequence
 NUM_POLICIES=10000
 
@@ -51,55 +49,43 @@ for __httpx in $TESTED_PROTOCOLS ; do
         echo "#####################################################################"
         echo "#####################################################################"
 
-        # Policy instance start id
-        START_ID=1
-
-        clean_containers
-
         if [ $__httpx == "HTTPS" ]; then
-            #"Using secure ports towards simulators"
+            # Path to callback receiver
+            CR_PATH="https://$CR_APP_NAME:$CR_EXTERNAL_SECURE_PORT/callbacks"
+            use_cr_https
             use_simulator_https
+            use_mr_https
+            use_agent_rest_https
         else
-            #"Using non-secure ports towards simulators"
+            # 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
         fi
 
+        # Policy instance start id
+        START_ID=1
+
+        clean_containers
+
         start_ric_simulators ricsim_g1 1 OSC_2.1.0
         start_ric_simulators ricsim_g2 1 STD_1.1.3
 
         start_mr
 
-        if [ $__httpx == "HTTPS" ]; then
-            #echo "Using secure ports between agent and MR"
-            use_mr_https
-        else
-            #"Using non-secure ports between agent and MR"
-            use_mr_http
-        fi
-
         start_cr
 
-        if [ $interface == "SDNC" ]; then
-
+        if [[ $interface == "SDNC" ]]; then
             start_sdnc
-
-            if [ $__httpx == "HTTPS" ]; then
-                # "Using secure ports towards SDNC"
-                use_sdnc_https
-            else
-                #"Using non-secure ports towards SDNC"
-                use_sdnc_http
-            fi
-        fi
-
-        start_consul_cbs
-
-        if [ $interface == "SDNC" ]; then
             prepare_consul_config      SDNC    ".consul_config.json"
         else
             prepare_consul_config      NOSDNC  ".consul_config.json"
         fi
 
+        start_consul_cbs
+
         consul_config_app                      ".consul_config.json"
 
         start_control_panel
@@ -108,15 +94,6 @@ for __httpx in $TESTED_PROTOCOLS ; do
 
         set_agent_debug
 
-        if [ $__httpx == "HTTPS" ]; then
-            # "Using secure ports towards the agent"
-            use_agent_rest_https
-        else
-            # "Using non-secure ports towards the agent"
-            use_agent_rest_http
-        fi
-
-
         cr_equal received_callbacks 0
         mr_equal requests_submitted 0
 
@@ -147,7 +124,13 @@ for __httpx in $TESTED_PROTOCOLS ; do
 
         sim_equal ricsim_g2_1 num_instances $NUM_POLICIES
 
-        use_agent_dmaap
+        if [ $__httpx == "HTTPS" ]; then
+            echo "Using secure ports towards dmaap"
+            use_agent_dmaap_https
+        else
+            echo "Using non-secure ports towards dmaap"
+            use_agent_dmaap_http
+        fi
 
         START_ID=$(($START_ID+$NUM_POLICIES))