X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC1.sh;h=e4482b60efd83dd48dc422032d72aff022b44f61;hb=9e3bf9348a6f2a739411316591093f3b9a0fc937;hp=2eaf0f392608953629ca3df82f72eb19996b734c;hpb=2358ae67744169841843bbc0571063235390718e;p=nonrtric.git

diff --git a/test/auto-test/FTC1.sh b/test/auto-test/FTC1.sh
index 2eaf0f39..e4482b60 100755
--- a/test/auto-test/FTC1.sh
+++ b/test/auto-test/FTC1.sh
@@ -20,8 +20,8 @@
 
 TC_ONELINE_DESCR="Sanity test, create service and then create,update and delete a policy 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"
+#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
@@ -29,11 +29,6 @@ EXCLUDED_IMAGES="SDNC_ONAP"
 
 #### TEST BEGIN ####
 
-#Local vars in test script
-##########################
-
-# Path to callback receiver
-CR_PATH="http://$CR_APP_NAME:$CR_EXTERNAL_PORT/callbacks"
 
 generate_uuid
 
@@ -51,48 +46,48 @@ for __httpx in $TESTED_PROTOCOLS ; do
         echo "#####################################################################"
 
 
-        # Clean container and start all needed containers #
-        clean_containers
-
         if [ $__httpx == "HTTPS" ]; then
-            #"Using secure ports towards simulators"
+            CR_PATH="https://$CR_APP_NAME:$CR_EXTERNAL_SECURE_PORT/callbacks"
+            use_cr_https
             use_simulator_https
+            use_mr_https
+            if [[ $interface = *"SDNC"* ]]; then
+                use_sdnc_https
+            fi
+            if [[ $interface = *"DMAAP"* ]]; then
+                use_agent_dmaap_https
+            else
+                use_agent_rest_https
+            fi
         else
-            #"Using non-secure ports towards simulators"
+            CR_PATH="http://$CR_APP_NAME:$CR_EXTERNAL_PORT/callbacks"
+            use_cr_http
             use_simulator_http
+            use_mr_http
+            if [[ $interface = *"SDNC"* ]]; then
+                use_sdnc_http
+            fi
+            if [[ $interface = *"DMAAP"* ]]; then
+                use_agent_dmaap_http
+            else
+                use_agent_rest_http
+            fi
         fi
 
+        # Clean container and start all needed containers #
+        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
-
-            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 == "REST+SDNC" ] || [ $interface == "DMAAP+SDNC" ]; then
+        if [[ $interface = *"SDNC"* ]]; then
+            start_sdnc
             prepare_consul_config      SDNC    ".consul_config.json"
         else
             prepare_consul_config      NOSDNC  ".consul_config.json"
@@ -102,26 +97,10 @@ for __httpx in $TESTED_PROTOCOLS ; do
 
         start_control_panel
 
-        if [ $interface == "REST+SDNC" ] || [ $interface == "DMAAP+SDNC" ]; then
-            start_sdnc
-        fi
-
         start_policy_agent
 
         set_agent_debug
-
-        if [ $interface == "DMAAP" ] || [ $interface == "DMAAP+SDNC" ]; then
-            use_agent_dmaap
-        else
-            if [ $__httpx == "HTTPS" ]; then
-                echo "Using secure ports towards the agent"
-                use_agent_rest_https
-            else
-                echo "Using non-secure ports towards the agent"
-                use_agent_rest_http
-            fi
-        fi
-
+        set_agent_trace
 
         cr_equal received_callbacks 0
         mr_equal requests_submitted 0
@@ -180,7 +159,7 @@ for __httpx in $TESTED_PROTOCOLS ; do
 
         cr_equal received_callbacks 0
 
-        if [ $interface == "DMAAP" ] || [ $interface == "DMAAP+SDNC" ]; then
+        if [[ $interface = *"DMAAP"* ]]; then
             VAL=11 # Number of Agent API calls over DMAAP
             mr_equal requests_fetched $VAL
             mr_equal responses_submitted $VAL
@@ -191,7 +170,7 @@ for __httpx in $TESTED_PROTOCOLS ; do
             mr_equal requests_submitted 0
         fi
 
-        if [ $interface == "REST+SDNC" ] || [ $interface == "DMAAP+SDNC" ]; then
+        if [[ $interface = *"SDNC"* ]]; then
             sim_contains_str ricsim_g1_1 remote_hosts "a1-controller"
             sim_contains_str ricsim_g2_1 remote_hosts "a1-controller"
         else